texinfo-commits
[Top][All Lists]
Advanced

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

[no subject]


From: Patrice Dumas
Date: Tue, 12 Dec 2023 10:01:53 -0500 (EST)

branch: master
commit 5b8c13f7b34c8cb49694a276535b59871852a6d3
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Dec 12 15:55:37 2023 +0100

    No empty macro in source info
    
    * tp/Texinfo/ParserNonXS.pm (_input_push_text, _input_push_file)
    (_bug_message, _next_text, _check_line_directive),
    tp/Texinfo/Report.pm (format_line_message),
    tp/Texinfo/XS/main/build_perl_info.c (element_to_perl_hash)
    (build_source_info_hash): do not set source info 'macro' to an empty
    string if not in macro a context, leave out the key, and check that it
    is defined.
---
 ChangeLog                                          |   12 +
 tp/Texinfo/ParserNonXS.pm                          |   25 +-
 tp/Texinfo/Report.pm                               |    5 -
 tp/Texinfo/XS/main/build_perl_info.c               |   20 -
 tp/t/results/alias/alias_macro_target_removed.pl   |   12 +-
 tp/t/results/alias/alias_non_existing_command.pl   |    6 +-
 tp/t/results/alias/alias_of_added_index.pl         |   24 +-
 .../alias_of_added_index_before_added_index.pl     |   24 +-
 tp/t/results/alias/alias_of_definfoenclose.pl      |   10 +-
 ...lias_of_definfoenclose_before_definfoenclose.pl |   10 +-
 tp/t/results/alias/alias_of_macro.pl               |    9 +-
 tp/t/results/alias/alias_of_macro_before_macro.pl  |    9 +-
 tp/t/results/alias/alias_table_command.pl          |   15 +-
 tp/t/results/alias/bad_line.pl                     |   13 +-
 tp/t/results/alias/block_command_alias.pl          |   12 +-
 tp/t/results/alias/recursive_alias.pl              |   16 +-
 tp/t/results/alias/simple.pl                       |   12 +-
 tp/t/results/alias/texinfo_command_alias.pl        |   16 +-
 .../alias/texinfo_command_alias_indirect.pl        |   12 +-
 .../alias/texinfo_command_alias_indirect_before.pl |   15 +-
 tp/t/results/columnfractions/empty.pl              |   10 +-
 tp/t/results/columnfractions/empty_comment.pl      |   10 +-
 tp/t/results/columnfractions/good.pl               |    9 +-
 tp/t/results/columnfractions/good_comment.pl       |    9 +-
 tp/t/results/columnfractions/good_space_comment.pl |    9 +-
 tp/t/results/columnfractions/invalid.pl            |   11 +-
 tp/t/results/columnfractions/not_fraction.pl       |   10 +-
 tp/t/results/columnfractions/out_of_multitable.pl  |    5 +-
 .../something_before_columnfractions.pl            |    9 +-
 tp/t/results/columnfractions/wrong_command.pl      |   14 +-
 .../additional_space_in_end_conditional.pl         |    6 +-
 ...additional_space_in_end_conditional_expanded.pl |    6 +-
 tp/t/results/conditionals/bad_ifclear_argument.pl  |    7 +-
 tp/t/results/conditionals/bad_ifset_argument.pl    |    7 +-
 tp/t/results/conditionals/command_conditionals.pl  |   42 +-
 .../command_conditionals_user_defined.pl           |   64 +-
 tp/t/results/conditionals/commands_in_ifset.pl     |   12 +-
 tp/t/results/conditionals/comment_on_ifset_line.pl |   36 +-
 tp/t/results/conditionals/cond.pl                  |   57 +-
 tp/t/results/conditionals/cond_ifhtml_ifinfo.pl    |   57 +-
 .../conditionals/cond_ifhtml_ifinfo_iftex.pl       |   58 +-
 tp/t/results/conditionals/cond_info.pl             |   57 +-
 .../conditionals/cond_info_ifhtml_ifinfo_iftex.pl  |   57 +-
 .../cond_info_no-ifhtml_no-ifinfo_no-iftex.pl      |   57 +-
 .../cond_no-ifhtml_no-ifinfo_no-iftex.pl           |   57 +-
 tp/t/results/conditionals/cond_xml.pl              |   57 +-
 .../results/conditionals/conditional_not_closed.pl |    4 +-
 .../conditionals/consecutive_conditionals.pl       |   24 +-
 tp/t/results/conditionals/defcondx_Dbar.pl         |   23 +-
 tp/t/results/conditionals/defcondx_Ubar.pl         |   19 +-
 tp/t/results/conditionals/empty_ifclear.pl         |    7 +-
 tp/t/results/conditionals/empty_ifset.pl           |    7 +-
 .../conditionals/empty_ifset_in_ifset_no_set.pl    |    7 +-
 .../conditionals/empty_ifset_in_ifset_set.pl       |   12 +-
 tp/t/results/conditionals/empty_set_in_ifclear.pl  |    6 +-
 tp/t/results/conditionals/empty_set_in_ifset.pl    |    6 +-
 .../end_conditional_not_at_line_begining.pl        |    7 +-
 tp/t/results/conditionals/end_ifset_in_format.pl   |   33 +-
 .../conditionals/false_format_not_closed.pl        |    4 +-
 tp/t/results/conditionals/if_not_closed.pl         |    4 +-
 tp/t/results/conditionals/ifclear_in_ifset.pl      |    6 +-
 tp/t/results/conditionals/ifclear_in_ifset_set.pl  |   13 +-
 .../conditionals/ifnot_format_conditional.pl       |    6 +-
 tp/t/results/conditionals/ifnotinfo_exception.pl   |    6 +-
 tp/t/results/conditionals/ifset_in_command.pl      |   15 +-
 tp/t/results/conditionals/ifset_nonalpha.pl        |    6 +-
 tp/t/results/conditionals/ignore_not_closed.pl     |    4 +-
 .../conditionals/ignore_spaces_and_comments.pl     |   30 +-
 tp/t/results/conditionals/ignored_in_ifset.pl      |   24 +-
 .../conditionals/info_ifinfo_ifnotplaintext.pl     |   12 +-
 tp/t/results/conditionals/info_ifplaintext.pl      |    6 +-
 .../conditionals/inlinefmtifelse_nesting.pl        |    6 +-
 .../conditionals/inlineiffmtifelse_not_closed.pl   |    4 +-
 .../inlineiffmtifelse_not_closed_three_arg.pl      |    4 +-
 .../inlineiffmtifelse_not_closed_two_arg.pl        |    4 +-
 .../conditionals/inlineifset_false_not_closed.pl   |    4 +-
 tp/t/results/conditionals/macro_in_ifset.pl        |   12 +-
 tp/t/results/conditionals/macro_in_ifset_set.pl    |   18 +-
 tp/t/results/conditionals/many_conditionals.pl     |   48 +-
 tp/t/results/conditionals/nested_ifset_ifclear.pl  |    6 +-
 .../nested_ifset_prepended_to_command_name.pl      |    7 +-
 tp/t/results/conditionals/nested_ignore.pl         |    4 +-
 .../conditionals/nested_ignore_comment_no_eol.pl   |    5 +-
 .../conditionals/nested_ignore_with_comments.pl    |    6 +-
 tp/t/results/conditionals/not_set.pl               |    6 +-
 tp/t/results/conditionals/plaintext_ifinfo.pl      |    6 +-
 .../plaintext_ifinfo_ifnotplaintext.pl             |   12 +-
 .../conditionals/superfluous_argument_to_end.pl    |    7 +-
 .../conditionals/text_on_conditional_line.pl       |    7 +-
 .../text_on_conditional_line_expanded.pl           |    7 +-
 tp/t/results/conditionals/txiinternalvalue.pl      |    1 -
 .../conditionals/user_defined_txiinternalvalue.pl  |    6 +-
 tp/t/results/converters_tests/accent_with_text.pl  |   22 +-
 .../results/converters_tests/at_commands_in_raw.pl |   81 +-
 tp/t/results/converters_tests/combined_fonts.pl    |  156 +-
 tp/t/results/converters_tests/commands_in_sc.pl    |   80 +-
 .../commands_in_settitle_with_title.pl             |   54 +-
 tp/t/results/converters_tests/commands_in_var.pl   |   79 +-
 tp/t/results/converters_tests/complex_nestings.pl  |   90 +-
 .../converters_tests/contents_at_document_begin.pl |   24 +-
 .../contents_at_document_begin_inline.pl           |   24 +-
 .../contents_at_document_begin_separate_element.pl |   24 +-
 .../converters_tests/definition_commands.pl        | 1503 ++++--------
 .../email_table_command_as_argument.pl             |   12 +-
 tp/t/results/converters_tests/empty_accent.pl      |    3 +-
 .../converters_tests/enumerate_above_ten.pl        |    9 +-
 .../results/converters_tests/footnote_no_number.pl |   18 +-
 .../footnote_no_number_separate.pl                 |   18 +-
 tp/t/results/converters_tests/form_feeds.pl        |   96 +-
 .../converters_tests/frenchspacing_and_code.pl     |  144 +-
 tp/t/results/converters_tests/image_extension.pl   |    8 +-
 tp/t/results/converters_tests/image_formatting.pl  |  170 +-
 tp/t/results/converters_tests/image_with_spaces.pl |  Bin 4338 -> 4280 bytes
 .../index_entry_in_preformatted.pl                 |   27 +-
 .../indices_in_begin_tables_lists.pl               |  327 +--
 ...ces_in_begin_tables_lists_entries_after_item.pl |  327 +--
 tp/t/results/converters_tests/inline.pl            |   63 +-
 tp/t/results/converters_tests/inline_expand_tex.pl |   52 +-
 tp/t/results/converters_tests/inlinefmtifelse.pl   |   30 +-
 .../inlinefmtifelse_with_commands.pl               |   36 +-
 tp/t/results/converters_tests/inlinefmtspaces.pl   |   12 +-
 .../results/converters_tests/inlineifsetifclear.pl |   12 +-
 .../converters_tests/inlineifsetifclearspaces.pl   |   14 +-
 tp/t/results/converters_tests/inlinerawspaces.pl   |   12 +-
 tp/t/results/converters_tests/line_breaks.pl       |   36 +-
 tp/t/results/converters_tests/link.pl              |   34 +-
 tp/t/results/converters_tests/non_empty_part.pl    |   71 +-
 .../non_empty_part_no_top_node_output.pl           |   71 +-
 .../converters_tests/normal_font_in_monospace.pl   |   21 +-
 .../printindex_merged_indices_code_style.pl        |   48 +-
 .../results/converters_tests/raw_block_commands.pl |   42 +-
 .../raw_block_commands_expand_tex.pl               |   43 +-
 .../converters_tests/ref_error_formatting.pl       |  241 +-
 tp/t/results/converters_tests/ref_in_sectioning.pl |  143 +-
 .../references_to_top_no_top_output.pl             |   93 +-
 tp/t/results/converters_tests/refs_formatting.pl   |  202 +-
 .../converters_tests/setfilename_no_extension.pl   |   12 +-
 .../converters_tests/simplest_no_node_section.pl   |    3 +-
 .../converters_tests/simplest_test_prefix.pl       |    3 +-
 .../some_at_commands_in_ref_nodes.pl               |  204 +-
 tp/t/results/converters_tests/sp_in_example.pl     |   21 +-
 .../converters_tests/spaces_in_empty_node_names.pl |   62 +-
 .../converters_tests/spaces_in_node_names.pl       |   54 +-
 .../table_in_display_in_example.pl                 |   24 +-
 .../table_in_example_in_display.pl                 |   24 +-
 .../converters_tests/test_deftypefnnewline.pl      |  147 +-
 tp/t/results/converters_tests/test_sp.pl           |   15 +-
 .../converters_tests/things_before_setfilename.pl  |   80 +-
 .../things_before_setfilename_no_element.pl        |   68 +-
 tp/t/results/converters_tests/top_in_ref.pl        |  202 +-
 tp/t/results/converters_tests/unknown_value.pl     |    1 -
 tp/t/results/coverage/accent_and_dash.pl           |    3 +-
 tp/t/results/coverage/accent_no_closed.pl          |    4 +-
 tp/t/results/coverage/accent_no_closed_comment.pl  |    4 +-
 tp/t/results/coverage/accent_no_closed_newline.pl  |    4 +-
 .../results/coverage/accent_no_closed_paragraph.pl |    4 +-
 tp/t/results/coverage/accents_errors.pl            |   23 +-
 .../coverage/arg_in_brace_no_arg_command.pl        |    4 +-
 tp/t/results/coverage/at_after_accent_command.pl   |    8 +-
 tp/t/results/coverage/block_commands.pl            |   21 +-
 tp/t/results/coverage/bye_on_end_command_line.pl   |    8 +-
 tp/t/results/coverage/cartouche.pl                 |   15 +-
 tp/t/results/coverage/cartouche_in_example.pl      |   12 +-
 tp/t/results/coverage/cartouche_in_quotation.pl    |   12 +-
 .../coverage/cartouche_title_and_content.pl        |    9 +-
 tp/t/results/coverage/center.pl                    |    6 +-
 tp/t/results/coverage/command_in_end.pl            |   88 +-
 .../command_in_end_expanded_raw_command_after.pl   |   11 +-
 ...mand_in_end_expanded_raw_command_empty_after.pl |   11 +-
 .../command_in_end_expanded_raw_in_command.pl      |   12 +-
 ..._in_end_expanded_raw_one_char_before_command.pl |   11 +-
 ..._in_end_expanded_raw_one_char_not_in_command.pl |   13 +-
 ..._in_end_expanded_raw_two_char_before_command.pl |   11 +-
 ..._in_end_expanded_raw_two_char_not_in_command.pl |   13 +-
 .../command_in_end_ignored_raw_command_after.pl    |   11 +-
 .../command_in_end_ignored_raw_in_command.pl       |    4 +-
 ...d_in_end_ignored_raw_one_char_before_command.pl |    4 +-
 ...d_in_end_ignored_raw_one_char_not_in_command.pl |    4 +-
 ...d_in_end_ignored_raw_two_char_before_command.pl |    4 +-
 ...d_in_end_ignored_raw_two_char_not_in_command.pl |    4 +-
 tp/t/results/coverage/commands.pl                  |   46 +-
 tp/t/results/coverage/commands_in_math.pl          |  292 +--
 tp/t/results/coverage/comment_on_cartouche_line.pl |   15 +-
 tp/t/results/coverage/comment_on_group_line.pl     |    6 +-
 tp/t/results/coverage/def.pl                       |  138 +-
 .../coverage/delcomment_followed_by_cpp_line.pl    |    3 -
 tp/t/results/coverage/displaymath.pl               |   57 +-
 tp/t/results/coverage/empty_w.pl                   |    6 +-
 .../end_bad_end_argument_and_superfluous_arg.pl    |   12 +-
 tp/t/results/coverage/exdent_and_commands.pl       |   24 +-
 tp/t/results/coverage/exdent_and_formats.pl        |  129 +-
 tp/t/results/coverage/flushleft_flushright.pl      |   12 +-
 .../coverage/flushleft_flushright_in_quotation.pl  |   18 +-
 tp/t/results/coverage/flushright_example_nested.pl |   24 +-
 tp/t/results/coverage/flushright_not_closed.pl     |    4 +-
 .../coverage/formats_only_title_comments.pl        |   44 +-
 tp/t/results/coverage/formats_only_titles.pl       |   44 +-
 tp/t/results/coverage/formats_titles.pl            |   58 +-
 .../coverage/group_beginning_and_end_on_line.pl    |    8 +-
 tp/t/results/coverage/group_not_closed.pl          |    4 +-
 tp/t/results/coverage/hyphenation.pl               |    3 +-
 tp/t/results/coverage/indentedblock.pl             |    6 +-
 tp/t/results/coverage/indicateurl_end_lines.pl     |    8 +-
 tp/t/results/coverage/insertcopying.pl             |   15 +-
 tp/t/results/coverage/invalid_U.pl                 |   38 +-
 tp/t/results/coverage/item_container.pl            |   30 +-
 .../results/coverage/lettered_accent_and_spaces.pl |   29 +-
 tp/t/results/coverage/math.pl                      |   49 +-
 tp/t/results/coverage/multitable.pl                |   52 +-
 tp/t/results/coverage/nested_block_commands.pl     |  144 +-
 tp/t/results/coverage/not_i_j_in_dotless.pl        |   11 +-
 tp/t/results/coverage/preformatted.pl              |   25 +-
 .../coverage/punctuation_in_line_commands.pl       |   66 +-
 tp/t/results/coverage/quotation_author.pl          |   15 +-
 tp/t/results/coverage/raggedright.pl               |    6 +-
 tp/t/results/coverage/setfilename_in_paragraph.pl  |    3 +-
 .../coverage/spaces_after_braced_command.pl        |   23 +-
 .../spaces_no_brace_after_braced_command.pl        |    4 +-
 .../spaces_unknown_command_after_braced_command.pl |   10 +-
 tp/t/results/coverage/symbol_after_block.pl        |  153 +-
 tp/t/results/coverage/symbol_after_command.pl      |   30 +-
 tp/t/results/coverage/table.pl                     |   53 +-
 tp/t/results/coverage/table_command_comment.pl     |   12 +-
 tp/t/results/coverage/test_errormsg.pl             |   14 +-
 tp/t/results/coverage/test_tie.pl                  |    3 +-
 tp/t/results/coverage/test_today.pl                |    3 +-
 tp/t/results/coverage/titlefont_in_center.pl       |    6 +-
 tp/t/results/coverage/unknown_accents.pl           |   75 +-
 tp/t/results/coverage/unknown_commands.pl          |    2 -
 tp/t/results/coverage/verbatiminclude.pl           |    3 +-
 tp/t/results/coverage_braces/abbr_acronym.pl       |   42 +-
 tp/t/results/coverage_braces/anchor_not_closed.pl  |    4 +-
 .../coverage_braces/brace_opened_no_command.pl     |    4 +-
 tp/t/results/coverage_braces/caption_not_closed.pl |   10 +-
 tp/t/results/coverage_braces/code_not_closed.pl    |    4 +-
 .../coverage_braces/contain_plain_text_nestings.pl |   77 +-
 .../results/coverage_braces/email_possibilities.pl |    9 +-
 tp/t/results/coverage_braces/empty_commands.pl     |   28 +-
 tp/t/results/coverage_braces/empty_images.pl       |   16 +-
 .../coverage_braces/empty_line_in_anchor.pl        |    5 +-
 .../empty_line_in_braces_in_math.pl                |    6 +-
 .../empty_line_in_braces_in_math_at_begin_line.pl  |    6 +-
 .../results/coverage_braces/empty_line_in_email.pl |    5 +-
 tp/t/results/coverage_braces/empty_line_in_math.pl |    3 +-
 tp/t/results/coverage_braces/empty_ref.pl          |   18 +-
 .../coverage_braces/empty_second_email_argument.pl |    3 +-
 tp/t/results/coverage_braces/end_line_in_anchor.pl |    3 +-
 tp/t/results/coverage_braces/footnote.pl           |    6 +-
 .../footnote_ending_on_empty_line.pl               |    3 +-
 .../footnote_in_command_not_closed.pl              |    8 +-
 tp/t/results/coverage_braces/footnote_no_node.pl   |    6 +-
 .../results/coverage_braces/footnote_not_closed.pl |    4 +-
 .../coverage_braces/form_feed_in_brace_commands.pl |   15 +-
 .../format_on_first_footnote_line.pl               |   18 +-
 .../results/coverage_braces/heading_in_footnote.pl |   10 +-
 .../coverage_braces/inforef_too_much_args.pl       |    7 +-
 tp/t/results/coverage_braces/kbd.pl                |   33 +-
 .../math_bracketed_inside_not_closed.pl            |   10 +-
 .../coverage_braces/math_bracketed_not_closed.pl   |   11 +-
 .../math_bracketed_not_closed_next_line.pl         |    8 +-
 .../math_leading_trailing_spaces.pl                |    3 +-
 tp/t/results/coverage_braces/math_not_closed.pl    |    4 +-
 tp/t/results/coverage_braces/nested.pl             |    6 +-
 tp/t/results/coverage_braces/nested_args.pl        |   15 +-
 tp/t/results/coverage_braces/nested_in_sc.pl       |   30 +-
 tp/t/results/coverage_braces/no_brace.pl           |   12 +-
 .../coverage_braces/no_brace_space_end_line.pl     |   13 +-
 .../one_argument_leading_trailing_spaces.pl        |   27 +-
 tp/t/results/coverage_braces/recursive_acronym.pl  |    6 +-
 .../recursive_acronym_definition.pl                |    9 +-
 tp/t/results/coverage_braces/ref_empty_node.pl     |   13 +-
 .../coverage_braces/ref_in_style_command.pl        |    6 +-
 tp/t/results/coverage_braces/simple.pl             |    3 +-
 .../coverage_braces/space_command_in_image.pl      |    6 +-
 tp/t/results/coverage_braces/space_in_anchor.pl    |    3 +-
 tp/t/results/coverage_braces/space_in_footnote.pl  |    3 +-
 tp/t/results/coverage_braces/space_in_image.pl     |   10 +-
 tp/t/results/coverage_braces/test_image.pl         |   39 +-
 tp/t/results/coverage_braces/test_w.pl             |   57 +-
 tp/t/results/coverage_braces/too_much_args.pl      |    3 +-
 .../coverage_braces/two_footnotes_in_nodes.pl      |   33 +-
 .../two_footnotes_in_nodes_separate.pl             |   36 +-
 .../two_footnotes_in_nodes_separate_no_header.pl   |   36 +-
 .../coverage_braces/unknown_command_with_braces.pl |    9 -
 tp/t/results/coverage_braces/unmatched_brace.pl    |    7 +-
 tp/t/results/coverage_braces/uref_in_ref.pl        |   16 +-
 tp/t/results/coverage_braces/uref_url.pl           |   27 +-
 .../uref_with_commands_characters.pl               |   12 +-
 tp/t/results/coverage_braces/verb_in_xref.pl       |   10 +-
 tp/t/results/coverage_braces/w_end_sentence.pl     |    3 +-
 tp/t/results/def/adjacent_defline.pl               |   12 +-
 tp/t/results/def/all_commands.pl                   |  270 +--
 tp/t/results/def/all_commands_delimiters.pl        | 1040 +++------
 .../def/all_commands_delimiters_printindex.pl      | 1017 +++------
 tp/t/results/def/all_commands_printindex.pl        |  267 +--
 tp/t/results/def/all_empty_def.pl                  |   90 +-
 tp/t/results/def/ampchar.pl                        |   19 +-
 tp/t/results/def/code_in_def.pl                    |   16 +-
 tp/t/results/def/def_defx_mismatch.pl              |   30 +-
 tp/t/results/def/def_groupings_args.pl             |   48 +-
 tp/t/results/def/defblock_no_defline.pl            |    6 +-
 tp/t/results/def/defline_no_params.pl              |    9 +-
 tp/t/results/def/deftypeline.pl                    |   21 +-
 tp/t/results/def/defx_after_comment.pl             |   20 +-
 tp/t/results/def/defx_after_comment_in_example.pl  |   26 +-
 tp/t/results/def/defx_after_empty_line.pl          |   20 +-
 .../def/defx_after_empty_line_in_example.pl        |   26 +-
 tp/t/results/def/defx_after_paragraph_end.pl       |   21 +-
 .../def/defx_after_preformatted_with_text.pl       |   27 +-
 tp/t/results/def/defx_after_text.pl                |   21 +-
 tp/t/results/def/defx_in_example.pl                |   26 +-
 tp/t/results/def/double_command.pl                 |   37 +-
 tp/t/results/def/empty_def_arguments.pl            |   75 +-
 tp/t/results/def/empty_def_command.pl              |   24 +-
 tp/t/results/def/empty_deftype.pl                  |   46 +-
 tp/t/results/def/empty_deftypeop_name.pl           |   22 +-
 tp/t/results/def/empty_main_def_arguments.pl       |   10 +-
 tp/t/results/def/end_of_line_end_file.pl           |    8 +-
 tp/t/results/def/end_of_line_protect_at_end.pl     |    9 +-
 tp/t/results/def/end_of_lines_protected.pl         |   16 +-
 .../def/end_of_lines_protected_in_footnote.pl      |   19 +-
 .../def/end_of_lines_protected_non_ascii.pl        |   16 +-
 tp/t/results/def/inter_item_commands_in_def.pl     |   41 +-
 .../def/inter_item_commands_in_def_in_example.pl   |   47 +-
 tp/t/results/def/leading_space_in_def_arg.pl       |   13 +-
 tp/t/results/def/multiple_defline.pl               |   12 +-
 tp/t/results/def/no_category_or_no_name.pl         |   41 +-
 tp/t/results/def/not_closed.pl                     |   20 +-
 tp/t/results/def/omit_def_space.pl                 |   18 +-
 tp/t/results/def/protected_brace.pl                |   10 +-
 tp/t/results/def/ref_in_def.pl                     |   54 +-
 tp/t/results/def/space_in_def_for_index.pl         |   36 +-
 tp/t/results/def/wrong_braces_simple.pl            |   86 +-
 tp/t/results/def/wrong_braces_with_end_of_lines.pl |   25 +-
 .../docbook_tests/between_node_and_section.pl      |   21 +-
 ...pty_quotation_with_arg_followed_by_quotation.pl |   12 +-
 .../docbook_tests/multiple_documentlanguage.pl     |   42 +-
 .../docbook_tests/special_docbook_unnumbered.pl    |   48 +-
 tp/t/results/float/anchor_in_caption.pl            |   21 +-
 tp/t/results/float/cindex_in_caption.pl            |   24 +-
 .../results/float/comment_space_comand_in_float.pl |   15 +-
 tp/t/results/float/complex_float.pl                |  349 +--
 tp/t/results/float/empty_caption.pl                |   30 +-
 tp/t/results/float/empty_label_no_space.pl         |    6 +-
 tp/t/results/float/empty_label_no_space_comment.pl |    6 +-
 tp/t/results/float/empty_label_with_space.pl       |    6 +-
 .../float/empty_label_with_space_comment.pl        |    6 +-
 tp/t/results/float/empty_listoffloats.pl           |    3 +-
 .../float/empty_listoffloats_with_floats.pl        |   33 +-
 tp/t/results/float/float_copying.pl                |   84 +-
 tp/t/results/float/float_in_block_commands.pl      |   45 +-
 tp/t/results/float/float_type_with_tieaccent.pl    |   33 +-
 tp/t/results/float/float_with_at_commands.pl       |   36 +-
 tp/t/results/float/footnote_in_caption.pl          |   21 +-
 .../results/float/footnote_in_caption_and_error.pl |   25 +-
 tp/t/results/float/listoffloats_with_commands.pl   |    9 +-
 .../results/float/multiple_spaces_in_float_type.pl |    9 +-
 .../float/numbering_captions_listoffloats.pl       |  387 ++--
 tp/t/results/float/ref_to_float.pl                 |   18 +-
 tp/t/results/float/simple.pl                       |    9 +-
 .../float/special_characters_in_float_type.pl      |   36 +-
 tp/t/results/formats_encodings/accent.pl           |  228 +-
 .../formats_encodings/accent_argument_non_ascii.pl |   18 +-
 .../formats_encodings/accent_enable_encoding.pl    |  228 +-
 tp/t/results/formats_encodings/accentenc.pl        |  231 +-
 .../formats_encodings/accentenc_enable_encoding.pl |  231 +-
 .../formats_encodings/at_commands_in_refs.pl       | 1851 +++++----------
 .../at_commands_in_refs_latin1.pl                  | 1852 +++++----------
 .../formats_encodings/at_commands_in_refs_utf8.pl  | 1850 +++++----------
 .../char_latin1_latin1_in_refs.pl                  |   96 +-
 .../char_latin2_latin2_in_refs.pl                  |   33 +-
 .../char_us_ascii_latin1_in_refs.pl                |   96 +-
 .../formats_encodings/char_utf8_latin1_in_refs.pl  |   96 +-
 .../documentencoding_utf8_and_insertions.pl        |   21 +-
 .../dotless_argument_non_ascii.pl                  |   20 +-
 .../formats_encodings/japanese_shift_jis.pl        |   58 +-
 .../manual_simple_latin1_with_error.pl             |   20 +-
 .../manual_simple_utf8_with_error.pl               |   17 +-
 .../multiple_include_encodings.pl                  |  123 +-
 .../no_documentencoding_and_insertions.pl          |   18 +-
 tp/t/results/formats_encodings/sample_utf8.pl      |  105 +-
 .../formats_encodings/verb_delimiter_not_ascii.pl  |   15 +-
 tp/t/results/formats_encodings/weird_accents.pl    |   57 +-
 .../weird_accents_disable_encoding.pl              |   57 +-
 tp/t/results/heading/heading_in_copying.pl         |   30 +-
 tp/t/results/heading/heading_in_example.pl         |   12 +-
 tp/t/results/heading/heading_in_quotation.pl       |   12 +-
 .../html_tests/acronym_in_node_and_section.pl      |   36 +-
 tp/t/results/html_tests/automatic_menus.pl         |   30 +-
 .../character_number_leading_toc_stoc.pl           |   18 +-
 tp/t/results/html_tests/check_htmlxref.pl          |   47 +-
 .../html_tests/check_htmlxref_ignore_ref_top_up.pl |   46 +-
 tp/t/results/html_tests/check_htmlxref_menu.pl     |   48 +-
 .../html_tests/check_htmlxref_no_use_nodes.pl      |   46 +-
 tp/t/results/html_tests/commands_in_abbr.pl        |   18 +-
 tp/t/results/html_tests/commands_in_alt.pl         |   18 +-
 tp/t/results/html_tests/commands_in_email.pl       |    9 +-
 tp/t/results/html_tests/contents_at_end.pl         |   24 +-
 tp/t/results/html_tests/contents_at_end_inline.pl  |   24 +-
 .../html_tests/contents_at_end_separate_element.pl |   24 +-
 .../html_tests/contents_in_middle_chapter.pl       |   39 +-
 .../contents_in_middle_chapter_inline.pl           |   39 +-
 .../contents_in_middle_chapter_separate_element.pl |   39 +-
 .../html_tests/contents_in_middle_section.pl       |   48 +-
 .../contents_in_middle_section_inline.pl           |   48 +-
 .../contents_in_middle_section_separate_element.pl |   48 +-
 .../deftypefnnewline_for_copying_after.pl          |   45 +-
 .../deftypefnnewline_for_copying_before.pl         |   39 +-
 tp/t/results/html_tests/documentdescription.pl     |   36 +-
 tp/t/results/html_tests/double_contents.pl         |   45 +-
 .../html_tests/double_contents_after_title.pl      |   45 +-
 .../double_contents_after_title_show_title.pl      |   45 +-
 ...double_contents_after_title_show_title_nodes.pl |   45 +-
 tp/t/results/html_tests/double_contents_book.pl    |   45 +-
 tp/t/results/html_tests/double_contents_chapter.pl |   45 +-
 tp/t/results/html_tests/double_contents_inline.pl  |   45 +-
 .../html_tests/double_contents_inline_chapter.pl   |   45 +-
 .../html_tests/double_contents_inline_nodes.pl     |   45 +-
 .../html_tests/double_contents_inline_section.pl   |   45 +-
 tp/t/results/html_tests/double_contents_nodes.pl   |   45 +-
 tp/t/results/html_tests/double_contents_section.pl |   45 +-
 .../html_tests/double_contents_separate_element.pl |   45 +-
 .../double_contents_separate_element_chapter.pl    |   45 +-
 .../double_contents_separate_element_nodes.pl      |   45 +-
 .../double_contents_separate_element_section.pl    |   45 +-
 .../empty_lines_at_beginning_no_setfilename.pl     |    6 +-
 ...lines_at_beginning_no_setfilename_no_element.pl |    3 +-
 tp/t/results/html_tests/empty_titlefont.pl         |    3 +-
 .../file_name_case_insensitive_conflict_node.pl    |   43 +-
 ...se_insensitive_conflict_node_no_redirections.pl |   39 +-
 ..._name_case_insensitive_conflict_redirections.pl |   44 +-
 .../html_tests/file_name_conflict_with_Top.pl      |   16 +-
 .../html_tests/file_name_conflict_with_section.pl  |   14 +-
 .../file_name_conflict_with_user_defined.pl        |   22 +-
 .../html_tests/filenameconflictwithnonsplit.pl     |    9 +-
 .../filenameconflictwithspecialelement.pl          |   19 +-
 tp/t/results/html_tests/float_copying.pl           |  105 +-
 ...otnotestyle_separate_html_text_no_monolithic.pl |   18 +-
 .../html_tests/footnotestyle_separate_late.pl      |   27 +-
 .../html_tests/headings_after_lone_nodes.pl        |  111 +-
 tp/t/results/html_tests/html_in_copying.pl         |   18 +-
 tp/t/results/html_tests/image_link_prefix.pl       |    4 +-
 .../results/html_tests/index_and_node_same_name.pl |   12 +-
 tp/t/results/html_tests/index_below.pl             |   15 +-
 tp/t/results/html_tests/info_js_dir_html.pl        |   12 +-
 tp/t/results/html_tests/info_js_dir_html_file.pl   |   12 +-
 tp/t/results/html_tests/info_js_dir_html_text.pl   |   12 +-
 tp/t/results/html_tests/itemize_arguments.pl       |  585 ++---
 .../itemize_arguments_enable_encoding.pl           |  585 ++---
 tp/t/results/html_tests/mathjax_with_texinfo.pl    |   36 +-
 .../mathjax_with_texinfo_enable_encoding.pl        |   36 +-
 .../html_tests/mathjax_with_texinfo_html_file.pl   |   36 +-
 .../html_tests/mathjax_with_texinfo_html_text.pl   |   36 +-
 .../mathjax_with_texinfo_no_convert_to_latex.pl    |   36 +-
 tp/t/results/html_tests/menu.pl                    |  120 +-
 tp/t/results/html_tests/menu_in_example.pl         |   37 +-
 tp/t/results/html_tests/no_content.pl              |   21 +-
 tp/t/results/html_tests/no_content_do_contents.pl  |   21 +-
 .../html_tests/no_content_do_contents_inline.pl    |   21 +-
 .../no_content_do_contents_separate_element.pl     |   21 +-
 tp/t/results/html_tests/no_content_inline.pl       |   21 +-
 .../html_tests/no_content_separate_element.pl      |   21 +-
 tp/t/results/html_tests/no_use_iso.pl              |    3 +-
 tp/t/results/html_tests/node_footnote_end.pl       |   96 +-
 tp/t/results/html_tests/node_footnote_separated.pl |   93 +-
 tp/t/results/html_tests/node_footnote_use_node.pl  |   93 +-
 .../html_tests/node_footnote_use_node_separate.pl  |   93 +-
 tp/t/results/html_tests/raw_html.pl                |    6 +-
 tp/t/results/html_tests/redirection_same_labels.pl |   88 +-
 tp/t/results/html_tests/ref_in_preformatted.pl     |   24 +-
 .../html_tests/sectioning_check_menu_structure.pl  |  154 +-
 tp/t/results/html_tests/shortcontents_no_top.pl    |   12 +-
 tp/t/results/html_tests/shorttitlepage.pl          |   21 +-
 .../html_tests/simplest_test_date_in_header.pl     |    3 +-
 .../html_tests/spaces_in_line_break_in_verb_w.pl   |    6 +-
 tp/t/results/html_tests/split_html_text.pl         |   12 +-
 tp/t/results/html_tests/test_accents_sc_default.pl |  162 +-
 .../html_tests/test_accents_sc_default_latin1.pl   |  165 +-
 .../html_tests/test_accents_sc_default_usascii.pl  |  168 +-
 .../html_tests/test_accents_sc_enable_encoding.pl  |  162 +-
 .../test_accents_sc_enable_encoding_latin1.pl      |  165 +-
 ...st_accents_sc_enable_encoding_to_utf8_latin1.pl |  165 +-
 ...t_accents_sc_enable_encoding_to_utf8_usascii.pl |  168 +-
 .../test_accents_sc_enable_encoding_usascii.pl     |  168 +-
 .../html_tests/test_accents_sc_to_utf8_latin1.pl   |  165 +-
 .../test_accents_sc_use_numeric_entity.pl          |  162 +-
 .../test_separated_contents_shortcontents.pl       |   24 +-
 .../html_tests/test_xrefautomaticsectiontitle.pl   |   33 +-
 .../test_xrefautomaticsectiontitle_off_first.pl    |   33 +-
 tp/t/results/html_tests/tex_expanded_in_copying.pl |   12 +-
 .../text_before_top_and_contents_after_title.pl    |   12 +-
 ...t_before_top_and_summarycontents_after_title.pl |   12 +-
 tp/t/results/html_tests/titles.pl                  |   21 +-
 .../top_file_name_and_node_name_collision.pl       |   16 +-
 tp/t/results/html_tests/top_node_up_explicit.pl    |   21 +-
 .../html_tests/top_node_up_explicit_no_nodes.pl    |   21 +-
 tp/t/results/html_tests/top_node_up_implicit.pl    |   21 +-
 .../html_tests/top_node_up_implicit_no_nodes.pl    |   21 +-
 .../html_tests/transliterated_names_conflicts.pl   |   31 +-
 tp/t/results/html_tests/uref_accented_letter.pl    |    9 +-
 .../html_tests/uref_accented_letter_ascii.pl       |   12 +-
 .../html_tests/uref_accented_letter_latin1.pl      |   12 +-
 tp/t/results/html_tests/utf8_default.pl            |    6 +-
 tp/t/results/html_tests/utf8_enable_encoding.pl    |    6 +-
 .../html_tests/utf8_enable_encoding_no_use_iso.pl  |    6 +-
 .../utf8_enable_encoding_use_numeric_entity.pl     |    6 +-
 tp/t/results/html_tests/utf8_use_numeric_entity.pl |    6 +-
 .../verbatim_in_multitable_in_example.pl           |   36 +-
 tp/t/results/html_tests/xml_protected_in_verb.pl   |   12 +-
 tp/t/results/htmlxref/htmlxref.pl                  |  200 +-
 tp/t/results/htmlxref/htmlxref_nodes.pl            |  200 +-
 tp/t/results/htmlxref/htmlxref_only_mono.pl        |  198 +-
 tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl  |  198 +-
 tp/t/results/htmlxref/htmlxref_only_split.pl       |  198 +-
 tp/t/results/htmlxref/htmlxref_only_split_nodes.pl |  198 +-
 tp/t/results/include/cpp_line_before_first_node.pl |    1 -
 tp/t/results/include/cpp_line_latin1.pl            |   13 +-
 tp/t/results/include/cpp_lines.pl                  |   81 +-
 tp/t/results/include/double_include.pl             |    8 +-
 tp/t/results/include/include_at_end_line.pl        |    4 +-
 tp/t/results/include/include_comment.pl            |    3 +-
 .../include_setfilename_on_setfilename_line.pl     |   17 +-
 tp/t/results/include/include_space.pl              |    3 +-
 tp/t/results/include/include_space_comment.pl      |    3 +-
 tp/t/results/include/include_with_setfilename.pl   |    9 +-
 .../include_with_setfilename_in_preformatted.pl    |   12 +-
 .../macro_and_commands_in_early_commands.pl        |   46 +-
 .../results/include/macro_definition_in_include.pl |    9 +-
 tp/t/results/include/macro_in_early_commands.pl    |   51 +-
 tp/t/results/include/no_eol_in_included_file.pl    |    3 +-
 tp/t/results/include/simple.pl                     |    3 +-
 tp/t/results/include/simple_no_eol.pl              |    3 +-
 tp/t/results/include/test_two_include.pl           |    6 +-
 tp/t/results/include/value_expansion_in_include.pl |   39 +-
 .../include/verbatiminclude_and_encoding.pl        |    6 +-
 .../include/verbatiminclude_and_encoding_latin1.pl |    6 +-
 tp/t/results/indices/complex_recursive_synindex.pl |   78 +-
 tp/t/results/indices/def_existing_index.pl         |    4 +-
 tp/t/results/indices/def_syn_indices.pl            |  106 +-
 ...default_cp_index_and_one_letter_syncodeindex.pl |  Bin 10539 -> 10385 bytes
 tp/t/results/indices/double_index_entry.pl         |   27 +-
 tp/t/results/indices/double_seeentry_seealso.pl    |   58 +-
 tp/t/results/indices/double_syncodeindex.pl        |   25 +-
 tp/t/results/indices/empty_added_index_entry.pl    |   13 +-
 tp/t/results/indices/empty_cindex_entry.pl         |   10 +-
 tp/t/results/indices/empty_index_entry.pl          |   25 +-
 tp/t/results/indices/empty_string_index_entry.pl   |   82 +-
 tp/t/results/indices/encoding_index_ascii.pl       |  270 +--
 .../encoding_index_ascii_enable_encoding.pl        |  270 +--
 tp/t/results/indices/encoding_index_latin1.pl      |  261 +--
 .../encoding_index_latin1_enable_encoding.pl       |  261 +--
 tp/t/results/indices/encoding_index_utf8.pl        |  261 +--
 .../indices/encoding_index_utf8_enable_encoding.pl |  261 +--
 tp/t/results/indices/explicit_sort_key.pl          |   69 +-
 tp/t/results/indices/ftable_vtable.pl              |   54 +-
 .../indices/ignored_sort_char_empty_entries.pl     |   35 +-
 tp/t/results/indices/image_lines_count.pl          |  Bin 5993 -> 5889 bytes
 tp/t/results/indices/image_text_lines_count.pl     |  Bin 6438 -> 6315 bytes
 tp/t/results/indices/index_and_node_same_name.pl   |   18 +-
 tp/t/results/indices/index_entries_before_nodes.pl |  Bin 12028 -> 11798 bytes
 tp/t/results/indices/index_entries_locations.pl    |   21 +-
 .../indices/index_entry_before_first_node.pl       |  Bin 6235 -> 6101 bytes
 tp/t/results/indices/index_entry_before_node.pl    |   27 +-
 tp/t/results/indices/index_entry_in_footnote.pl    |  Bin 7366 -> 7242 bytes
 .../index_entry_in_footnote_different_node_end.pl  |   33 +-
 .../indices/index_entry_in_footnote_sections.pl    |   21 +-
 .../index_entry_in_footnote_sections_separate.pl   |   21 +-
 .../indices/index_entry_in_footnote_separate.pl    |   36 +-
 tp/t/results/indices/index_no_node.pl              |   85 +-
 tp/t/results/indices/index_no_node_no_top.pl       |  109 +-
 .../indices/index_no_node_no_top_no_node.pl        |  109 +-
 tp/t/results/indices/index_nodes.pl                |   99 +-
 .../indices/index_nodes_no_split_no_use_nodes.pl   |  110 +-
 tp/t/results/indices/index_special_region.pl       |  161 +-
 .../index_special_region_no_insertcopying.pl       |  153 +-
 ...egion_no_insertcopying_no_titlepage_no_nodes.pl |  153 +-
 ...l_region_no_insertcopying_titlepage_no_nodes.pl |  153 +-
 ...copying_titlepage_no_nodes_footnotes_default.pl |  153 +-
 .../index_special_region_no_titlepage_no_nodes.pl  |  159 +-
 .../index_special_region_titlepage_no_nodes.pl     |  161 +-
 ..._region_titlepage_no_nodes_footnotes_default.pl |  159 +-
 tp/t/results/indices/index_split.pl                |  195 +-
 .../indices/index_split_split_chapter_no_nodes.pl  |  196 +-
 tp/t/results/indices/index_table.pl                |  494 ++--
 .../results/indices/index_table_chapter_no_node.pl |  494 ++--
 .../multiple_index_text_sortas_seeentry_seealso.pl |   39 +-
 tp/t/results/indices/nodes_before_top.pl           |  126 +-
 .../nodes_before_top_and_sections_chapter.pl       |  156 +-
 ...odes_before_top_and_sections_chapter_no_node.pl |  156 +-
 ...des_before_top_and_sections_unsplit_no_nodes.pl |  156 +-
 .../indices/nodes_before_top_split_chapter.pl      |  126 +-
 .../nodes_before_top_split_chapter_no_nodes.pl     |  139 +-
 tp/t/results/indices/print_merged_index.pl         |   13 +-
 tp/t/results/indices/printindex_before_document.pl |    4 +-
 .../indices/printindex_between_node_section.pl     |   39 +-
 .../indices/printindex_between_part_chapter.pl     |   43 +-
 .../indices/printindex_index_entry_in_copying.pl   |   69 +-
 ...rintindex_index_entry_in_copying_in_footnote.pl |   42 +-
 ...ndex_index_entry_in_copying_no_insertcopying.pl |   63 +-
 .../indices/printindex_with_space_before.pl        |  Bin 7280 -> 7180 bytes
 tp/t/results/indices/recursive_synindex.pl         |   13 +-
 .../indices/same_index_entry_merged_indices.pl     |   39 +-
 tp/t/results/indices/same_only_seealso_seeentry.pl |   51 +-
 tp/t/results/indices/same_seealso_seeentry.pl      |   54 +-
 tp/t/results/indices/seealso_duplicate.pl          |   33 +-
 tp/t/results/indices/seeentry.pl                   |   42 +-
 tp/t/results/indices/sorted_subentries.pl          |  172 +-
 tp/t/results/indices/split_chapter_index.pl        |   93 +-
 tp/t/results/indices/subentries.pl                 |   80 +-
 tp/t/results/indices/subentries_and_comments.pl    |   27 +-
 tp/t/results/indices/subentry_and_sortas.pl        |   42 +-
 tp/t/results/indices/subentry_and_sortas_spaces.pl |   57 +-
 tp/t/results/indices/syncode_index_print_both.pl   |   28 +-
 tp/t/results/indices/syncodeindex_to_plain.pl      |   24 +-
 tp/t/results/indices/transparent_sort_chars.pl     |   27 +-
 tp/t/results/indices/unknown_index_entry.pl        |    1 -
 tp/t/results/indices/unknown_printindex.pl         |    4 +-
 tp/t/results/indices/unknown_synindex.pl           |    5 +-
 .../indices/unknown_then_known_index_entry.pl      |    8 +-
 tp/t/results/indices/w_lines_count.pl              |  Bin 9977 -> 9745 bytes
 tp/t/results/indices/wrong_synindex.pl             |    7 +-
 tp/t/results/info_tests/anchor_and_spaces.pl       |   15 +-
 tp/t/results/info_tests/anchor_in_command.pl       |   18 +-
 tp/t/results/info_tests/before_node_and_section.pl |   55 +-
 tp/t/results/info_tests/center_flush.pl            |   27 +-
 .../info_tests/chinese_mixed_with_en_EUC_CN.pl     |   19 +-
 tp/t/results/info_tests/colon_in_index_entry.pl    |   48 +-
 .../info_tests/colons_in_index_entries_and_node.pl |   60 +-
 .../colons_in_index_entries_and_node_no_quoting.pl |   63 +-
 tp/t/results/info_tests/def_in_copying.pl          |   21 +-
 tp/t/results/info_tests/direntry_dircategory.pl    |   68 +-
 .../direntry_dircategory_and_commands.pl           |   36 +-
 tp/t/results/info_tests/empty_arguments.pl         |    9 +-
 tp/t/results/info_tests/empty_caption.pl           |   15 +-
 tp/t/results/info_tests/empty_copying_not_ended.pl |    4 +-
 tp/t/results/info_tests/encoding_us_ascii.pl       |    6 +-
 .../end_of_line_command_in_node_lines.pl           |   55 +-
 tp/t/results/info_tests/error_in_footnote.pl       |   39 +-
 tp/t/results/info_tests/file_only_png.pl           |  Bin 3710 -> 3625 bytes
 tp/t/results/info_tests/float_long_captions.pl     |   24 +-
 tp/t/results/info_tests/float_without_type.pl      |   12 +-
 tp/t/results/info_tests/image_and_punctuation.pl   |  Bin 7577 -> 7368 bytes
 .../info_tests/image_and_spaces_formatting.pl      |   78 +-
 tp/t/results/info_tests/image_extension.pl         |  Bin 4810 -> 4706 bytes
 tp/t/results/info_tests/image_in_paragraph.pl      |  Bin 3143 -> 3089 bytes
 tp/t/results/info_tests/image_not_found.pl         |    7 +-
 tp/t/results/info_tests/image_quotes.pl            |  Bin 2727 -> 2677 bytes
 tp/t/results/info_tests/image_text_encoded.pl      |    6 +-
 .../info_tests/image_text_file_only_and_alt.pl     |  Bin 2851 -> 2801 bytes
 tp/t/results/info_tests/index_entry_at_end_node.pl |   36 +-
 .../info_tests/invalid_node_name_no_warning.pl     |   69 +-
 .../info_tests/invalid_node_name_warning.pl        |   78 +-
 tp/t/results/info_tests/known_encoding.pl          |    7 +-
 .../info_tests/multiline_image_and_align.pl        |   84 +-
 .../multitable_anchor_and_index_entry.pl           |   81 +-
 .../info_tests/nested_footnotes_separate.pl        |   13 +-
 .../info_tests/nested_multitable_anchor_index.pl   |   66 +-
 tp/t/results/info_tests/no_node_but_top.pl         |    3 +-
 tp/t/results/info_tests/no_top_node.pl             |    3 +-
 tp/t/results/info_tests/note_in_strong.pl          |   23 +-
 .../info_tests/note_in_strong_end_of_line.pl       |   11 +-
 tp/t/results/info_tests/novalidate_empty_refs.pl   |   30 +-
 .../info_tests/one_node_counted_elements.pl        |   29 +-
 tp/t/results/info_tests/only_documentencoding.pl   |    3 +-
 .../info_tests/paragraphindent_and_preamble.pl     |   15 +-
 .../info_tests/paragraphindent_asis_first.pl       |    3 +-
 .../paragraphindent_in_preamble_and_in_document.pl |   18 +-
 .../info_tests/paragraphindent_none_first.pl       |    3 +-
 .../info_tests/paragraphindent_not_in_preamble.pl  |   15 +-
 tp/t/results/info_tests/pxref_test.pl              |   15 +-
 tp/t/results/info_tests/quote_node_names_info.pl   |  138 +-
 tp/t/results/info_tests/ref_tests.pl               |   31 +-
 tp/t/results/info_tests/space_at_menu_end.pl       |   12 +-
 tp/t/results/info_tests/space_in_menu.pl           |   21 +-
 tp/t/results/info_tests/space_in_setfilename.pl    |   11 +-
 tp/t/results/info_tests/split_no_copying.pl        |   24 +-
 tp/t/results/info_tests/split_nocopying.pl         |   21 +-
 tp/t/results/info_tests/split_nocopying_split.pl   |   21 +-
 .../info_tests/split_test_before_first_node.pl     |   24 +-
 .../split_test_before_first_node_no_empty_line.pl  |   24 +-
 tp/t/results/info_tests/test_index.pl              |  133 +-
 tp/t/results/info_tests/text_before_node.pl        |   21 +-
 tp/t/results/info_tests/top_node_normalization.pl  |   21 +-
 .../info_tests/two_paragraphindent_in_preamble.pl  |   18 +-
 ..._paragraphindent_in_preamble_and_in_document.pl |   21 +-
 tp/t/results/info_tests/unknown_encoding.pl        |    8 +-
 tp/t/results/info_tests/xref_test.pl               |   23 +-
 .../init_files_tests/customize_special_element.pl  |   33 +-
 .../init_files_tests/customize_translations.pl     |   54 +-
 .../init_files_tests/documentation_examples.pl     |  102 +-
 ...acro_defined_txiinternalvalue_in_translation.pl |    6 +-
 .../init_files_tests/modified_translation.pl       |   15 +-
 tp/t/results/init_files_tests/redefined_need.pl    |    4 +-
 .../init_files_tests/sc_formatting_with_css.pl     |   20 +-
 .../translation_in_parser_in_translation.pl        |   24 +-
 .../init_files_tests/undefined_node_filename.pl    |    6 +-
 tp/t/results/invalid_nestings/accents.pl           |   23 +-
 tp/t/results/invalid_nestings/bad_style_nesting.pl |   11 +-
 tp/t/results/invalid_nestings/bad_tab_nesting.pl   |   23 +-
 .../results/invalid_nestings/block_not_matching.pl |   64 +-
 .../invalid_nestings/cartouche_in_style_command.pl |   11 +-
 tp/t/results/invalid_nestings/center.pl            |  183 +-
 .../invalid_nestings/def_in_style_command.pl       |   15 +-
 .../def_not_closed_in_menu_description.pl          |   18 +-
 .../invalid_nestings/enumerate_in_style_command.pl |   14 +-
 .../invalid_nestings/example_in_style_command.pl   |   11 +-
 .../invalid_nestings/float_in_style_command.pl     |   14 +-
 .../flushright_in_style_command.pl                 |   11 +-
 tp/t/results/invalid_nestings/footnote_in_ref.pl   |   11 +-
 .../formats_not_closed_in_example.pl               |   26 +-
 tp/t/results/invalid_nestings/ignore_in_xref.pl    |   13 +-
 tp/t/results/invalid_nestings/ignored_text.pl      |   10 +-
 tp/t/results/invalid_nestings/in_errormsg.pl       |   31 +-
 tp/t/results/invalid_nestings/in_table.pl          |  108 +-
 tp/t/results/invalid_nestings/item_in_ref.pl       |   20 +-
 .../item_tab_outside_of_table_lists.pl             |    7 +-
 .../itemx_in_itemize_enumerate_in_table.pl         |   34 +-
 .../invalid_nestings/menu_in_style_command.pl      |   17 +-
 .../multitable_in_style_command.pl                 |   23 +-
 .../invalid_nestings/multitable_item_in_index.pl   |   19 +-
 tp/t/results/invalid_nestings/node_in_copying.pl   |    8 +-
 .../invalid_nestings/node_in_copying_not_closed.pl |   13 +-
 .../invalid_nestings/node_on_index_entry_line.pl   |    9 +-
 .../invalid_nestings/on_block_command_line.pl      |   51 +-
 tp/t/results/invalid_nestings/on_def_line.pl       |   54 +-
 .../invalid_nestings/on_index_entry_line.pl        |   25 +-
 tp/t/results/invalid_nestings/on_itemize_line.pl   |   38 +-
 tp/t/results/invalid_nestings/on_node_line.pl      |   24 +-
 tp/t/results/invalid_nestings/on_section_line.pl   |   24 +-
 .../results/invalid_nestings/on_subheading_line.pl |   24 +-
 tp/t/results/invalid_nestings/quotation_in_ref.pl  |   14 +-
 .../invalid_nestings/quotation_in_style_command.pl |   11 +-
 tp/t/results/invalid_nestings/raw_block_on_line.pl |    9 +-
 tp/t/results/invalid_nestings/recursive_copying.pl |   10 +-
 tp/t/results/invalid_nestings/ref_in_ref.pl        |   11 +-
 .../invalid_nestings/ref_to_top_in_anchor.pl       |   10 +-
 .../results/invalid_nestings/section_in_copying.pl |    7 +-
 .../invalid_nestings/section_in_flushright.pl      |    7 +-
 .../invalid_nestings/section_in_footnote.pl        |    7 +-
 tp/t/results/invalid_nestings/section_in_math.pl   |   20 +-
 .../section_in_nested_block_commands.pl            |   17 +-
 tp/t/results/invalid_nestings/section_in_table.pl  |   15 +-
 .../invalid_nestings/section_on_cartouche_line.pl  |   14 +-
 .../invalid_nestings/section_on_def_line.pl        |   14 +-
 .../invalid_nestings/section_on_defx_line.pl       |   18 +-
 .../invalid_nestings/section_on_enumerate_line.pl  |   19 +-
 .../invalid_nestings/section_on_float_line.pl      |    9 +-
 .../section_on_index_entry_line.pl                 |    9 +-
 .../invalid_nestings/section_on_itemize_line.pl    |   45 +-
 .../invalid_nestings/section_on_multitable_line.pl |   38 +-
 .../invalid_nestings/section_on_xtable_line.pl     |   48 +-
 .../style_not_closed_before_first_node.pl          |    7 +-
 .../style_not_closed_in_block_command.pl           |   10 +-
 .../style_not_closed_in_table_line.pl              |   19 +-
 .../style_not_closed_no_newline_root_commands.pl   |   31 +-
 .../style_not_closed_root_commands.pl              |   29 +-
 tp/t/results/invalid_nestings/tab_in_index.pl      |   24 +-
 tp/t/results/invalid_nestings/table_in_code.pl     |   17 +-
 .../table_not_closed_in_menu_comment.pl            |   19 +-
 .../table_not_closed_in_menu_description.pl        |   20 +-
 .../results/invalid_nestings/table_on_item_line.pl |   25 +-
 .../unclosed_verb_end_of_line_on_misc_line.pl      |   10 +-
 .../invalid_nestings/unclosed_verb_on_misc_line.pl |    9 +-
 .../unclosed_verb_on_section_line.pl               |    8 +-
 tp/t/results/invalid_nestings/verbatim_in_ref.pl   |   14 +-
 tp/t/results/itemize/accent_argument.pl            |   36 +-
 tp/t/results/itemize/asis_as_itemize_argument.pl   |   12 +-
 tp/t/results/itemize/bad_enumerate_arguments.pl    |   38 +-
 .../itemize/comment_first_on_enumerate_line.pl     |    9 +-
 .../itemize/comment_first_on_itemize_line.pl       |    9 +-
 tp/t/results/itemize/empty_accent_argument.pl      |   52 +-
 tp/t/results/itemize/enumerate_and_empty_lines.pl  |   57 +-
 tp/t/results/itemize/enumerate_argument.pl         |   18 +-
 tp/t/results/itemize/enumerate_argument_item.pl    |   36 +-
 tp/t/results/itemize/enumerate_in_example.pl       |   18 +-
 tp/t/results/itemize/enumerate_letters.pl          |  624 ++---
 tp/t/results/itemize/enumerate_more_letters.pl     | 2412 +++++++-------------
 .../results/itemize/headitem_itemx_in_enumerate.pl |   14 +-
 tp/t/results/itemize/headitem_itemx_in_itemize.pl  |   14 +-
 .../itemize/inter_item_commands_in_enumerate.pl    |   87 +-
 .../itemize/inter_item_commands_in_itemize.pl      |   60 +-
 tp/t/results/itemize/itemize_and_empty_lines.pl    |  147 +-
 tp/t/results/itemize/itemize_in_example.pl         |   60 +-
 .../itemize/itemize_line_commands_with_brace.pl    |   24 +-
 tp/t/results/itemize/itemize_long_item.pl          |   48 +-
 tp/t/results/itemize/lone_end_itemize.pl           |    1 -
 tp/t/results/itemize/not_closed_item.pl            |    7 +-
 tp/t/results/itemize/not_closed_itemize.pl         |    4 +-
 tp/t/results/itemize/table_in_itemize.pl           |   33 +-
 tp/t/results/itemize/w_argument.pl                 |   21 +-
 tp/t/results/languages/appendix_translated.pl      |   15 +-
 tp/t/results/languages/command_translated.pl       |   24 +-
 tp/t/results/languages/documentlanguage.pl         |   30 +-
 tp/t/results/languages/documentlanguage_option.pl  |   30 +-
 tp/t/results/languages/documentlanguage_unknown.pl |   30 +-
 .../results/languages/multiple_documentlanguage.pl |   72 +-
 tp/t/results/languages/multiple_in_preamble.pl     |   60 +-
 .../languages/multiple_in_preamble_before_node.pl  |   51 +-
 tp/t/results/languages/multiple_lang_chapters.pl   |  126 +-
 .../languages/multiple_lang_chapters_latex.pl      |  126 +-
 .../languages/multiple_lang_chapters_texi2html.pl  |  123 +-
 tp/t/results/languages/simple_documentlanguage.pl  |   18 +-
 tp/t/results/languages/unknown_language.pl         |   27 +-
 tp/t/results/languages/unknown_region.pl           |   19 +-
 tp/t/results/latex_tests/anchor_before_top.pl      |   18 +-
 tp/t/results/latex_tests/anchor_in_copying.pl      |   24 +-
 .../anchor_in_copying_insertcopying_chap.pl        |   30 +-
 .../anchor_in_copying_insertcopying_titlepage.pl   |   42 +-
 ...chor_in_copying_insertcopying_titlepage_chap.pl |   42 +-
 .../anchor_links_xref_xrefautomaticsectiontitle.pl |   62 +-
 tp/t/results/latex_tests/backslash_math.pl         |    6 +-
 tp/t/results/latex_tests/brace_in_index.pl         |   37 +-
 .../latex_tests/custom_heading_with_include.pl     |  156 +-
 .../custom_heading_with_include_in_command.pl      |  159 +-
 tp/t/results/latex_tests/custom_headings.pl        |   36 +-
 .../latex_tests/custom_headings_and_comments.pl    |   27 +-
 .../latex_tests/customize_informative_commands.pl  |    3 +-
 tp/t/results/latex_tests/enumerate_arguments.pl    |   72 +-
 .../latex_tests/error_in_sectioning_command.pl     |   30 +-
 tp/t/results/latex_tests/example_in_cartouche.pl   |   18 +-
 tp/t/results/latex_tests/float_and_refs.pl         |  108 +-
 tp/t/results/latex_tests/fonttextsize.pl           |   44 +-
 tp/t/results/latex_tests/indices.pl                |  110 +-
 .../latex_tests/indices_disable_encoding.pl        |  110 +-
 .../informative_commands_in_top_node.pl            |   24 +-
 tp/t/results/latex_tests/nested_enumerate.pl       |   48 +-
 tp/t/results/latex_tests/nested_itemize.pl         |   48 +-
 .../no_titlepage_and_setchapternewpage_odd.pl      |    3 +-
 .../no_titlepage_and_setchapternewpage_on.pl       |    3 +-
 tp/t/results/latex_tests/node_before_top.pl        |   18 +-
 tp/t/results/latex_tests/pagesizes.pl              |   30 +-
 tp/t/results/latex_tests/pagetype.pl               |   29 +-
 .../setchapternewpage_on_odd_titlepage.pl          |   13 +-
 ...chapternewpage_on_odd_titlepage_set_headings.pl |   16 +-
 tp/t/results/latex_tests/settitle_and_headings.pl  |    9 +-
 tp/t/results/latex_tests/shorttitlepage.pl         |   15 +-
 .../three_setchapternewpage_on_odd_off.pl          |   11 +-
 tp/t/results/latex_tests/titlepage_and_headings.pl |    6 +-
 .../titlepage_and_setchapternewpage_odd.pl         |    9 +-
 .../titlepage_and_setchapternewpage_on.pl          |    9 +-
 tp/t/results/latex_tests/titlepage_classical.pl    |   42 +-
 tp/t/results/latex_tests/titlepage_in_top_node.pl  |   21 +-
 tp/t/results/latex_tests/titlepage_long_title.pl   |   21 +-
 tp/t/results/latex_tests/titlepage_no_author.pl    |   21 +-
 tp/t/results/latex_tests/titlepage_no_title.pl     |   24 +-
 .../titlepage_with_commands_classical.pl           |   59 +-
 .../latex_tests/top_no_sectioning_command.pl       |   12 +-
 .../latex_tests/two_setchapternewpage_odd_on.pl    |    7 +-
 .../latex_tests/two_setchapternewpage_on_odd.pl    |    7 +-
 tp/t/results/latex_tests/vbar_in_index.pl          |    8 +-
 tp/t/results/latex_tests/verb.pl                   |   14 +-
 .../results/latex_tests/verbatim_in_smallformat.pl |   12 +-
 tp/t/results/layout/navigation.pl                  |   54 +-
 tp/t/results/layout/navigation_chapter.pl          |   54 +-
 .../results/layout/navigation_chapter_no_header.pl |   54 +-
 .../navigation_chapter_no_header_vertical.pl       |   54 +-
 tp/t/results/layout/navigation_chapter_vertical.pl |   54 +-
 tp/t/results/layout/navigation_no_header.pl        |   54 +-
 .../layout/navigation_no_header_vertical.pl        |   54 +-
 tp/t/results/layout/navigation_node.pl             |   54 +-
 tp/t/results/layout/navigation_node_no_header.pl   |   54 +-
 .../layout/navigation_node_no_header_vertical.pl   |   54 +-
 tp/t/results/layout/navigation_node_vertical.pl    |   54 +-
 tp/t/results/layout/navigation_section.pl          |   54 +-
 .../results/layout/navigation_section_no_header.pl |   54 +-
 .../navigation_section_no_header_vertical.pl       |   54 +-
 tp/t/results/layout/navigation_section_vertical.pl |   54 +-
 .../layout/navigation_test_misc_file_collision.pl  |   54 +-
 tp/t/results/layout/navigation_vertical.pl         |   54 +-
 tp/t/results/layout/no_monolithic.pl               |   36 +-
 tp/t/results/layout/no_monolithic_only_toc_out.pl  |   36 +-
 tp/t/results/linemacro/api_doc_with_linemacro.pl   |   51 +-
 .../linemacro/arobase_brace_in_linemacro_call.pl   |    6 +-
 .../linemacro/begin_conditional_in_linemacro.pl    |   12 +-
 .../linemacro/block_begin_end_in_linemacro_call.pl |   27 +-
 tp/t/results/linemacro/blockitem_no_item.pl        |   10 +-
 tp/t/results/linemacro/brace_command_not_closed.pl |    7 +-
 tp/t/results/linemacro/braces_after_text.pl        |   12 +-
 .../linemacro/call_macro_in_linemacro_body.pl      |   12 +-
 .../linemacro/call_macro_in_linemacro_call.pl      |   15 +-
 .../linemacro/comment_at_end_of_linemacro_call.pl  |    9 +-
 .../results/linemacro/comment_in_linemacro_call.pl |    6 +-
 .../comment_in_one_argument_linemacro_call.pl      |    6 +-
 .../comment_on_linemacro_call_macro_expansion.pl   |   12 +-
 .../comment_on_linemacro_call_out_of_braces.pl     |    6 +-
 tp/t/results/linemacro/empty_last_argument.pl      |   15 +-
 .../linemacro/end_conditional_in_linemacro.pl      |   16 +-
 .../results/linemacro/last_argument_with_braces.pl |   12 +-
 tp/t/results/linemacro/missing_formal_arg.pl       |    8 +-
 tp/t/results/linemacro/nested_linemacro_calls.pl   |   19 +-
 .../linemacro/newline_and_continuation_in_brace.pl |   12 +-
 tp/t/results/linemacro/no_arguments.pl             |    6 +-
 tp/t/results/linemacro/paragraph_no_paragraph.pl   |    6 +-
 tp/t/results/linemacro/protected_spaces_on_line.pl |    6 +-
 .../protection_of_end_of_line_by_command.pl        |    6 +-
 .../linemacro/recursive_linemacro_in_body.pl       |    6 +-
 .../linemacro/recursive_linemacro_in_call.pl       |    6 +-
 .../linemacro/simple_nested_linemacro_calls.pl     |   21 +-
 .../linemacro/spaces_after_command_in_call.pl      |    6 +-
 ...paces_after_macro_linemacro_commands_in_call.pl |   18 +-
 .../spaces_after_unknown_command_in_call.pl        |    6 +-
 tp/t/results/linemacro/spaces_in_args.pl           |    6 +-
 tp/t/results/linemacro/spaces_in_call.pl           |    6 +-
 tp/t/results/linemacro/text_arguments.pl           |    6 +-
 tp/t/results/linemacro/verb_in_linemacro_call.pl   |   12 +-
 tp/t/results/linemacro/verb_not_closed.pl          |    7 +-
 .../verb_with_arobase_in_linemacro_call.pl         |    7 +-
 .../linemacro/verb_with_brace_in_linemacro_call.pl |    6 +-
 tp/t/results/macro/arg_body_expansion_order.pl     |   12 +-
 tp/t/results/macro/arg_not_closed.pl               |    7 +-
 tp/t/results/macro/arobase_brace_in_macro_call.pl  |    7 +-
 tp/t/results/macro/backslash_in_arg.pl             |   15 +-
 tp/t/results/macro/bad_argument.pl                 |   28 +-
 tp/t/results/macro/bad_formal_arg.pl               |   21 +-
 .../macro/bad_macro_name_with_underscore.pl        |    6 +-
 tp/t/results/macro/bib_example.pl                  |   87 +-
 tp/t/results/macro/bye_in_macro.pl                 |    6 +-
 ...losing_brace_in_macro_call_in_ignored_inline.pl |   13 +-
 tp/t/results/macro/complete_macro_for_end.pl       |    9 +-
 tp/t/results/macro/complex_argument.pl             |   19 +-
 tp/t/results/macro/cpp_directives_after_macros.pl  |   14 +-
 tp/t/results/macro/cpp_directives_in_macro.pl      |    7 +-
 .../macro/cpp_directives_line_value_macro.pl       |   19 +-
 .../macro/definfoenclose_replaced_by_macro.pl      |   10 +-
 tp/t/results/macro/double_macro_definition.pl      |   14 +-
 tp/t/results/macro/double_recursive_macro_call.pl  |   12 +-
 tp/t/results/macro/empty_end.pl                    |    6 +-
 tp/t/results/macro/empty_macro_argument.pl         |   13 +-
 tp/t/results/macro/empty_macro_in_text_no_arg.pl   |   12 +-
 tp/t/results/macro/empty_macro_no_arg.pl           |    6 +-
 tp/t/results/macro/expand_two_same.pl              |    6 +-
 tp/t/results/macro/expansion_order.pl              |   12 +-
 tp/t/results/macro/form_feeds.pl                   |   12 +-
 tp/t/results/macro/glossary.pl                     |   43 +-
 tp/t/results/macro/ifclear_in_macro.pl             |    6 +-
 tp/t/results/macro/ifset_and_end_isef_in_macro.pl  |   13 +-
 tp/t/results/macro/ifset_in_macro.pl               |    6 +-
 tp/t/results/macro/ifset_in_macro_set.pl           |    6 +-
 tp/t/results/macro/ignored_macro_definition.pl     |    9 +-
 tp/t/results/macro/implicit_quoting_one_arg.pl     |    6 +-
 tp/t/results/macro/implicit_quoting_recursion.pl   |    6 +-
 tp/t/results/macro/include_after_empty_line_arg.pl |    9 +-
 tp/t/results/macro/leading_spaces_no_ignore.pl     |    6 +-
 tp/t/results/macro/line_after_recursive_call.pl    |    6 +-
 .../macro/line_end_accent_command_macro_call.pl    |   14 +-
 tp/t/results/macro/macro_after_paragraph.pl        |    6 +-
 .../macro/macro_alias_definfoenclose_defindex.pl   |   96 +-
 .../macro_before_specific_line_command_args.pl     |    9 +-
 tp/t/results/macro/macro_call_empty_middle_arg.pl  |    6 +-
 tp/t/results/macro/macro_call_empty_two_arg.pl     |    6 +-
 .../macro/macro_call_in_ignored_inlinefmtifelse.pl |    9 +-
 .../macro/macro_call_in_inlinefmtifelse_format.pl  |    9 +-
 tp/t/results/macro/macro_call_in_node_manual.pl    |   69 +-
 .../macro/macro_end_call_in_ignored_inlinefmt.pl   |    6 +-
 .../macro_end_call_in_ignored_inlinefmtifelse.pl   |    6 +-
 ...cro_end_call_in_ignored_inlinefmtifelse_else.pl |    9 +-
 .../macro/macro_end_call_in_ignored_inlineraw.pl   |    6 +-
 .../results/macro/macro_end_call_in_ignored_raw.pl |    9 +-
 tp/t/results/macro/macro_expands_to_empty.pl       |    6 +-
 tp/t/results/macro/macro_expansion.pl              |    8 +-
 .../macro_expansion_end_in_conditional_end.pl      |    6 +-
 .../macro_expansion_end_in_conditional_line.pl     |    9 +-
 ...macro_expansion_end_in_ignored_ifset_content.pl |    9 +-
 ..._expansion_end_in_ignored_nested_conditional.pl |   12 +-
 ..._end_in_ignored_nested_different_conditional.pl |   10 +-
 .../macro_expansion_in_multitable_prototype.pl     |   51 +-
 .../macro/macro_for_dot_in_menu_not_separator.pl   |   15 +-
 tp/t/results/macro/macro_for_end.pl                |    9 +-
 .../macro/macro_for_ignored_line_command.pl        |    6 +-
 tp/t/results/macro/macro_for_verb.pl               |    6 +-
 ...macro_imbricated_with_beginning_command_name.pl |    7 +-
 tp/t/results/macro/macro_in_accent.pl              |   27 +-
 tp/t/results/macro/macro_in_brace_command.pl       |   27 +-
 tp/t/results/macro/macro_in_def_delimiters.pl      |   14 +-
 tp/t/results/macro/macro_in_empty_menu_comment.pl  |   15 +-
 .../macro_in_empty_multitable_empty_before_item.pl |   15 +-
 .../macro_in_empty_table_empty_before_item.pl      |   15 +-
 tp/t/results/macro/macro_in_empty_text.pl          |   12 +-
 tp/t/results/macro/macro_in_end_argument.pl        |   12 +-
 tp/t/results/macro/macro_in_ifset.pl               |   12 +-
 tp/t/results/macro/macro_in_ifset_end_in_arg.pl    |   14 +-
 tp/t/results/macro/macro_in_index_commands.pl      |   73 +-
 .../macro/macro_in_invalid_documentencoding.pl     |   11 +-
 tp/t/results/macro/macro_in_macro_arg.pl           |   18 +-
 tp/t/results/macro/macro_in_macro_arg_simpler.pl   |   12 +-
 tp/t/results/macro/macro_in_menu.pl                |   57 +-
 .../macro_in_menu_comment_closed_by_detailmenu.pl  |   21 +-
 .../macro/macro_in_menu_comment_like_entry.pl      |   15 +-
 tp/t/results/macro/macro_in_menu_description.pl    |   15 +-
 tp/t/results/macro/macro_in_misc_commands.pl       |  331 +--
 .../macro/macro_in_multitable_empty_before_item.pl |   21 +-
 .../macro/macro_in_table_empty_before_item.pl      |   18 +-
 .../macro_inlineifcond_end_in_empty_ignored.pl     |   12 +-
 .../macro/macro_inlineifcond_end_in_empty_set.pl   |   12 +-
 tp/t/results/macro/macro_name_with_digit.pl        |   12 +-
 tp/t/results/macro/macro_name_with_hyphen.pl       |    6 +-
 tp/t/results/macro/macro_no_arg_bad_expansion.pl   |    6 +-
 tp/t/results/macro/macro_no_arg_expansion.pl       |    6 +-
 tp/t/results/macro/macro_no_argument.pl            |    5 +-
 tp/t/results/macro/macro_not_closed.pl             |    4 +-
 tp/t/results/macro/macro_one_arg_end_of_file.pl    |    6 +-
 .../macro/macro_replaced_by_definfoenclose.pl      |   13 +-
 .../macro_with_error_at_end_line_after_macro.pl    |    6 +-
 tp/t/results/macro/macro_zero.pl                   |    6 +-
 tp/t/results/macro/nested_macro_call.pl            |   12 +-
 tp/t/results/macro/no_macrobody.pl                 |    6 +-
 tp/t/results/macro/non_ascii_in_macro_name.pl      |   10 +-
 tp/t/results/macro/paragraph_and_macro.pl          |   18 +-
 tp/t/results/macro/protect_comma_macro_line.pl     |    6 +-
 tp/t/results/macro/protect_in_body.pl              |    6 +-
 tp/t/results/macro/protect_in_body_line_arg.pl     |   10 +-
 tp/t/results/macro/protect_in_body_one_arg.pl      |    6 +-
 tp/t/results/macro/recursive_call_in_argument.pl   |    6 +-
 tp/t/results/macro/recursive_call_in_macro.pl      |    6 +-
 tp/t/results/macro/recursive_call_in_rmacro.pl     |    6 +-
 tp/t/results/macro/redefine_texinfo_macro.pl       |    7 +-
 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        |   12 +-
 .../macro/space_macro_after_end_verbatim.pl        |   12 +-
 tp/t/results/macro/text_before_after.pl            |    8 +-
 tp/t/results/macro/too_much_args.pl                |    7 +-
 tp/t/results/macro/two_macros_on_a_line.pl         |   12 +-
 .../results/macro/unknown_macro_on_line_command.pl |    6 +-
 .../macro/unpaired_backslash_in_macro_body.pl      |    6 +-
 .../macro/verb_with_arobase_in_macro_call.pl       |    6 +-
 .../results/macro/verb_with_brace_in_macro_call.pl |    6 +-
 tp/t/results/macro/zero_argument.pl                |   12 +-
 tp/t/results/macro/zero_argument_comment.pl        |   12 +-
 tp/t/results/menu/bad_beginning.pl                 |    9 +-
 .../menu/block_commands_in_menu_description.pl     |   48 +-
 .../menu/commands_in_nodedescriptionblock.pl       |   92 +-
 tp/t/results/menu/comment_on_menu_line.pl          |   18 +-
 tp/t/results/menu/dash_in_menu.pl                  |    9 +-
 tp/t/results/menu/detailmenu.pl                    |   18 +-
 tp/t/results/menu/detailmenu_in_description.pl     |   18 +-
 tp/t/results/menu/detailmenu_on_subnodes.pl        |   90 +-
 tp/t/results/menu/detailmenu_unknown_node.pl       |   19 +-
 .../menu/direntry_dircategory_after_first_node.pl  |   20 +-
 tp/t/results/menu/empty_leading_menu_comment.pl    |   12 +-
 tp/t/results/menu/empty_menu_description.pl        |   12 +-
 tp/t/results/menu/empty_menu_entry_name.pl         |   20 +-
 tp/t/results/menu/entry_after_detailmenu.pl        |   39 +-
 tp/t/results/menu/example_in_menu_comment.pl       |   15 +-
 tp/t/results/menu/example_in_menu_description.pl   |   21 +-
 tp/t/results/menu/formats_in_menu.pl               |   54 +-
 tp/t/results/menu/inlineraw_in_menu_description.pl |   18 +-
 tp/t/results/menu/invalid_info_menu_entry.pl       |   44 +-
 .../results/menu/leading_space_before_menu_star.pl |    9 +-
 tp/t/results/menu/menu_entry_name.pl               |   36 +-
 tp/t/results/menu/menu_entry_name_comment.pl       |   21 +-
 tp/t/results/menu/menu_entry_no_entry.pl           |   12 +-
 tp/t/results/menu/menu_entry_no_entry_location.pl  |   15 +-
 tp/t/results/menu/menu_entry_node.pl               |   18 +-
 tp/t/results/menu/menu_entry_node_comments.pl      |   18 +-
 tp/t/results/menu/menu_in_deffn.pl                 |   22 +-
 tp/t/results/menu/menu_in_example.pl               |   37 +-
 .../menu/menu_no_closed_after_empty_line.pl        |    7 +-
 .../results/menu/menu_no_closed_entry_beginning.pl |    4 +-
 tp/t/results/menu/menu_no_closed_in_description.pl |    7 +-
 tp/t/results/menu/menu_no_closed_in_entry.pl       |    4 +-
 tp/t/results/menu/menu_no_closed_star.pl           |    4 +-
 tp/t/results/menu/menu_node_unterminated.pl        |   13 +-
 tp/t/results/menu/menu_pointing_to_anchor.pl       |   18 +-
 tp/t/results/menu/menu_title_before_entries.pl     |   15 +-
 .../results/menu/missing_detailmenu_on_subnodes.pl |   78 +-
 tp/t/results/menu/multiple_menus.pl                |   22 +-
 tp/t/results/menu/no_colon_in_menu.pl              |    9 +-
 tp/t/results/menu/nodedescription_descriptions.pl  |  108 +-
 .../menu/nodedescriptionblock_descriptions.pl      |  118 +-
 tp/t/results/menu/reference_to_external_manual.pl  |   12 +-
 tp/t/results/menu/sc_in_menu.pl                    |   76 +-
 tp/t/results/menu/simple.pl                        |   21 +-
 tp/t/results/menu/simple_no_menu.pl                |   21 +-
 .../menu/space_and_commands_in_menu_node.pl        |   52 +-
 tp/t/results/menu/submenu_in_example.pl            |   55 +-
 tp/t/results/menu/verb_in_menu_description.pl      |   18 +-
 tp/t/results/misc_commands/also_not_line.pl        |   35 +-
 .../author_outside_titlepage_quotation.pl          |    4 +-
 tp/t/results/misc_commands/bad_documentlanguage.pl |   17 +-
 tp/t/results/misc_commands/clickstyle.pl           |   12 +-
 .../misc_commands/clickstyle_and_comments.pl       |   26 +-
 .../misc_commands/clickstyle_no_end_of_line.pl     |    3 +-
 .../codequoteundirected_codequotebacktick.pl       |   45 +-
 .../misc_commands/command_in_heading_footing.pl    |    9 +-
 .../misc_commands/command_line_in_paragraph.pl     |    3 +-
 .../command_not_closed_in_documentencoding.pl      |    9 +-
 .../misc_commands/comment_space_command_on_line.pl |   39 +-
 tp/t/results/misc_commands/contents.pl             |   23 +-
 .../misc_commands/defindex_too_much_args.pl        |    4 +-
 tp/t/results/misc_commands/definfoenclose.pl       |   26 +-
 .../misc_commands/definfoenclose_nestings.pl       |   25 +-
 .../misc_commands/definfoenclose_with_empty_arg.pl |    7 +-
 .../results/misc_commands/documentencoding_utf8.pl |    4 +-
 .../results/misc_commands/documentencoding_zero.pl |    5 +-
 tp/t/results/misc_commands/double_exdent.pl        |   19 +-
 tp/t/results/misc_commands/empty_center.pl         |    4 +-
 .../results/misc_commands/empty_center_with_arg.pl |    6 +-
 .../misc_commands/empty_documentencoding.pl        |    4 +-
 tp/t/results/misc_commands/footnote_in_center.pl   |   24 +-
 .../misc_commands/heading_command_in_commands.pl   |   27 +-
 .../incorrect_allowcodebreaks_argument.pl          |    7 +-
 .../indent_in_command_in_paragraph.pl              |   19 +-
 tp/t/results/misc_commands/indent_in_quotation.pl  |    9 +-
 tp/t/results/misc_commands/index_entries.pl        |   11 +-
 tp/t/results/misc_commands/invalid_clickstyle.pl   |   20 +-
 .../misc_commands/invalid_documentencoding.pl      |   54 +-
 .../results/misc_commands/invalid_kbdinputstyle.pl |    5 +-
 tp/t/results/misc_commands/kbdinputstyle.pl        |   15 +-
 .../misc_commands/kbdinputstyle_in_table.pl        |   15 +-
 tp/t/results/misc_commands/many_lines.pl           |  152 +-
 .../no_empty_line_between_headings.pl              |   12 +-
 tp/t/results/misc_commands/nodedescription.pl      |   26 +-
 .../misc_commands/noindent_after_smallexample.pl   |    9 +-
 tp/t/results/misc_commands/noindent_empty_para.pl  |    3 +-
 .../results/misc_commands/noindent_in_paragraph.pl |    8 +-
 tp/t/results/misc_commands/noindent_indent.pl      |   12 +-
 tp/t/results/misc_commands/ref_in_center.pl        |   26 +-
 tp/t/results/misc_commands/setfilename.pl          |   20 +-
 tp/t/results/misc_commands/simple.pl               |    3 +-
 tp/t/results/misc_commands/sp.pl                   |   21 +-
 .../misc_commands/synindex_too_much_args.pl        |    4 +-
 tp/t/results/misc_commands/test_allowcodebreaks.pl |   39 +-
 .../misc_commands/text_before_and_after_bye.pl     |    1 -
 .../misc_commands/text_before_line_command.pl      |   26 +-
 tp/t/results/moresectioning/anchor_in_footnote.pl  |   30 +-
 .../moresectioning/anchor_in_footnote_separate.pl  |   33 +-
 .../anchor_in_footnote_separate_split_node.pl      |   33 +-
 .../anchor_in_footnote_split_node.pl               |   30 +-
 tp/t/results/moresectioning/chapter_sections.pl    |   24 +-
 .../moresectioning/character_and_spaces_in_refs.pl |   88 +-
 .../character_and_spaces_in_refs_out.pl            |   87 +-
 tp/t/results/moresectioning/complex.pl             |  153 +-
 .../moresectioning/complex_split_at_node.pl        |  153 +-
 tp/t/results/moresectioning/contents.pl            |   36 +-
 .../moresectioning/contents_and_shortcontents.pl   |   39 +-
 .../contents_at_begin_chapter_without_node.pl      |   12 +-
 .../moresectioning/contents_at_end_document.pl     |   12 +-
 .../contents_at_end_document_after_node.pl         |   24 +-
 .../results/moresectioning/contents_in_document.pl |   12 +-
 tp/t/results/moresectioning/empty_top_node_up.pl   |   18 +-
 .../equivalent_nodes_defined_linked.pl             |   47 +-
 .../results/moresectioning/internal_top_node_up.pl |   18 +-
 .../moresectioning/lowered_subsubsection.pl        |   97 +-
 tp/t/results/moresectioning/loweredheading.pl      |    6 +-
 .../moresectioning/more_sections_than_nodes.pl     |   78 +-
 .../more_sections_than_nodes_texi2html.pl          |   78 +-
 tp/t/results/moresectioning/no_element.pl          |   50 +-
 .../moresectioning/nodes_before_after_top_xref.pl  |   39 +-
 .../non_automatic_internal_top_node_up.pl          |   39 +-
 .../non_automatic_top_node_up_and_url.pl           |   39 +-
 .../non_automatic_top_node_up_url.pl               |   18 +-
 .../moresectioning/only_special_spaces_node.pl     |   44 +-
 .../moresectioning/placed_things_before_element.pl |   53 +-
 .../placed_things_before_element_no_use_node.pl    |   53 +-
 .../moresectioning/placed_things_before_node.pl    |   61 +-
 tp/t/results/moresectioning/raiselowersections.pl  |  111 +-
 tp/t/results/moresectioning/rec_nodes.pl           |   66 +-
 .../moresectioning/section_in_unnumbered_info.pl   |  366 +--
 .../section_in_unnumbered_plaintext.pl             |  366 +--
 .../moresectioning/sectioning_part_appendix.pl     |   33 +-
 .../sectioning_part_appendix_no_top.pl             |   30 +-
 .../sectioning_part_appendix_texi2html_chapter.pl  |   33 +-
 tp/t/results/moresectioning/sections_test.pl       |   33 +-
 .../moresectioning/sections_test_no_use_nodes.pl   |   33 +-
 ...ctions_test_no_use_nodes_use_node_directions.pl |   33 +-
 tp/t/results/moresectioning/shortcontents.pl       |   36 +-
 .../moresectioning/special_spaces_in_nodes.pl      |   69 +-
 .../results/moresectioning/top_chapter_sections.pl |   27 +-
 tp/t/results/moresectioning/top_node_up_url.pl     |   18 +-
 tp/t/results/moresectioning/topic_guide.pl         |  117 +-
 tp/t/results/multitable/empty_headitem.pl          |   33 +-
 tp/t/results/multitable/empty_item_tab.pl          |   69 +-
 .../multitable/empty_multitable_with_cells.pl      |   12 +-
 .../inter_item_commands_in_multitable.pl           |   69 +-
 .../multitable/multitable_begin_with_tab.pl        |   30 +-
 ...ultitable_bracketed_no_inter_space_prototype.pl |   12 +-
 ...titable_bracketed_prototype_empty_not_closed.pl |   10 +-
 ...bracketed_prototype_empty_not_closed_comment.pl |   10 +-
 ..._bracketed_prototype_empty_spaces_not_closed.pl |   10 +-
 ...ed_prototype_empty_spaces_not_closed_comment.pl |   10 +-
 .../multitable_bracketed_prototype_not_closed.pl   |   10 +-
 ...table_bracketed_prototype_not_closed_comment.pl |   10 +-
 ...bracketed_prototype_not_closed_space_comment.pl |   10 +-
 .../multitable_empty_bracketed_prototype.pl        |   12 +-
 tp/t/results/multitable/multitable_figure_space.pl |   30 +-
 tp/t/results/multitable/multitable_in_example.pl   |   30 +-
 tp/t/results/multitable/multitable_not_closed.pl   |   10 +-
 .../multitable/multitable_not_closed_item.pl       |   13 +-
 .../multitable/multitable_not_closed_item_tab.pl   |   16 +-
 .../multitable_one_column_too_much_cells.pl        |   28 +-
 .../multitable_two_columns_too_much_cells.pl       |   28 +-
 .../multitable/multitable_with_empty_item_tab.pl   |   27 +-
 .../results/multitable/not_letters_in_prototype.pl |   10 +-
 tp/t/results/multitable/paragraph_in_cells.pl      |   24 +-
 .../results/multitable/prototype_brace_no_brace.pl |    9 +-
 .../multitable/prototype_brace_no_brace_comment.pl |    9 +-
 tp/t/results/multitable/prototype_no_brace.pl      |   11 +-
 tp/t/results/multitable/ref_in_multitable.pl       |   48 +-
 tp/t/results/multitable/w_in_multitable.pl         |   21 +-
 tp/t/results/paragraph/close_paragraph_command.pl  |    6 +-
 tp/t/results/paragraph/commands_in_flushright.pl   |   99 +-
 tp/t/results/paragraph/comment_in_quotation.pl     |   12 +-
 tp/t/results/paragraph/double_style_paragraph.pl   |   10 +-
 tp/t/results/paragraph/image_in_paragraph.pl       |    4 +-
 tp/t/results/paragraph/no_paragraph_commands.pl    |    7 +-
 tp/t/results/paragraph/paragraph_command.pl        |   22 +-
 .../paragraph/paragraph_count_and_example.pl       |    6 +-
 .../paragraph/paragraph_in_style_command.pl        |   10 +-
 tp/t/results/paragraph/paragraph_indent_asis.pl    |    9 +-
 tp/t/results/paragraph/sole_image.pl               |    4 +-
 .../plaintext_tests/U_with_utf8_enable_encoding.pl |    6 +-
 .../plaintext_tests/accent_command_punctuation.pl  |    3 +-
 .../accents_in_var_enable_encoding.pl              |   15 +-
 .../after_punctuation_character_in_command.pl      |    3 +-
 tp/t/results/plaintext_tests/all_spaces.pl         |    9 +-
 .../plaintext_tests/anchor_and_empty_lines.pl      |    3 +-
 .../at_commands_glued_in_example.pl                |   49 +-
 .../at_commands_glued_in_paragraph.pl              |   44 +-
 .../plaintext_tests/before_accent_punctuation.pl   |    3 +-
 .../characters_and_commands_in_var.pl              |   36 +-
 .../plaintext_tests/chinese_mixed_with_en.pl       |   18 +-
 .../code_commands_and_punctuation.pl               |    6 +-
 .../command_brace_no_arg_punctuation.pl            |   12 +-
 .../plaintext_tests/commands_and_punctuation.pl    |    6 +-
 .../plaintext_tests/del_quote_linebreaking.pl      |   18 +-
 tp/t/results/plaintext_tests/east_asian_in_w.pl    |    9 +-
 .../plaintext_tests/empty_line_in_example_end.pl   |    6 +-
 .../plaintext_tests/empty_multitable_in_itemize.pl |   16 +-
 tp/t/results/plaintext_tests/expanded_tex.pl       |    6 +-
 .../flushright_not_closed_and_format.pl            |   10 +-
 tp/t/results/plaintext_tests/html_expanded.pl      |    6 +-
 .../insert_copying_and_paragraph.pl                |    9 +-
 .../plaintext_tests/invalid_accent_punctuation.pl  |    4 +-
 .../plaintext_tests/isolated_html_expanded.pl      |    6 +-
 .../itemize_in_headitem_in_example.pl              |   47 +-
 tp/t/results/plaintext_tests/japanese_utf8.pl      |   57 +-
 .../plaintext_tests/line_passed_and_formats.pl     |  180 +-
 .../plaintext_tests/lone_braces_in_inlineraw.pl    |    6 +-
 .../plaintext_tests/long_uref_after_item.pl        |   12 +-
 .../plaintext_tests/multiline_image_and_align.pl   |   42 +-
 .../plaintext_tests/multiline_verb_after_space.pl  |    3 +-
 tp/t/results/plaintext_tests/multitable.pl         |  189 +-
 .../multitable_in_example_extraneous_item_tab.pl   |   18 +-
 .../multitable_in_example_extraneous_tab.pl        |   23 +-
 .../plaintext_tests/nested_code_commands.pl        |  153 +-
 .../plaintext_tests/nested_indentedblock.pl        |   24 +-
 tp/t/results/plaintext_tests/nested_multitable.pl  |   42 +-
 .../plaintext_tests/no_empty_line_after_section.pl |   21 +-
 .../no_punctuation_commands_frenchspacing.pl       |    3 +-
 tp/t/results/plaintext_tests/non_break_spaces.pl   |    6 +-
 tp/t/results/plaintext_tests/paragraphindent.pl    |    9 +-
 .../plaintext_tests/protect_spaces_on_line.pl      |   21 +-
 .../plaintext_tests/punctuation_abbr_acronym.pl    |   24 +-
 .../punctuation_and_code_style_commands.pl         |   45 +-
 .../punctuation_and_code_style_commands_utf8.pl    |   48 +-
 .../plaintext_tests/punctuation_and_footnotes.pl   |   36 +-
 .../punctuation_and_footnotes_frenchspacing.pl     |   39 +-
 .../punctuation_and_upper_case_commands.pl         |   90 +-
 .../punctuation_and_upper_case_commands_utf8.pl    |   93 +-
 .../plaintext_tests/punctuation_at_end_command.pl  |   30 +-
 .../plaintext_tests/punctuation_commands.pl        |   12 +-
 .../punctuation_commands_frenchspacing.pl          |   15 +-
 .../plaintext_tests/punctuation_frenchspacing.pl   |    3 +-
 .../plaintext_tests/punctuation_in_command.pl      |   27 +-
 .../punctuation_in_command_end_line.pl             |   30 +-
 tp/t/results/plaintext_tests/punctuation_in_sc.pl  |    6 +-
 .../punctuation_sc_accents_ascii_glyph.pl          |  162 +-
 .../punctuation_sc_accents_ascii_glyph_latin1.pl   |  165 +-
 .../punctuation_sc_accents_ascii_glyph_usascii.pl  |  168 +-
 .../punctuation_sc_accents_default.pl              |  162 +-
 .../punctuation_sc_accents_default_latin1.pl       |  165 +-
 .../punctuation_sc_accents_default_usascii.pl      |  168 +-
 .../punctuation_sc_accents_disable_encoding.pl     |  162 +-
 ...nctuation_sc_accents_disable_encoding_latin1.pl |  165 +-
 ...ctuation_sc_accents_disable_encoding_usascii.pl |  168 +-
 ...uation_sc_accents_to_utf8_ascii_glyph_latin1.pl |  165 +-
 ...ation_sc_accents_to_utf8_ascii_glyph_usascii.pl |  168 +-
 .../punctuation_sc_accents_to_utf8_latin1.pl       |  165 +-
 .../punctuation_sc_accents_to_utf8_usascii.pl      |  168 +-
 tp/t/results/plaintext_tests/quote_node_names.pl   |  138 +-
 .../sc_with_utf8_enable_encoding.pl                |    6 +-
 .../plaintext_tests/settitle_and_empty_top.pl      |    6 +-
 .../sp_with_text_before_in_example.pl              |   10 +-
 .../split_punctuation_detection_in_commands.pl     |   15 +-
 .../plaintext_tests/star_at_command_formatting.pl  |   18 +-
 .../plaintext_tests/tab_in_table_in_example.pl     |   20 +-
 .../results/plaintext_tests/tab_item_in_example.pl |    8 +-
 tp/t/results/plaintext_tests/transparent_text.pl   |    6 +-
 .../plaintext_tests/xref_quote_long_item.pl        |   24 +-
 tp/t/results/preformatted/caption_in_example.pl    |   16 +-
 .../comment_example_and_blank_lines.pl             |   24 +-
 tp/t/results/preformatted/comments_in_example.pl   |   18 +-
 tp/t/results/preformatted/def_in_example.pl        |   16 +-
 tp/t/results/preformatted/empty_line.pl            |    6 +-
 .../preformatted/empty_line_style_command.pl       |    9 +-
 .../preformatted/example_at_commands_arguments.pl  |   24 +-
 tp/t/results/preformatted/example_class.pl         |    6 +-
 .../preformatted/example_empty_arguments.pl        |   18 +-
 .../example_invalid_at_commands_arguments.pl       |   18 +-
 tp/t/results/preformatted/example_multi_class.pl   |    6 +-
 .../preformatted/insertcopying_in_example.pl       |    9 +-
 .../preformatted/nested_example_and_comment.pl     |   36 +-
 tp/t/results/preformatted/nested_formats.pl        |   24 +-
 tp/t/results/preformatted/page_in_example.pl       |    6 +-
 tp/t/results/preformatted/quote_dash_in_display.pl |    6 +-
 tp/t/results/preformatted/quote_dash_in_example.pl |    6 +-
 .../preformatted/text_on_display_command_line.pl   |   34 +-
 .../preformatted/text_on_example_command_line.pl   |   32 +-
 tp/t/results/preformatted/titlefont_in_example.pl  |    9 +-
 .../results/quotation/comment_on_quotation_line.pl |    6 +-
 tp/t/results/quotation/empty_quotation.pl          |   27 +-
 .../quotation/footnote_in_quotation_with_arg.pl    |    9 +-
 .../quotation/only_comment_on_quotation_line.pl    |    6 +-
 tp/t/results/quotation/quotation_and_author.pl     |   27 +-
 .../quotation/quotation_author_in_example.pl       |   15 +-
 .../quotation_beginning_and_end_on_line.pl         |    7 +-
 .../space_at_commands_end_quotation_line.pl        |   12 +-
 tp/t/results/quotation/standard_quotations.pl      |   36 +-
 tp/t/results/raw/beginning_and_end_on_line.pl      |   24 +-
 tp/t/results/raw/braces_in_tex.pl                  |   18 +-
 tp/t/results/raw/displaymath.pl                    |   24 +-
 tp/t/results/raw/displaymath_not_closed.pl         |    4 +-
 tp/t/results/raw/inline_in_example.pl              |   21 +-
 tp/t/results/raw/inline_missing_first_arg.pl       |    8 +-
 tp/t/results/raw/inlinefmt.pl                      |   12 +-
 tp/t/results/raw/inlinefmt_with_empty_line.pl      |   16 +-
 tp/t/results/raw/inlineraw.pl                      |   12 +-
 tp/t/results/raw/inlineraw_with_empty_line.pl      |   12 +-
 tp/t/results/raw/lone_braces_in_html.pl            |   12 +-
 tp/t/results/raw/misc_raw.pl                       |   20 +-
 tp/t/results/raw/misc_raw_comments.pl              |   20 +-
 tp/t/results/raw/nested_macros.pl                  |    6 +-
 tp/t/results/raw/raw_commands_and_end_of_lines.pl  |  126 +-
 tp/t/results/raw/raw_expanded_in_style.pl          |    9 +-
 tp/t/results/raw/raw_in_example.pl                 |   30 +-
 tp/t/results/raw/raw_in_para.pl                    |   18 +-
 tp/t/results/raw/raw_in_style.pl                   |    9 +-
 tp/t/results/raw/raw_not_closed.pl                 |    4 +-
 .../raw/second_level_lone_braces_in_html.pl        |   24 +-
 ...econd_level_lone_braces_in_html_not_expanded.pl |   12 +-
 tp/t/results/raw/space_before_end.pl               |   19 +-
 tp/t/results/raw/spurious_arg_on_line.pl           |   21 +-
 tp/t/results/raw/tex_not_closed.pl                 |    4 +-
 tp/t/results/raw/verbatim_and_verbatiminclude.pl   |   84 +-
 tp/t/results/raw/verbatim_in_brace_command.pl      |   11 +-
 tp/t/results/raw/verbatim_not_closed.pl            |    4 +-
 tp/t/results/regions/anchor_in_copying.pl          |   25 +-
 .../regions/anchor_in_copying_in_footnote.pl       |   28 +-
 tp/t/results/regions/anchor_in_titlepage.pl        |   24 +-
 .../regions/anchor_in_titlepage_titlepage.pl       |   24 +-
 tp/t/results/regions/copying_not_closed.pl         |    4 +-
 tp/t/results/regions/double_copying.pl             |   14 +-
 .../results/regions/double_titlepage_not_closed.pl |   10 +-
 tp/t/results/regions/format_in_titlepage.pl        |   18 +-
 .../regions/format_in_titlepage_titlepage.pl       |   18 +-
 tp/t/results/regions/ref_in_copying.pl             |   33 +-
 .../regions/ref_in_copying_insert_in_chapter.pl    |   39 +-
 tp/t/results/regions/today_in_copying.pl           |   21 +-
 tp/t/results/sectioning/a_comma_after_node.pl      |    5 +-
 tp/t/results/sectioning/anchor_zero.pl             |    9 +-
 tp/t/results/sectioning/at_commands_in_node.pl     |   33 +-
 .../sectioning/automatic_menu_referencing_node.pl  |   18 +-
 .../sectioning/chapter_before_and_after_part.pl    |   12 +-
 tp/t/results/sectioning/chapter_before_part.pl     |    7 +-
 tp/t/results/sectioning/chapter_between_nodes.pl   |   27 +-
 .../sectioning/chapter_between_nodes_texi2html.pl  |   27 +-
 .../chapter_between_nodes_with_appendix.pl         |   24 +-
 .../chapter_between_nodes_with_appendix_nomenu.pl  |   24 +-
 .../chapter_node_before_and_after_part.pl          |   28 +-
 .../sectioning/character_and_spaces_in_node.pl     |   15 +-
 tp/t/results/sectioning/contents_and_parts.pl      |   51 +-
 tp/t/results/sectioning/contents_in_html_text.pl   |   18 +-
 .../sectioning/contents_with_only_top_node.pl      |    6 +-
 .../results/sectioning/double_node_anchor_float.pl |   48 +-
 tp/t/results/sectioning/double_part.pl             |   30 +-
 ...double_recursive_self_section_node_reference.pl |   24 +-
 .../double_recursive_self_section_reference.pl     |   18 +-
 tp/t/results/sectioning/double_top.pl              |   15 +-
 tp/t/results/sectioning/double_top_in_menu.pl      |   24 +-
 tp/t/results/sectioning/double_top_section.pl      |    7 +-
 tp/t/results/sectioning/email_in_node.pl           |   12 +-
 tp/t/results/sectioning/empty_anchor.pl            |    8 +-
 tp/t/results/sectioning/empty_node.pl              |    8 +-
 .../sectioning/empty_nodes_with_commands.pl        |   19 +-
 tp/t/results/sectioning/empty_ref_arg.pl           |   21 +-
 tp/t/results/sectioning/empty_refs.pl              |   11 +-
 tp/t/results/sectioning/equivalent_labels.pl       |   32 +-
 tp/t/results/sectioning/equivalent_nodes.pl        |   30 +-
 .../sectioning/equivalent_nodes_novalidate.pl      |   30 +-
 .../results/sectioning/explicit_node_directions.pl |   21 +-
 tp/t/results/sectioning/external_node_in_menu.pl   |   33 +-
 tp/t/results/sectioning/hole_in_sectioning.pl      |   16 +-
 .../in_menu_only_special_ascii_spaces_node.pl      |   34 +-
 .../in_menu_only_special_ascii_spaces_node_menu.pl |   34 +-
 .../sectioning/in_menu_only_special_spaces_node.pl |   70 +-
 .../in_menu_only_special_spaces_node_menu.pl       |   70 +-
 tp/t/results/sectioning/lone_Top_node.pl           |   19 +-
 tp/t/results/sectioning/lone_contents.pl           |    3 +-
 tp/t/results/sectioning/loop_nodes.pl              |   43 +-
 tp/t/results/sectioning/menutextorder.pl           |   87 +-
 tp/t/results/sectioning/next_in_menu_is_below.pl   |   56 +-
 tp/t/results/sectioning/next_no_prev_to_node.pl    |   21 +-
 .../results/sectioning/no_argument_and_contents.pl |   12 +-
 tp/t/results/sectioning/no_menu.pl                 |   24 +-
 tp/t/results/sectioning/node_empty_direction.pl    |    3 +-
 tp/t/results/sectioning/node_line_arguments.pl     |   48 +-
 tp/t/results/sectioning/node_nested_parentheses.pl |   28 +-
 .../sectioning/node_part_chapter_after_chapter.pl  |   37 +-
 .../sectioning/node_part_chapter_after_top.pl      |   25 +-
 tp/t/results/sectioning/node_referenced_in_ref.pl  |   21 +-
 .../node_sectop_before_chapter_no_node.pl          |    9 +-
 .../sectioning/node_sectop_before_lone_node_Top.pl |   15 +-
 tp/t/results/sectioning/node_simple.pl             |    3 +-
 tp/t/results/sectioning/node_too_much_args.pl      |    4 +-
 .../node_up_direction_for_top_with_manual.pl       |    3 +-
 tp/t/results/sectioning/node_up_external_node.pl   |   15 +-
 tp/t/results/sectioning/nodename_parentheses.pl    |   53 +-
 ...fter_top_before_chapter_no_use_nodes_chapter.pl |   24 +-
 .../nodes_after_top_before_chapter_nodes.pl        |   24 +-
 .../nodes_after_top_before_chapter_not_split.pl    |   24 +-
 ...ore_chapter_not_split_no_use_node_directions.pl |   24 +-
 .../nodes_after_top_before_chapter_sections.pl     |   24 +-
 .../nodes_after_top_before_chapter_texi2html.pl    |   24 +-
 ...p_before_chapter_texi2html_use_nodes_chapter.pl |   24 +-
 .../nodes_after_top_before_section_nodes.pl        |   24 +-
 .../nodes_after_top_before_section_sections.pl     |   24 +-
 ...s_after_top_before_section_texi2html_chapter.pl |   24 +-
 ...after_top_before_section_texi2html_use_nodes.pl |   24 +-
 ...p_before_section_texi2html_use_nodes_chapter.pl |   24 +-
 tp/t/results/sectioning/nodes_before_after_top.pl  |   20 +-
 tp/t/results/sectioning/nodes_before_top.pl        |   36 +-
 .../nodes_no_node_top_explicit_directions.pl       |   15 +-
 tp/t/results/sectioning/novalidate.pl              |   18 +-
 .../one_node_explicit_directions_anchor.pl         |    9 +-
 ..._node_explicit_directions_anchor_no_use_node.pl |    9 +-
 tp/t/results/sectioning/one_subsection.pl          |    3 +-
 tp/t/results/sectioning/one_subsection_and_node.pl |    6 +-
 tp/t/results/sectioning/part_before_chapter.pl     |    6 +-
 tp/t/results/sectioning/part_before_section.pl     |    7 +-
 tp/t/results/sectioning/part_before_top.pl         |    7 +-
 tp/t/results/sectioning/part_chapter_after_top.pl  |   24 +-
 tp/t/results/sectioning/part_chapter_appendix.pl   |    9 +-
 tp/t/results/sectioning/part_node_after_top.pl     |   23 +-
 tp/t/results/sectioning/part_node_before_top.pl    |   23 +-
 .../sectioning/part_node_chapter_after_top.pl      |   30 +-
 .../sectioning/part_node_chapter_appendix.pl       |   27 +-
 .../sectioning/part_node_chapter_node_appendix.pl  |   33 +-
 .../sectioning/part_node_node_part_appendix.pl     |   37 +-
 tp/t/results/sectioning/part_node_part_appendix.pl |   30 +-
 .../sectioning/part_node_part_node_appendix.pl     |   36 +-
 tp/t/results/sectioning/part_section_part.pl       |   11 +-
 .../sectioning/protected_node_parentheses.pl       |   36 +-
 .../sectioning/recursive_self_section_reference.pl |    9 +-
 tp/t/results/sectioning/ref_to_top.pl              |   10 +-
 tp/t/results/sectioning/ref_to_unknown_node.pl     |    4 +-
 .../reference_to_only_special_spaces_node.pl       |   39 +-
 .../sectioning/section_before_after_top_node.pl    |   13 +-
 .../section_before_after_top_node_last_node.pl     |   16 +-
 tp/t/results/sectioning/section_before_chapter.pl  |    7 +-
 tp/t/results/sectioning/section_before_part.pl     |   11 +-
 tp/t/results/sectioning/section_before_top.pl      |   22 +-
 .../sectioning/section_before_top_no_node.pl       |    7 +-
 .../results/sectioning/section_below_unnumbered.pl |   39 +-
 .../sectioning/section_below_unnumbered_no_top.pl  |    6 +-
 .../sectioning/section_chapter_before_top.pl       |   11 +-
 .../sectioning/section_chapter_before_top_nodes.pl |   40 +-
 .../results/sectioning/section_node_before_part.pl |   11 +-
 tp/t/results/sectioning/sections.pl                |    3 +-
 tp/t/results/sectioning/semi_auto.pl               |   47 +-
 .../setfilename_on_top_and_after_node.pl           |   17 +-
 tp/t/results/sectioning/space_in_node.pl           |   27 +-
 .../sectioning/split_for_format_not_split.pl       |    3 +-
 .../sectioning/top_no_argument_and_content.pl      |    3 +-
 .../results/sectioning/top_no_argument_and_node.pl |    6 +-
 .../sectioning/top_no_argument_and_top_node.pl     |    6 +-
 .../sectioning/top_node_no_menu_direction.pl       |   21 +-
 tp/t/results/sectioning/top_node_part_top.pl       |   11 +-
 tp/t/results/sectioning/top_part_chapter.pl        |    9 +-
 tp/t/results/sectioning/top_without_node_nodes.pl  |    9 +-
 .../sectioning/top_without_node_sections.pl        |    9 +-
 .../top_without_node_texi2html_no_use_nodes.pl     |    9 +-
 .../transliterated_split_equivalent_nodes.pl       |   45 +-
 tp/t/results/sectioning/two_nodes_at_the_end.pl    |   33 +-
 .../sectioning/two_nodes_at_the_end_nodes.pl       |   33 +-
 .../sectioning/two_nodes_at_the_end_texi2html.pl   |   33 +-
 .../sectioning/two_nodes_between_chapters.pl       |   38 +-
 .../sectioning/two_nodes_between_chapters_nodes.pl |   36 +-
 .../two_nodes_between_chapters_texi2html.pl        |   36 +-
 .../sectioning/two_unnumbered_no_argument.pl       |    8 +-
 .../unknown_node_direction_novalidate.pl           |    6 +-
 tp/t/results/sectioning/unknown_node_in_menu.pl    |   13 +-
 .../sectioning/unknown_node_in_menu_novalidate.pl  |   15 +-
 .../sectioning/unnumbered_before_node_top_top.pl   |   10 +-
 tp/t/results/sectioning/unnumbered_before_top.pl   |    7 +-
 .../sectioning/unnumbered_before_top_node.pl       |    9 +-
 tp/t/results/sectioning/unnumbered_no_argument.pl  |    4 +-
 .../unnumbered_top_without_node_nodes.pl           |   17 +-
 .../unnumbered_top_without_node_sections.pl        |   17 +-
 ...dex_entries_relate_to_item_no_transformation.pl |   45 +-
 .../index_entries_relate_to_item_transformation.pl |   45 +-
 tp/t/results/transformations/master_menu_fr.pl     |   39 +-
 .../transformations/protect_colon_source_mark.pl   |    6 +-
 .../transformations/protect_comma_source_mark.pl   |    6 +-
 ...st_parenthesis_after_parenthesis_source_mark.pl |    9 +-
 .../protect_first_parenthesis_source_mark.pl       |    9 +-
 ...otect_hashchar_at_line_beginning_source_mark.pl |   20 +-
 ...ct_node_after_label_source_mark_in_protected.pl |    6 +-
 ...generate_master_menu_no_need_for_master_menu.pl |   21 +-
 tp/t/results/value/bad_syntax.pl                   |   12 -
 .../value/begin_like_comment_on_set_line.pl        |    3 -
 .../closing_brace_in_value_in_ignored_inline.pl    |    7 +-
 tp/t/results/value/comment_on_clear_line.pl        |    4 -
 tp/t/results/value/ignored_value_definition.pl     |    3 +-
 tp/t/results/value/recursive_expansion_in_set.pl   |    1 -
 tp/t/results/value/set_flag_command_equivalent.pl  |    6 +-
 tp/t/results/value/set_form_feed.pl                |    3 +-
 tp/t/results/value/set_in_item_missing_line.pl     |   32 +-
 tp/t/results/value/set_on_item_line.pl             |   40 +-
 tp/t/results/value/simple.pl                       |    3 +-
 tp/t/results/value/value_after_accent.pl           |    6 +-
 tp/t/results/value/value_after_brace_command.pl    |   24 +-
 tp/t/results/value/value_in_index_commands.pl      |   49 +-
 .../value/value_in_invalid_documentencoding.pl     |    5 +-
 tp/t/results/value/value_in_misc_commands.pl       |  174 +-
 tp/t/results/value/value_in_node.pl                |   36 +-
 tp/t/results/value/value_node_directions.pl        |   18 +-
 .../value_and_macro/comma_value_in_macro_arg.pl    |    6 +-
 tp/t/results/value_and_macro/macro_in_value.pl     |    6 +-
 .../results/value_and_macro/value_in_macro_body.pl |    7 +-
 .../value_and_macro/value_in_macro_formal_arg.pl   |   11 +-
 tp/t/results/verb/comments.pl                      |    6 +-
 tp/t/results/verb/end_of_line.pl                   |    4 +-
 tp/t/results/verb/multiline.pl                     |    3 +-
 tp/t/results/verb/nested.pl                        |    6 +-
 tp/t/results/verb/simple.pl                        |    3 +-
 .../verb/verb_and_char_end_of_line_not_closed.pl   |    4 +-
 .../results/verb/verb_at_end_of_line_not_closed.pl |    5 +-
 tp/t/results/verb/verb_not_closed.pl               |    4 +-
 tp/t/results/verb/verb_not_closed_with_char.pl     |    4 +-
 .../brace_commands_spaces_end_of_lines.pl          |   18 +-
 tp/t/results/xml_tests/commands_and_spaces.pl      |  136 +-
 tp/t/results/xml_tests/comments_end_lines.pl       |   78 +-
 .../xml_tests/comments_on_block_command_lines.pl   |  174 +-
 .../xml_tests/comments_on_misc_command_line.pl     |   22 +-
 tp/t/results/xml_tests/image_inline_or_not.pl      |  135 +-
 .../xml_tests/inlineifset_empty_second_arg.pl      |    6 +-
 tp/t/results/xml_tests/macro_and_args.pl           |   14 +-
 tp/t/results/xml_tests/raw.pl                      |   12 +-
 tp/t/results/xml_tests/raw_and_comments.pl         |   12 +-
 tp/t/results/xml_tests/spaces_info_lost.pl         |   13 +-
 tp/t/results/xml_tests/top_node_and_bye.pl         |    3 +-
 tp/t/results/xml_tests/top_node_no_section.pl      |    3 +-
 tp/t/results/xtable/accent_on_table_line.pl        |  107 +-
 tp/t/results/xtable/block_commands_in_table.pl     |  105 +-
 .../xtable/comment_and_itemx_before_item.pl        |   13 +-
 .../results/xtable/definfoenclose_on_table_line.pl |   20 +-
 tp/t/results/xtable/empty_item_itemx.pl            |   29 +-
 tp/t/results/xtable/empty_table.pl                 |    9 +-
 tp/t/results/xtable/headitem_in_table.pl           |   13 +-
 .../xtable/index_command_before_end_table.pl       |   19 +-
 .../results/xtable/inter_item_commands_in_table.pl |  207 +-
 .../inter_item_commands_in_table_in_example.pl     |   31 +-
 .../xtable/invalid_command_and_brace_in_table.pl   |   13 +-
 tp/t/results/xtable/item_index_transformation.pl   |  111 +-
 tp/t/results/xtable/itemx_before_item.pl           |   13 +-
 tp/t/results/xtable/lone_end_table.pl              |    1 -
 tp/t/results/xtable/long_item.pl                   |   15 +-
 .../xtable/no_arg_brace_command_on_table_line.pl   |   13 +-
 tp/t/results/xtable/no_argument_for_table.pl       |   10 +-
 tp/t/results/xtable/table_nested.pl                |   30 +-
 tp/t/results/xtable/text_between_item_itemx.pl     |   16 +-
 tp/t/results/xtable/title_and_itemx_before_item.pl |   13 +-
 1573 files changed, 21842 insertions(+), 45786 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2d66e64bda..0468562936 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2023-12-12  Patrice Dumas  <pertusus@free.fr>
+
+       No empty macro in source info
+
+       * tp/Texinfo/ParserNonXS.pm (_input_push_text, _input_push_file)
+       (_bug_message, _next_text, _check_line_directive),
+       tp/Texinfo/Report.pm (format_line_message),
+       tp/Texinfo/XS/main/build_perl_info.c (element_to_perl_hash)
+       (build_source_info_hash): do not set source info 'macro' to an empty
+       string if not in macro a context, leave out the key, and check that it
+       is defined.
+
 2023-12-12  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/main/get_perl_info.c (get_source_info): use SvPVbyte
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 342dfd02ae..e4e3ba54af 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -720,20 +720,21 @@ sub _input_push_text($$$;$$)
   if (not $self->{'input'}) {
     $self->{'input'} = [];
   }
-  my $input_source_info = {'line_nr' => $line_nr, 'macro' => '',
-                           'file_name' => ''};
+  my $input_source_info = {'line_nr' => $line_nr, 'file_name' => ''};
   if (scalar(@{$self->{'input'}})) {
     $input_source_info->{'file_name'}
       = $self->{'input'}->[0]->{'input_source_info'}->{'file_name'};
     # context macro expansion
-    $input_source_info->{'macro'}
-      = $self->{'input'}->[0]->{'input_source_info'}->{'macro'};
+    if (exists($self->{'input'}->[0]->{'input_source_info'}->{'macro'})) {
+      $input_source_info->{'macro'}
+        = $self->{'input'}->[0]->{'input_source_info'}->{'macro'};
+    }
   }
   if (defined($macro_name) and $macro_name ne '') {
     # new macro expansion
     $input_source_info->{'macro'} = $macro_name;
   }
-  if (not defined($value_name) and $input_source_info->{'macro'} eq '') {
+  if (not defined($value_name) and not defined($input_source_info->{'macro'})) 
{
     # this counteracts the increment that would follow from the next
     # call to _next_text.
     $input_source_info->{'line_nr'} -= 1;
@@ -755,7 +756,7 @@ sub _input_pushback_text($$;$)
                           $self->{'input'}->[0]->{'input_source_info'});
     unshift @{$self->{'input'}}, $text_input;
     $text_input->{'input_source_info'}->{'line_nr'} -= 1
-      unless($text_input->{'input_source_info'}->{'macro'} ne '');
+      unless(defined($text_input->{'input_source_info'}->{'macro'}));
   }
 }
 
@@ -852,7 +853,6 @@ sub _input_push_file
           # binary
           'file_name' => $file_name,
           'line_nr' => 0,
-          'macro' => '',
        },
        'fh' => $filehandle,
        'input_file_path' => $input_file_path,
@@ -1100,7 +1100,7 @@ sub _bug_message($$;$$)
     my $file = $source_info->{'file_name'};
     $line_message
       = "last location: $source_info->{'file_name'}:$source_info->{'line_nr'}";
-    if ($source_info->{'macro'} ne '') {
+    if (defined($source_info->{'macro'})) {
       $line_message .= " (possibly involving $source_info->{'macro'})";
     }
     $line_message .= "\n";
@@ -2366,7 +2366,7 @@ sub _next_text($;$)
         # need to decode to characters
         $next_line = Encode::decode('utf-8', $next_line);
         $input->{'input_source_info'}->{'line_nr'} += 1
-          unless ($input->{'input_source_info'}->{'macro'} ne ''
+          unless (defined($input->{'input_source_info'}->{'macro'})
                   or defined($input->{'value_flag'}));
         return ($next_line, { %{$input->{'input_source_info'}} });
       }
@@ -4770,7 +4770,7 @@ sub _check_line_directive {
   if ($self->{'CPP_LINE_DIRECTIVES'}
       and defined($source_info->{'file_name'})
       and $source_info->{'file_name'} ne ''
-      and !$source_info->{'macro'}
+      and !defined($source_info->{'macro'})
       and $line =~ /^\s*#\s*(line)? (\d+)(( "([^"]+)")(\s+\d+)*)?\s*$/) {
     _save_line_directive($self, int($2), $5);
     return 1;
@@ -7323,7 +7323,10 @@ sub _parse_texi($$$)
       my $additional_debug = '';
       if (0) {
         my $source_info_text = '';
-        $source_info_text = "$source_info->{'line_nr'}.$source_info->{'macro'}"
+        my $macro_name = '';
+        $macro_name = $source_info->{'macro'}
+                       if (defined($source_info->{'macro'}));
+        $source_info_text = "$source_info->{'line_nr'}.$macro_name"
           if ($source_info);
         my @cond_commands = map {$_->[0]} @{$self->{'conditional_stack'}};
         $additional_debug = '('.join('|', $self->_get_context_stack())
diff --git a/tp/Texinfo/Report.pm b/tp/Texinfo/Report.pm
index 27d02e0b38..00c24bdcbb 100644
--- a/tp/Texinfo/Report.pm
+++ b/tp/Texinfo/Report.pm
@@ -119,11 +119,6 @@ sub format_line_message($$$$;$)
   my %location_info = %{$error_location_info};
   delete $location_info{'file_name'} if (exists ($location_info{'file_name'})
                                   and not 
defined($location_info{'file_name'}));
-  # FIXME remove this code as soon as possible
-  if (defined($location_info{'line_nr'}) and $location_info{'line_nr'} > 0
-      and !defined ($location_info{'macro'})) {
-    $location_info{'macro'} = "";
-  }
   my $result
     = { 'type' => $type, 'text' => $text, 'error_line' => $message_line,
          %location_info };
diff --git a/tp/Texinfo/XS/main/build_perl_info.c 
b/tp/Texinfo/XS/main/build_perl_info.c
index 98617b396d..e40e016b70 100644
--- a/tp/Texinfo/XS/main/build_perl_info.c
+++ b/tp/Texinfo/XS/main/build_perl_info.c
@@ -634,9 +634,6 @@ element_to_perl_hash (ELEMENT *e, int avoid_recursion)
         {
           STORE("line_nr", newSViv (source_info->line_nr), HSH_line_nr);
 
-          if (!source_info->macro)
-            STORE("macro", newSVpv ("", 0), HSH_macro);
-
           if (!source_info->file_name)
             STORE("file_name", newSVpv ("", 0), HSH_file_name);
         }
@@ -1043,13 +1040,6 @@ build_source_info_hash (SOURCE_INFO source_info, HV *hv)
       hv_store (hv, "file_name", strlen ("file_name"),
                 newSVpv (source_info.file_name, 0), 0);
     }
-   /*
-  else
-    {
-      hv_store (hv, "file_name", strlen ("file_name"),
-                newSVpv ("", 0), 0);
-    }
-    */
 
   if (source_info.line_nr)
     {
@@ -1058,9 +1048,6 @@ build_source_info_hash (SOURCE_INFO source_info, HV *hv)
       if (!source_info.file_name)
         hv_store (hv, "file_name", strlen ("file_name"),
                   newSVpv ("", 0), 0);
-      if (!source_info.macro)
-        hv_store (hv, "macro", strlen ("macro"),
-                newSVpv_utf8 ("", 0), 0);
     }
 
   if (source_info.macro)
@@ -1068,13 +1055,6 @@ build_source_info_hash (SOURCE_INFO source_info, HV *hv)
       hv_store (hv, "macro", strlen ("macro"),
                 newSVpv_utf8 (source_info.macro, 0), 0);
     }
-   /*
-  else
-    {
-      hv_store (hv, "macro", strlen ("macro"),
-                newSVpv_utf8 ("", 0), 0);
-    }
-   */
 }
 
 static SV *
diff --git a/tp/t/results/alias/alias_macro_target_removed.pl 
b/tp/t/results/alias/alias_macro_target_removed.pl
index 0dcf9cc039..67800ce9f2 100644
--- a/tp/t/results/alias/alias_macro_target_removed.pl
+++ b/tp/t/results/alias/alias_macro_target_removed.pl
@@ -55,8 +55,7 @@ $result_trees{'alias_macro_target_removed'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -66,8 +65,7 @@ $result_trees{'alias_macro_target_removed'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -106,8 +104,7 @@ $result_trees{'alias_macro_target_removed'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -224,7 +221,6 @@ $result_errors{'alias_macro_target_removed'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'unknown command `mystrong\'',
     'type' => 'error'
   },
@@ -233,7 +229,6 @@ $result_errors{'alias_macro_target_removed'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
   },
@@ -242,7 +237,6 @@ $result_errors{'alias_macro_target_removed'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/alias/alias_non_existing_command.pl 
b/tp/t/results/alias/alias_non_existing_command.pl
index 0c76bf2aaa..bd49edb13b 100644
--- a/tp/t/results/alias/alias_non_existing_command.pl
+++ b/tp/t/results/alias/alias_non_existing_command.pl
@@ -40,8 +40,7 @@ $result_trees{'alias_non_existing_command'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -81,7 +80,6 @@ $result_errors{'alias_non_existing_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'unknown command `userdefined\'',
     'type' => 'error'
   },
@@ -90,7 +88,6 @@ $result_errors{'alias_non_existing_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
   },
@@ -99,7 +96,6 @@ $result_errors{'alias_non_existing_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/alias/alias_of_added_index.pl 
b/tp/t/results/alias/alias_of_added_index.pl
index 9639e031d5..003cd59cfe 100644
--- a/tp/t/results/alias/alias_of_added_index.pl
+++ b/tp/t/results/alias/alias_of_added_index.pl
@@ -39,8 +39,7 @@ $result_trees{'alias_of_added_index'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -79,8 +78,7 @@ $result_trees{'alias_of_added_index'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -120,8 +118,7 @@ $result_trees{'alias_of_added_index'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -182,8 +179,7 @@ $result_trees{'alias_of_added_index'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           },
           'type' => 'index_entry_command'
         },
@@ -201,8 +197,7 @@ $result_trees{'alias_of_added_index'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -235,8 +230,7 @@ $result_trees{'alias_of_added_index'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -293,8 +287,7 @@ $result_trees{'alias_of_added_index'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         }
       ],
@@ -308,8 +301,7 @@ $result_trees{'alias_of_added_index'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     }
   ],
diff --git a/tp/t/results/alias/alias_of_added_index_before_added_index.pl 
b/tp/t/results/alias/alias_of_added_index_before_added_index.pl
index 77871d2a35..fd9ab70ff4 100644
--- a/tp/t/results/alias/alias_of_added_index_before_added_index.pl
+++ b/tp/t/results/alias/alias_of_added_index_before_added_index.pl
@@ -40,8 +40,7 @@ $result_trees{'alias_of_added_index_before_added_index'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -79,8 +78,7 @@ $result_trees{'alias_of_added_index_before_added_index'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -120,8 +118,7 @@ $result_trees{'alias_of_added_index_before_added_index'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -182,8 +179,7 @@ $result_trees{'alias_of_added_index_before_added_index'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           },
           'type' => 'index_entry_command'
         },
@@ -201,8 +197,7 @@ $result_trees{'alias_of_added_index_before_added_index'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -235,8 +230,7 @@ $result_trees{'alias_of_added_index_before_added_index'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -293,8 +287,7 @@ $result_trees{'alias_of_added_index_before_added_index'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         }
       ],
@@ -308,8 +301,7 @@ $result_trees{'alias_of_added_index_before_added_index'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     }
   ],
diff --git a/tp/t/results/alias/alias_of_definfoenclose.pl 
b/tp/t/results/alias/alias_of_definfoenclose.pl
index 4ea2e95f99..edad136d2d 100644
--- a/tp/t/results/alias/alias_of_definfoenclose.pl
+++ b/tp/t/results/alias/alias_of_definfoenclose.pl
@@ -41,8 +41,7 @@ $result_trees{'alias_of_definfoenclose'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -81,8 +80,7 @@ $result_trees{'alias_of_definfoenclose'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -114,8 +112,7 @@ $result_trees{'alias_of_definfoenclose'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'definfoenclose_command'
             },
@@ -152,7 +149,6 @@ $result_errors{'alias_of_definfoenclose'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@definfoenclose is obsolete',
     'type' => 'warning'
   }
diff --git 
a/tp/t/results/alias/alias_of_definfoenclose_before_definfoenclose.pl 
b/tp/t/results/alias/alias_of_definfoenclose_before_definfoenclose.pl
index 26c9cd4b8f..f9a2b6ac7f 100644
--- a/tp/t/results/alias/alias_of_definfoenclose_before_definfoenclose.pl
+++ b/tp/t/results/alias/alias_of_definfoenclose_before_definfoenclose.pl
@@ -40,8 +40,7 @@ 
$result_trees{'alias_of_definfoenclose_before_definfoenclose'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -81,8 +80,7 @@ 
$result_trees{'alias_of_definfoenclose_before_definfoenclose'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -114,8 +112,7 @@ 
$result_trees{'alias_of_definfoenclose_before_definfoenclose'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'definfoenclose_command'
             },
@@ -152,7 +149,6 @@ 
$result_errors{'alias_of_definfoenclose_before_definfoenclose'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@definfoenclose is obsolete',
     'type' => 'warning'
   }
diff --git a/tp/t/results/alias/alias_of_macro.pl 
b/tp/t/results/alias/alias_of_macro.pl
index 92009c8257..4969b1a487 100644
--- a/tp/t/results/alias/alias_of_macro.pl
+++ b/tp/t/results/alias/alias_of_macro.pl
@@ -55,8 +55,7 @@ $result_trees{'alias_of_macro'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -66,8 +65,7 @@ $result_trees{'alias_of_macro'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -106,8 +104,7 @@ $result_trees{'alias_of_macro'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
diff --git a/tp/t/results/alias/alias_of_macro_before_macro.pl 
b/tp/t/results/alias/alias_of_macro_before_macro.pl
index 0d180b5ccb..1055e743ce 100644
--- a/tp/t/results/alias/alias_of_macro_before_macro.pl
+++ b/tp/t/results/alias/alias_of_macro_before_macro.pl
@@ -40,8 +40,7 @@ $result_trees{'alias_of_macro_before_macro'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -95,8 +94,7 @@ $result_trees{'alias_of_macro_before_macro'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -106,8 +104,7 @@ $result_trees{'alias_of_macro_before_macro'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
diff --git a/tp/t/results/alias/alias_table_command.pl 
b/tp/t/results/alias/alias_table_command.pl
index 714ae5d964..2396155c4f 100644
--- a/tp/t/results/alias/alias_table_command.pl
+++ b/tp/t/results/alias/alias_table_command.pl
@@ -40,8 +40,7 @@ $result_trees{'alias_table_command'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -60,8 +59,7 @@ $result_trees{'alias_table_command'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   },
                   'type' => 'command_as_argument'
                 }
@@ -106,8 +104,7 @@ $result_trees{'alias_table_command'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     }
                   ],
@@ -144,8 +141,7 @@ $result_trees{'alias_table_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -159,8 +155,7 @@ $result_trees{'alias_table_command'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         }
       ],
diff --git a/tp/t/results/alias/bad_line.pl b/tp/t/results/alias/bad_line.pl
index 1838ab8697..6d1259be86 100644
--- a/tp/t/results/alias/bad_line.pl
+++ b/tp/t/results/alias/bad_line.pl
@@ -39,8 +39,7 @@ $result_trees{'bad_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -69,8 +68,7 @@ $result_trees{'bad_line'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 }
               ],
@@ -91,8 +89,7 @@ $result_trees{'bad_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         }
       ],
@@ -119,7 +116,6 @@ $result_errors{'bad_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'bad argument to @alias',
     'type' => 'error'
   },
@@ -128,7 +124,6 @@ $result_errors{'bad_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '@code should not appear in @alias',
     'type' => 'warning'
   },
@@ -137,7 +132,6 @@ $result_errors{'bad_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'superfluous argument to @alias',
     'type' => 'error'
   },
@@ -146,7 +140,6 @@ $result_errors{'bad_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'bad argument to @alias',
     'type' => 'error'
   }
diff --git a/tp/t/results/alias/block_command_alias.pl 
b/tp/t/results/alias/block_command_alias.pl
index 9f50c8c233..8c711e465d 100644
--- a/tp/t/results/alias/block_command_alias.pl
+++ b/tp/t/results/alias/block_command_alias.pl
@@ -40,8 +40,7 @@ $result_trees{'block_command_alias'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -97,8 +96,7 @@ $result_trees{'block_command_alias'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 }
               ],
@@ -110,8 +108,7 @@ $result_trees{'block_command_alias'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         }
       ],
@@ -139,7 +136,6 @@ $result_errors{'block_command_alias'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'environment command lisp as argument to @alias',
     'type' => 'warning'
   },
@@ -148,7 +144,6 @@ $result_errors{'block_command_alias'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'unknown @end lang',
     'type' => 'warning'
   },
@@ -157,7 +152,6 @@ $result_errors{'block_command_alias'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'no matching `@end lisp\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/alias/recursive_alias.pl 
b/tp/t/results/alias/recursive_alias.pl
index 6f579d4aec..631a088836 100644
--- a/tp/t/results/alias/recursive_alias.pl
+++ b/tp/t/results/alias/recursive_alias.pl
@@ -40,8 +40,7 @@ $result_trees{'recursive_alias'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -80,8 +79,7 @@ $result_trees{'recursive_alias'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -120,8 +118,7 @@ $result_trees{'recursive_alias'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -148,8 +145,7 @@ $result_trees{'recursive_alias'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -206,7 +202,6 @@ $result_errors{'recursive_alias'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'recursive alias definition of strong through other ignored',
     'type' => 'warning'
   },
@@ -215,7 +210,6 @@ $result_errors{'recursive_alias'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'unknown command `other\'',
     'type' => 'error'
   },
@@ -224,7 +218,6 @@ $result_errors{'recursive_alias'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
   },
@@ -233,7 +226,6 @@ $result_errors{'recursive_alias'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/alias/simple.pl b/tp/t/results/alias/simple.pl
index 396b1598a9..77308541ed 100644
--- a/tp/t/results/alias/simple.pl
+++ b/tp/t/results/alias/simple.pl
@@ -40,8 +40,7 @@ $result_trees{'simple'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -89,8 +88,7 @@ $result_trees{'simple'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -120,8 +118,7 @@ $result_trees{'simple'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -160,8 +157,7 @@ $result_trees{'simple'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
diff --git a/tp/t/results/alias/texinfo_command_alias.pl 
b/tp/t/results/alias/texinfo_command_alias.pl
index eef8529564..d2d65b7b3b 100644
--- a/tp/t/results/alias/texinfo_command_alias.pl
+++ b/tp/t/results/alias/texinfo_command_alias.pl
@@ -55,8 +55,7 @@ $result_trees{'texinfo_command_alias'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -66,8 +65,7 @@ $result_trees{'texinfo_command_alias'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -106,8 +104,7 @@ $result_trees{'texinfo_command_alias'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -194,8 +191,7 @@ $result_trees{'texinfo_command_alias'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -227,8 +223,7 @@ $result_trees{'texinfo_command_alias'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'definfoenclose_command'
             },
@@ -281,7 +276,6 @@ $result_errors{'texinfo_command_alias'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@definfoenclose is obsolete',
     'type' => 'warning'
   }
diff --git a/tp/t/results/alias/texinfo_command_alias_indirect.pl 
b/tp/t/results/alias/texinfo_command_alias_indirect.pl
index 589e9d238e..1596f91ee3 100644
--- a/tp/t/results/alias/texinfo_command_alias_indirect.pl
+++ b/tp/t/results/alias/texinfo_command_alias_indirect.pl
@@ -55,8 +55,7 @@ $result_trees{'texinfo_command_alias_indirect'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -66,8 +65,7 @@ $result_trees{'texinfo_command_alias_indirect'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -106,8 +104,7 @@ $result_trees{'texinfo_command_alias_indirect'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -146,8 +143,7 @@ $result_trees{'texinfo_command_alias_indirect'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
diff --git a/tp/t/results/alias/texinfo_command_alias_indirect_before.pl 
b/tp/t/results/alias/texinfo_command_alias_indirect_before.pl
index 630503f28a..dc20b58592 100644
--- a/tp/t/results/alias/texinfo_command_alias_indirect_before.pl
+++ b/tp/t/results/alias/texinfo_command_alias_indirect_before.pl
@@ -55,8 +55,7 @@ $result_trees{'texinfo_command_alias_indirect_before'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -66,8 +65,7 @@ $result_trees{'texinfo_command_alias_indirect_before'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -106,8 +104,7 @@ $result_trees{'texinfo_command_alias_indirect_before'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -146,8 +143,7 @@ $result_trees{'texinfo_command_alias_indirect_before'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -174,8 +170,7 @@ $result_trees{'texinfo_command_alias_indirect_before'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
diff --git a/tp/t/results/columnfractions/empty.pl 
b/tp/t/results/columnfractions/empty.pl
index dc54311242..dad3917b8f 100644
--- a/tp/t/results/columnfractions/empty.pl
+++ b/tp/t/results/columnfractions/empty.pl
@@ -28,8 +28,7 @@ $result_trees{'empty'} = {
                   'cmdname' => 'columnfractions',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 }
               ],
@@ -60,8 +59,7 @@ $result_trees{'empty'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -75,8 +73,7 @@ $result_trees{'empty'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -98,7 +95,6 @@ $result_errors{'empty'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@columnfractions missing argument',
     'type' => 'error'
   }
diff --git a/tp/t/results/columnfractions/empty_comment.pl 
b/tp/t/results/columnfractions/empty_comment.pl
index 0c531476ce..1652ceeebf 100644
--- a/tp/t/results/columnfractions/empty_comment.pl
+++ b/tp/t/results/columnfractions/empty_comment.pl
@@ -39,8 +39,7 @@ $result_trees{'empty_comment'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 }
               ],
@@ -71,8 +70,7 @@ $result_trees{'empty_comment'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -86,8 +84,7 @@ $result_trees{'empty_comment'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -109,7 +106,6 @@ $result_errors{'empty_comment'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@columnfractions missing argument',
     'type' => 'error'
   }
diff --git a/tp/t/results/columnfractions/good.pl 
b/tp/t/results/columnfractions/good.pl
index f52337df0e..ca0ef48d94 100644
--- a/tp/t/results/columnfractions/good.pl
+++ b/tp/t/results/columnfractions/good.pl
@@ -45,8 +45,7 @@ $result_trees{'good'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 }
               ],
@@ -77,8 +76,7 @@ $result_trees{'good'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -93,8 +91,7 @@ $result_trees{'good'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/columnfractions/good_comment.pl 
b/tp/t/results/columnfractions/good_comment.pl
index 53985352f0..c3c948e839 100644
--- a/tp/t/results/columnfractions/good_comment.pl
+++ b/tp/t/results/columnfractions/good_comment.pl
@@ -51,8 +51,7 @@ $result_trees{'good_comment'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 }
               ],
@@ -83,8 +82,7 @@ $result_trees{'good_comment'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -99,8 +97,7 @@ $result_trees{'good_comment'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/columnfractions/good_space_comment.pl 
b/tp/t/results/columnfractions/good_space_comment.pl
index b4e57083f9..6dca03bff3 100644
--- a/tp/t/results/columnfractions/good_space_comment.pl
+++ b/tp/t/results/columnfractions/good_space_comment.pl
@@ -53,8 +53,7 @@ $result_trees{'good_space_comment'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 }
               ],
@@ -85,8 +84,7 @@ $result_trees{'good_space_comment'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -101,8 +99,7 @@ $result_trees{'good_space_comment'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/columnfractions/invalid.pl 
b/tp/t/results/columnfractions/invalid.pl
index d7b7e51fd3..b75f9210f2 100644
--- a/tp/t/results/columnfractions/invalid.pl
+++ b/tp/t/results/columnfractions/invalid.pl
@@ -38,8 +38,7 @@ $result_trees{'invalid'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 }
               ],
@@ -70,8 +69,7 @@ $result_trees{'invalid'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -85,8 +83,7 @@ $result_trees{'invalid'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -108,7 +105,6 @@ $result_errors{'invalid'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'column fraction not a number: 2x.2',
     'type' => 'error'
   },
@@ -117,7 +113,6 @@ $result_errors{'invalid'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'column fraction not a number: 2.23x',
     'type' => 'error'
   }
diff --git a/tp/t/results/columnfractions/not_fraction.pl 
b/tp/t/results/columnfractions/not_fraction.pl
index 495f0265e5..8ad9998160 100644
--- a/tp/t/results/columnfractions/not_fraction.pl
+++ b/tp/t/results/columnfractions/not_fraction.pl
@@ -38,8 +38,7 @@ $result_trees{'not_fraction'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 }
               ],
@@ -70,8 +69,7 @@ $result_trees{'not_fraction'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -85,8 +83,7 @@ $result_trees{'not_fraction'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -108,7 +105,6 @@ $result_errors{'not_fraction'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'column fraction not a number: aaa',
     'type' => 'error'
   }
diff --git a/tp/t/results/columnfractions/out_of_multitable.pl 
b/tp/t/results/columnfractions/out_of_multitable.pl
index 692ac5ab8b..2f0e99234b 100644
--- a/tp/t/results/columnfractions/out_of_multitable.pl
+++ b/tp/t/results/columnfractions/out_of_multitable.pl
@@ -34,8 +34,7 @@ $result_trees{'out_of_multitable'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -56,7 +55,6 @@ $result_errors{'out_of_multitable'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'column fraction not a number: aaa',
     'type' => 'error'
   },
@@ -65,7 +63,6 @@ $result_errors{'out_of_multitable'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@columnfractions only meaningful on a @multitable line',
     'type' => 'error'
   }
diff --git a/tp/t/results/columnfractions/something_before_columnfractions.pl 
b/tp/t/results/columnfractions/something_before_columnfractions.pl
index 33fbab0525..e899bfb723 100644
--- a/tp/t/results/columnfractions/something_before_columnfractions.pl
+++ b/tp/t/results/columnfractions/something_before_columnfractions.pl
@@ -47,8 +47,7 @@ $result_trees{'something_before_columnfractions'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 }
               ],
@@ -79,8 +78,7 @@ $result_trees{'something_before_columnfractions'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -95,8 +93,7 @@ $result_trees{'something_before_columnfractions'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/columnfractions/wrong_command.pl 
b/tp/t/results/columnfractions/wrong_command.pl
index 3c65cbabe9..03ab059a3a 100644
--- a/tp/t/results/columnfractions/wrong_command.pl
+++ b/tp/t/results/columnfractions/wrong_command.pl
@@ -31,8 +31,7 @@ $result_trees{'wrong_command'} = {
                           'cmdname' => 'b',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 1,
-                            'macro' => ''
+                            'line_nr' => 1
                           }
                         }
                       ],
@@ -53,8 +52,7 @@ $result_trees{'wrong_command'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 }
               ],
@@ -85,8 +83,7 @@ $result_trees{'wrong_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -100,8 +97,7 @@ $result_trees{'wrong_command'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -123,7 +119,6 @@ $result_errors{'wrong_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@b should not appear in @columnfractions',
     'type' => 'warning'
   },
@@ -132,7 +127,6 @@ $result_errors{'wrong_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'superfluous argument to @columnfractions',
     'type' => 'error'
   }
diff --git a/tp/t/results/conditionals/additional_space_in_end_conditional.pl 
b/tp/t/results/conditionals/additional_space_in_end_conditional.pl
index 4294f4a2ef..9eb7ac06e7 100644
--- a/tp/t/results/conditionals/additional_space_in_end_conditional.pl
+++ b/tp/t/results/conditionals/additional_space_in_end_conditional.pl
@@ -60,15 +60,13 @@ $result_trees{'additional_space_in_end_conditional'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 3,
-                      'macro' => ''
+                      'line_nr' => 3
                     }
                   }
                 ],
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 1,
-                  'macro' => ''
+                  'line_nr' => 1
                 }
               },
               'sourcemark_type' => 'ignored_conditional_block'
diff --git 
a/tp/t/results/conditionals/additional_space_in_end_conditional_expanded.pl 
b/tp/t/results/conditionals/additional_space_in_end_conditional_expanded.pl
index c6284f7f62..c564c2de60 100644
--- a/tp/t/results/conditionals/additional_space_in_end_conditional_expanded.pl
+++ b/tp/t/results/conditionals/additional_space_in_end_conditional_expanded.pl
@@ -28,8 +28,7 @@ $result_trees{'additional_space_in_end_conditional_expanded'} 
= {
                 'cmdname' => 'ifnothtml',
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 1,
-                  'macro' => ''
+                  'line_nr' => 1
                 }
               },
               'sourcemark_type' => 'expanded_conditional_command',
@@ -72,8 +71,7 @@ $result_trees{'additional_space_in_end_conditional_expanded'} 
= {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 3,
-                      'macro' => ''
+                      'line_nr' => 3
                     }
                   },
                   'position' => 9,
diff --git a/tp/t/results/conditionals/bad_ifclear_argument.pl 
b/tp/t/results/conditionals/bad_ifclear_argument.pl
index 4db488062d..ca1fc5aa05 100644
--- a/tp/t/results/conditionals/bad_ifclear_argument.pl
+++ b/tp/t/results/conditionals/bad_ifclear_argument.pl
@@ -65,8 +65,7 @@ $result_trees{'bad_ifclear_argument'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 4,
-                      'macro' => ''
+                      'line_nr' => 4
                     }
                   }
                 ],
@@ -77,8 +76,7 @@ $result_trees{'bad_ifclear_argument'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 2,
-                  'macro' => ''
+                  'line_nr' => 2
                 }
               },
               'position' => 1,
@@ -109,7 +107,6 @@ $result_errors{'bad_ifclear_argument'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'bad name for @ifclear',
     'type' => 'error'
   }
diff --git a/tp/t/results/conditionals/bad_ifset_argument.pl 
b/tp/t/results/conditionals/bad_ifset_argument.pl
index c392fa1710..0afc034090 100644
--- a/tp/t/results/conditionals/bad_ifset_argument.pl
+++ b/tp/t/results/conditionals/bad_ifset_argument.pl
@@ -65,8 +65,7 @@ $result_trees{'bad_ifset_argument'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 3,
-                      'macro' => ''
+                      'line_nr' => 3
                     }
                   }
                 ],
@@ -77,8 +76,7 @@ $result_trees{'bad_ifset_argument'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 1,
-                  'macro' => ''
+                  'line_nr' => 1
                 }
               },
               'sourcemark_type' => 'ignored_conditional_block'
@@ -104,7 +102,6 @@ $result_errors{'bad_ifset_argument'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'bad name for @ifset',
     'type' => 'error'
   }
diff --git a/tp/t/results/conditionals/command_conditionals.pl 
b/tp/t/results/conditionals/command_conditionals.pl
index 97d1e6df44..a67278a35e 100644
--- a/tp/t/results/conditionals/command_conditionals.pl
+++ b/tp/t/results/conditionals/command_conditionals.pl
@@ -38,8 +38,7 @@ $result_trees{'command_conditionals'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 1,
-                  'macro' => ''
+                  'line_nr' => 1
                 }
               },
               'sourcemark_type' => 'expanded_conditional_command',
@@ -82,8 +81,7 @@ $result_trees{'command_conditionals'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 3,
-                      'macro' => ''
+                      'line_nr' => 3
                     }
                   },
                   'position' => 51,
@@ -153,8 +151,7 @@ $result_trees{'command_conditionals'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 7,
-                      'macro' => ''
+                      'line_nr' => 7
                     }
                   }
                 ],
@@ -165,8 +162,7 @@ $result_trees{'command_conditionals'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 5,
-                  'macro' => ''
+                  'line_nr' => 5
                 }
               },
               'position' => 1,
@@ -199,8 +195,7 @@ $result_trees{'command_conditionals'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 8,
-                  'macro' => ''
+                  'line_nr' => 8
                 }
               },
               'position' => 1,
@@ -252,8 +247,7 @@ $result_trees{'command_conditionals'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 10,
-                      'macro' => ''
+                      'line_nr' => 10
                     }
                   },
                   'position' => 24,
@@ -296,8 +290,7 @@ $result_trees{'command_conditionals'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 12,
-                  'macro' => ''
+                  'line_nr' => 12
                 }
               },
               'position' => 1,
@@ -349,8 +342,7 @@ $result_trees{'command_conditionals'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 14,
-                      'macro' => ''
+                      'line_nr' => 14
                     }
                   },
                   'position' => 17,
@@ -411,8 +403,7 @@ $result_trees{'command_conditionals'} = {
                         },
                         'source_info' => {
                           'file_name' => '',
-                          'line_nr' => 17,
-                          'macro' => ''
+                          'line_nr' => 17
                         }
                       }
                     ],
@@ -423,8 +414,7 @@ $result_trees{'command_conditionals'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 15,
-                      'macro' => ''
+                      'line_nr' => 15
                     }
                   },
                   'position' => 17,
@@ -493,8 +483,7 @@ $result_trees{'command_conditionals'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 21,
-                      'macro' => ''
+                      'line_nr' => 21
                     }
                   }
                 ],
@@ -505,8 +494,7 @@ $result_trees{'command_conditionals'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 19,
-                  'macro' => ''
+                  'line_nr' => 19
                 }
               },
               'position' => 1,
@@ -539,8 +527,7 @@ $result_trees{'command_conditionals'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 22,
-                  'macro' => ''
+                  'line_nr' => 22
                 }
               },
               'position' => 1,
@@ -592,8 +579,7 @@ $result_trees{'command_conditionals'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 24,
-                      'macro' => ''
+                      'line_nr' => 24
                     }
                   },
                   'position' => 25,
diff --git a/tp/t/results/conditionals/command_conditionals_user_defined.pl 
b/tp/t/results/conditionals/command_conditionals_user_defined.pl
index 7bfddbdf1a..9e5ad97b96 100644
--- a/tp/t/results/conditionals/command_conditionals_user_defined.pl
+++ b/tp/t/results/conditionals/command_conditionals_user_defined.pl
@@ -51,8 +51,7 @@ $result_trees{'command_conditionals_user_defined'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'command_conditionals_user_defined'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -101,8 +99,7 @@ $result_trees{'command_conditionals_user_defined'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -142,8 +139,7 @@ $result_trees{'command_conditionals_user_defined'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -182,8 +178,7 @@ $result_trees{'command_conditionals_user_defined'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -215,8 +210,7 @@ $result_trees{'command_conditionals_user_defined'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 11,
-                  'macro' => ''
+                  'line_nr' => 11
                 }
               },
               'position' => 1,
@@ -265,8 +259,7 @@ $result_trees{'command_conditionals_user_defined'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 13,
-                      'macro' => ''
+                      'line_nr' => 13
                     }
                   },
                   'position' => 23,
@@ -327,8 +320,7 @@ $result_trees{'command_conditionals_user_defined'} = {
                         },
                         'source_info' => {
                           'file_name' => '',
-                          'line_nr' => 16,
-                          'macro' => ''
+                          'line_nr' => 16
                         }
                       }
                     ],
@@ -339,8 +331,7 @@ $result_trees{'command_conditionals_user_defined'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 14,
-                      'macro' => ''
+                      'line_nr' => 14
                     }
                   },
                   'position' => 23,
@@ -382,8 +373,7 @@ $result_trees{'command_conditionals_user_defined'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 18,
-                  'macro' => ''
+                  'line_nr' => 18
                 }
               },
               'position' => 1,
@@ -435,8 +425,7 @@ $result_trees{'command_conditionals_user_defined'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 20,
-                      'macro' => ''
+                      'line_nr' => 20
                     }
                   },
                   'position' => 22,
@@ -497,8 +486,7 @@ $result_trees{'command_conditionals_user_defined'} = {
                         },
                         'source_info' => {
                           'file_name' => '',
-                          'line_nr' => 23,
-                          'macro' => ''
+                          'line_nr' => 23
                         }
                       }
                     ],
@@ -509,8 +497,7 @@ $result_trees{'command_conditionals_user_defined'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 21,
-                      'macro' => ''
+                      'line_nr' => 21
                     }
                   },
                   'position' => 22,
@@ -552,8 +539,7 @@ $result_trees{'command_conditionals_user_defined'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 25,
-                  'macro' => ''
+                  'line_nr' => 25
                 }
               },
               'position' => 1,
@@ -605,8 +591,7 @@ $result_trees{'command_conditionals_user_defined'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 27,
-                      'macro' => ''
+                      'line_nr' => 27
                     }
                   },
                   'position' => 21,
@@ -667,8 +652,7 @@ $result_trees{'command_conditionals_user_defined'} = {
                         },
                         'source_info' => {
                           'file_name' => '',
-                          'line_nr' => 30,
-                          'macro' => ''
+                          'line_nr' => 30
                         }
                       }
                     ],
@@ -679,8 +663,7 @@ $result_trees{'command_conditionals_user_defined'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 28,
-                      'macro' => ''
+                      'line_nr' => 28
                     }
                   },
                   'position' => 21,
@@ -722,8 +705,7 @@ $result_trees{'command_conditionals_user_defined'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 32,
-                  'macro' => ''
+                  'line_nr' => 32
                 }
               },
               'position' => 1,
@@ -775,8 +757,7 @@ $result_trees{'command_conditionals_user_defined'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 34,
-                      'macro' => ''
+                      'line_nr' => 34
                     }
                   },
                   'position' => 18,
@@ -837,8 +818,7 @@ $result_trees{'command_conditionals_user_defined'} = {
                         },
                         'source_info' => {
                           'file_name' => '',
-                          'line_nr' => 37,
-                          'macro' => ''
+                          'line_nr' => 37
                         }
                       }
                     ],
@@ -849,8 +829,7 @@ $result_trees{'command_conditionals_user_defined'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 35,
-                      'macro' => ''
+                      'line_nr' => 35
                     }
                   },
                   'position' => 18,
@@ -909,7 +888,6 @@ $result_errors{'command_conditionals_user_defined'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '@definfoenclose is obsolete',
     'type' => 'warning'
   }
diff --git a/tp/t/results/conditionals/commands_in_ifset.pl 
b/tp/t/results/conditionals/commands_in_ifset.pl
index 7022c75268..d33b04c31e 100644
--- a/tp/t/results/conditionals/commands_in_ifset.pl
+++ b/tp/t/results/conditionals/commands_in_ifset.pl
@@ -80,8 +80,7 @@ $result_trees{'commands_in_ifset'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 7,
-                      'macro' => ''
+                      'line_nr' => 7
                     }
                   }
                 ],
@@ -92,8 +91,7 @@ $result_trees{'commands_in_ifset'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 2,
-                  'macro' => ''
+                  'line_nr' => 2
                 }
               },
               'position' => 1,
@@ -180,8 +178,7 @@ $result_trees{'commands_in_ifset'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 15,
-                      'macro' => ''
+                      'line_nr' => 15
                     }
                   }
                 ],
@@ -192,8 +189,7 @@ $result_trees{'commands_in_ifset'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 9,
-                  'macro' => ''
+                  'line_nr' => 9
                 }
               },
               'position' => 1,
diff --git a/tp/t/results/conditionals/comment_on_ifset_line.pl 
b/tp/t/results/conditionals/comment_on_ifset_line.pl
index 5eedd606c8..fa9ff5fa88 100644
--- a/tp/t/results/conditionals/comment_on_ifset_line.pl
+++ b/tp/t/results/conditionals/comment_on_ifset_line.pl
@@ -61,8 +61,7 @@ $result_trees{'comment_on_ifset_line'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 3,
-                  'macro' => ''
+                  'line_nr' => 3
                 }
               },
               'position' => 1,
@@ -108,8 +107,7 @@ $result_trees{'comment_on_ifset_line'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 5,
-                      'macro' => ''
+                      'line_nr' => 5
                     }
                   },
                   'position' => 3,
@@ -149,8 +147,7 @@ $result_trees{'comment_on_ifset_line'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 6,
-                      'macro' => ''
+                      'line_nr' => 6
                     }
                   },
                   'position' => 3,
@@ -193,8 +190,7 @@ $result_trees{'comment_on_ifset_line'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 8,
-                      'macro' => ''
+                      'line_nr' => 8
                     }
                   },
                   'position' => 3,
@@ -234,8 +230,7 @@ $result_trees{'comment_on_ifset_line'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 9,
-                      'macro' => ''
+                      'line_nr' => 9
                     }
                   },
                   'position' => 3,
@@ -278,8 +273,7 @@ $result_trees{'comment_on_ifset_line'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 11,
-                      'macro' => ''
+                      'line_nr' => 11
                     }
                   },
                   'position' => 3,
@@ -322,8 +316,7 @@ $result_trees{'comment_on_ifset_line'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 12,
-                      'macro' => ''
+                      'line_nr' => 12
                     }
                   },
                   'position' => 3,
@@ -366,8 +359,7 @@ $result_trees{'comment_on_ifset_line'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 14,
-                      'macro' => ''
+                      'line_nr' => 14
                     }
                   },
                   'position' => 3,
@@ -410,8 +402,7 @@ $result_trees{'comment_on_ifset_line'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 15,
-                      'macro' => ''
+                      'line_nr' => 15
                     }
                   },
                   'position' => 3,
@@ -454,8 +445,7 @@ $result_trees{'comment_on_ifset_line'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 17,
-                      'macro' => ''
+                      'line_nr' => 17
                     }
                   },
                   'position' => 3,
@@ -498,8 +488,7 @@ $result_trees{'comment_on_ifset_line'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 18,
-                      'macro' => ''
+                      'line_nr' => 18
                     }
                   },
                   'position' => 3,
@@ -542,8 +531,7 @@ $result_trees{'comment_on_ifset_line'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 20,
-                      'macro' => ''
+                      'line_nr' => 20
                     }
                   },
                   'position' => 3,
diff --git a/tp/t/results/conditionals/cond.pl 
b/tp/t/results/conditionals/cond.pl
index 631e2c8d8c..bf7a8dab40 100644
--- a/tp/t/results/conditionals/cond.pl
+++ b/tp/t/results/conditionals/cond.pl
@@ -93,15 +93,13 @@ $result_trees{'cond'} = {
                   },
                   'source_info' => {
                     'file_name' => 'cond.texi',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'cond.texi',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -155,15 +153,13 @@ $result_trees{'cond'} = {
                         },
                         'source_info' => {
                           'file_name' => 'cond.texi',
-                          'line_nr' => 11,
-                          'macro' => ''
+                          'line_nr' => 11
                         }
                       }
                     ],
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 9,
-                      'macro' => ''
+                      'line_nr' => 9
                     }
                   },
                   'position' => 1,
@@ -193,8 +189,7 @@ $result_trees{'cond'} = {
                     'cmdname' => 'ifnothtml',
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 13,
-                      'macro' => ''
+                      'line_nr' => 13
                     }
                   },
                   'position' => 1,
@@ -243,8 +238,7 @@ $result_trees{'cond'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 15,
-                      'macro' => ''
+                      'line_nr' => 15
                     }
                   },
                   'position' => 24,
@@ -295,8 +289,7 @@ $result_trees{'cond'} = {
       },
       'source_info' => {
         'file_name' => 'cond.texi',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -332,8 +325,7 @@ $result_trees{'cond'} = {
       },
       'source_info' => {
         'file_name' => 'cond.texi',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -411,15 +403,13 @@ $result_trees{'cond'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 25,
-                      'macro' => ''
+                      'line_nr' => 25
                     }
                   }
                 ],
                 'source_info' => {
                   'file_name' => 'cond.texi',
-                  'line_nr' => 23,
-                  'macro' => ''
+                  'line_nr' => 23
                 }
               },
               'position' => 1,
@@ -449,8 +439,7 @@ $result_trees{'cond'} = {
                 'cmdname' => 'ifnotinfo',
                 'source_info' => {
                   'file_name' => 'cond.texi',
-                  'line_nr' => 27,
-                  'macro' => ''
+                  'line_nr' => 27
                 }
               },
               'position' => 1,
@@ -496,8 +485,7 @@ $result_trees{'cond'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 29,
-                      'macro' => ''
+                      'line_nr' => 29
                     }
                   },
                   'position' => 24,
@@ -573,15 +561,13 @@ $result_trees{'cond'} = {
               },
               'source_info' => {
                 'file_name' => 'cond.texi',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             }
           ],
           'source_info' => {
             'file_name' => 'cond.texi',
-            'line_nr' => 32,
-            'macro' => ''
+            'line_nr' => 32
           }
         },
         {
@@ -635,15 +621,13 @@ $result_trees{'cond'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 38,
-                      'macro' => ''
+                      'line_nr' => 38
                     }
                   }
                 ],
                 'source_info' => {
                   'file_name' => 'cond.texi',
-                  'line_nr' => 36,
-                  'macro' => ''
+                  'line_nr' => 36
                 }
               },
               'position' => 1,
@@ -673,8 +657,7 @@ $result_trees{'cond'} = {
                 'cmdname' => 'ifnottex',
                 'source_info' => {
                   'file_name' => 'cond.texi',
-                  'line_nr' => 40,
-                  'macro' => ''
+                  'line_nr' => 40
                 }
               },
               'position' => 1,
@@ -720,8 +703,7 @@ $result_trees{'cond'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 42,
-                      'macro' => ''
+                      'line_nr' => 42
                     }
                   },
                   'position' => 23,
@@ -752,8 +734,7 @@ $result_trees{'cond'} = {
       },
       'source_info' => {
         'file_name' => 'cond.texi',
-        'line_nr' => 20,
-        'macro' => ''
+        'line_nr' => 20
       }
     },
     {
diff --git a/tp/t/results/conditionals/cond_ifhtml_ifinfo.pl 
b/tp/t/results/conditionals/cond_ifhtml_ifinfo.pl
index fcb43cfa15..7a0d9f2921 100644
--- a/tp/t/results/conditionals/cond_ifhtml_ifinfo.pl
+++ b/tp/t/results/conditionals/cond_ifhtml_ifinfo.pl
@@ -92,15 +92,13 @@ $result_trees{'cond_ifhtml_ifinfo'} = {
                   },
                   'source_info' => {
                     'file_name' => 'cond.texi',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'cond.texi',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -122,8 +120,7 @@ $result_trees{'cond_ifhtml_ifinfo'} = {
                     'cmdname' => 'ifhtml',
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 9,
-                      'macro' => ''
+                      'line_nr' => 9
                     }
                   },
                   'position' => 1,
@@ -172,8 +169,7 @@ $result_trees{'cond_ifhtml_ifinfo'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 11,
-                      'macro' => ''
+                      'line_nr' => 11
                     }
                   },
                   'position' => 21,
@@ -238,15 +234,13 @@ $result_trees{'cond_ifhtml_ifinfo'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 15,
-                      'macro' => ''
+                      'line_nr' => 15
                     }
                   }
                 ],
                 'source_info' => {
                   'file_name' => 'cond.texi',
-                  'line_nr' => 13,
-                  'macro' => ''
+                  'line_nr' => 13
                 }
               },
               'position' => 1,
@@ -294,8 +288,7 @@ $result_trees{'cond_ifhtml_ifinfo'} = {
       },
       'source_info' => {
         'file_name' => 'cond.texi',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -331,8 +324,7 @@ $result_trees{'cond_ifhtml_ifinfo'} = {
       },
       'source_info' => {
         'file_name' => 'cond.texi',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -378,8 +370,7 @@ $result_trees{'cond_ifhtml_ifinfo'} = {
                 'cmdname' => 'ifinfo',
                 'source_info' => {
                   'file_name' => 'cond.texi',
-                  'line_nr' => 23,
-                  'macro' => ''
+                  'line_nr' => 23
                 }
               },
               'position' => 1,
@@ -425,8 +416,7 @@ $result_trees{'cond_ifhtml_ifinfo'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 25,
-                      'macro' => ''
+                      'line_nr' => 25
                     }
                   },
                   'position' => 21,
@@ -491,15 +481,13 @@ $result_trees{'cond_ifhtml_ifinfo'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 29,
-                      'macro' => ''
+                      'line_nr' => 29
                     }
                   }
                 ],
                 'source_info' => {
                   'file_name' => 'cond.texi',
-                  'line_nr' => 27,
-                  'macro' => ''
+                  'line_nr' => 27
                 }
               },
               'position' => 1,
@@ -572,15 +560,13 @@ $result_trees{'cond_ifhtml_ifinfo'} = {
               },
               'source_info' => {
                 'file_name' => 'cond.texi',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             }
           ],
           'source_info' => {
             'file_name' => 'cond.texi',
-            'line_nr' => 32,
-            'macro' => ''
+            'line_nr' => 32
           }
         },
         {
@@ -634,15 +620,13 @@ $result_trees{'cond_ifhtml_ifinfo'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 38,
-                      'macro' => ''
+                      'line_nr' => 38
                     }
                   }
                 ],
                 'source_info' => {
                   'file_name' => 'cond.texi',
-                  'line_nr' => 36,
-                  'macro' => ''
+                  'line_nr' => 36
                 }
               },
               'position' => 1,
@@ -672,8 +656,7 @@ $result_trees{'cond_ifhtml_ifinfo'} = {
                 'cmdname' => 'ifnottex',
                 'source_info' => {
                   'file_name' => 'cond.texi',
-                  'line_nr' => 40,
-                  'macro' => ''
+                  'line_nr' => 40
                 }
               },
               'position' => 1,
@@ -719,8 +702,7 @@ $result_trees{'cond_ifhtml_ifinfo'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 42,
-                      'macro' => ''
+                      'line_nr' => 42
                     }
                   },
                   'position' => 23,
@@ -751,8 +733,7 @@ $result_trees{'cond_ifhtml_ifinfo'} = {
       },
       'source_info' => {
         'file_name' => 'cond.texi',
-        'line_nr' => 20,
-        'macro' => ''
+        'line_nr' => 20
       }
     },
     {
diff --git a/tp/t/results/conditionals/cond_ifhtml_ifinfo_iftex.pl 
b/tp/t/results/conditionals/cond_ifhtml_ifinfo_iftex.pl
index 96035567a7..7b1c904275 100644
--- a/tp/t/results/conditionals/cond_ifhtml_ifinfo_iftex.pl
+++ b/tp/t/results/conditionals/cond_ifhtml_ifinfo_iftex.pl
@@ -92,15 +92,13 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
                   },
                   'source_info' => {
                     'file_name' => 'cond.texi',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'cond.texi',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -122,8 +120,7 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
                     'cmdname' => 'ifhtml',
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 9,
-                      'macro' => ''
+                      'line_nr' => 9
                     }
                   },
                   'position' => 1,
@@ -172,8 +169,7 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 11,
-                      'macro' => ''
+                      'line_nr' => 11
                     }
                   },
                   'position' => 21,
@@ -238,15 +234,13 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 15,
-                      'macro' => ''
+                      'line_nr' => 15
                     }
                   }
                 ],
                 'source_info' => {
                   'file_name' => 'cond.texi',
-                  'line_nr' => 13,
-                  'macro' => ''
+                  'line_nr' => 13
                 }
               },
               'position' => 1,
@@ -294,8 +288,7 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
       },
       'source_info' => {
         'file_name' => 'cond.texi',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -331,8 +324,7 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
       },
       'source_info' => {
         'file_name' => 'cond.texi',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -378,8 +370,7 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
                 'cmdname' => 'ifinfo',
                 'source_info' => {
                   'file_name' => 'cond.texi',
-                  'line_nr' => 23,
-                  'macro' => ''
+                  'line_nr' => 23
                 }
               },
               'position' => 1,
@@ -425,8 +416,7 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 25,
-                      'macro' => ''
+                      'line_nr' => 25
                     }
                   },
                   'position' => 21,
@@ -491,15 +481,13 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 29,
-                      'macro' => ''
+                      'line_nr' => 29
                     }
                   }
                 ],
                 'source_info' => {
                   'file_name' => 'cond.texi',
-                  'line_nr' => 27,
-                  'macro' => ''
+                  'line_nr' => 27
                 }
               },
               'position' => 1,
@@ -571,15 +559,13 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
               },
               'source_info' => {
                 'file_name' => 'cond.texi',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             }
           ],
           'source_info' => {
             'file_name' => 'cond.texi',
-            'line_nr' => 32,
-            'macro' => ''
+            'line_nr' => 32
           }
         },
         {
@@ -601,8 +587,7 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
                 'cmdname' => 'iftex',
                 'source_info' => {
                   'file_name' => 'cond.texi',
-                  'line_nr' => 36,
-                  'macro' => ''
+                  'line_nr' => 36
                 }
               },
               'position' => 1,
@@ -648,8 +633,7 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 38,
-                      'macro' => ''
+                      'line_nr' => 38
                     }
                   },
                   'position' => 20,
@@ -714,15 +698,13 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 42,
-                      'macro' => ''
+                      'line_nr' => 42
                     }
                   }
                 ],
                 'source_info' => {
                   'file_name' => 'cond.texi',
-                  'line_nr' => 40,
-                  'macro' => ''
+                  'line_nr' => 40
                 }
               },
               'position' => 1,
@@ -750,8 +732,7 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
       },
       'source_info' => {
         'file_name' => 'cond.texi',
-        'line_nr' => 20,
-        'macro' => ''
+        'line_nr' => 20
       }
     },
     {
@@ -960,7 +941,6 @@ 
$result_converted_errors{'html'}->{'cond_ifhtml_ifinfo_iftex'} = [
 ',
     'file_name' => 'cond.texi',
     'line_nr' => 32,
-    'macro' => '',
     'text' => 'raw format tex is not converted',
     'type' => 'warning'
   }
diff --git a/tp/t/results/conditionals/cond_info.pl 
b/tp/t/results/conditionals/cond_info.pl
index 54322e748f..cfeac1278a 100644
--- a/tp/t/results/conditionals/cond_info.pl
+++ b/tp/t/results/conditionals/cond_info.pl
@@ -93,15 +93,13 @@ $result_trees{'cond_info'} = {
                   },
                   'source_info' => {
                     'file_name' => 'cond.texi',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'cond.texi',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -155,15 +153,13 @@ $result_trees{'cond_info'} = {
                         },
                         'source_info' => {
                           'file_name' => 'cond.texi',
-                          'line_nr' => 11,
-                          'macro' => ''
+                          'line_nr' => 11
                         }
                       }
                     ],
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 9,
-                      'macro' => ''
+                      'line_nr' => 9
                     }
                   },
                   'position' => 1,
@@ -193,8 +189,7 @@ $result_trees{'cond_info'} = {
                     'cmdname' => 'ifnothtml',
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 13,
-                      'macro' => ''
+                      'line_nr' => 13
                     }
                   },
                   'position' => 1,
@@ -243,8 +238,7 @@ $result_trees{'cond_info'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 15,
-                      'macro' => ''
+                      'line_nr' => 15
                     }
                   },
                   'position' => 24,
@@ -295,8 +289,7 @@ $result_trees{'cond_info'} = {
       },
       'source_info' => {
         'file_name' => 'cond.texi',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -332,8 +325,7 @@ $result_trees{'cond_info'} = {
       },
       'source_info' => {
         'file_name' => 'cond.texi',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -379,8 +371,7 @@ $result_trees{'cond_info'} = {
                 'cmdname' => 'ifinfo',
                 'source_info' => {
                   'file_name' => 'cond.texi',
-                  'line_nr' => 23,
-                  'macro' => ''
+                  'line_nr' => 23
                 }
               },
               'position' => 1,
@@ -426,8 +417,7 @@ $result_trees{'cond_info'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 25,
-                      'macro' => ''
+                      'line_nr' => 25
                     }
                   },
                   'position' => 21,
@@ -492,15 +482,13 @@ $result_trees{'cond_info'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 29,
-                      'macro' => ''
+                      'line_nr' => 29
                     }
                   }
                 ],
                 'source_info' => {
                   'file_name' => 'cond.texi',
-                  'line_nr' => 27,
-                  'macro' => ''
+                  'line_nr' => 27
                 }
               },
               'position' => 1,
@@ -573,15 +561,13 @@ $result_trees{'cond_info'} = {
               },
               'source_info' => {
                 'file_name' => 'cond.texi',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             }
           ],
           'source_info' => {
             'file_name' => 'cond.texi',
-            'line_nr' => 32,
-            'macro' => ''
+            'line_nr' => 32
           }
         },
         {
@@ -635,15 +621,13 @@ $result_trees{'cond_info'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 38,
-                      'macro' => ''
+                      'line_nr' => 38
                     }
                   }
                 ],
                 'source_info' => {
                   'file_name' => 'cond.texi',
-                  'line_nr' => 36,
-                  'macro' => ''
+                  'line_nr' => 36
                 }
               },
               'position' => 1,
@@ -673,8 +657,7 @@ $result_trees{'cond_info'} = {
                 'cmdname' => 'ifnottex',
                 'source_info' => {
                   'file_name' => 'cond.texi',
-                  'line_nr' => 40,
-                  'macro' => ''
+                  'line_nr' => 40
                 }
               },
               'position' => 1,
@@ -720,8 +703,7 @@ $result_trees{'cond_info'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 42,
-                      'macro' => ''
+                      'line_nr' => 42
                     }
                   },
                   'position' => 23,
@@ -752,8 +734,7 @@ $result_trees{'cond_info'} = {
       },
       'source_info' => {
         'file_name' => 'cond.texi',
-        'line_nr' => 20,
-        'macro' => ''
+        'line_nr' => 20
       }
     },
     {
diff --git a/tp/t/results/conditionals/cond_info_ifhtml_ifinfo_iftex.pl 
b/tp/t/results/conditionals/cond_info_ifhtml_ifinfo_iftex.pl
index 22038df605..43fe0b6d40 100644
--- a/tp/t/results/conditionals/cond_info_ifhtml_ifinfo_iftex.pl
+++ b/tp/t/results/conditionals/cond_info_ifhtml_ifinfo_iftex.pl
@@ -92,15 +92,13 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
                   },
                   'source_info' => {
                     'file_name' => 'cond.texi',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'cond.texi',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -122,8 +120,7 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
                     'cmdname' => 'ifhtml',
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 9,
-                      'macro' => ''
+                      'line_nr' => 9
                     }
                   },
                   'position' => 1,
@@ -172,8 +169,7 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 11,
-                      'macro' => ''
+                      'line_nr' => 11
                     }
                   },
                   'position' => 21,
@@ -238,15 +234,13 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 15,
-                      'macro' => ''
+                      'line_nr' => 15
                     }
                   }
                 ],
                 'source_info' => {
                   'file_name' => 'cond.texi',
-                  'line_nr' => 13,
-                  'macro' => ''
+                  'line_nr' => 13
                 }
               },
               'position' => 1,
@@ -294,8 +288,7 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
       },
       'source_info' => {
         'file_name' => 'cond.texi',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -331,8 +324,7 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
       },
       'source_info' => {
         'file_name' => 'cond.texi',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -378,8 +370,7 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
                 'cmdname' => 'ifinfo',
                 'source_info' => {
                   'file_name' => 'cond.texi',
-                  'line_nr' => 23,
-                  'macro' => ''
+                  'line_nr' => 23
                 }
               },
               'position' => 1,
@@ -425,8 +416,7 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 25,
-                      'macro' => ''
+                      'line_nr' => 25
                     }
                   },
                   'position' => 21,
@@ -491,15 +481,13 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 29,
-                      'macro' => ''
+                      'line_nr' => 29
                     }
                   }
                 ],
                 'source_info' => {
                   'file_name' => 'cond.texi',
-                  'line_nr' => 27,
-                  'macro' => ''
+                  'line_nr' => 27
                 }
               },
               'position' => 1,
@@ -571,15 +559,13 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
               },
               'source_info' => {
                 'file_name' => 'cond.texi',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             }
           ],
           'source_info' => {
             'file_name' => 'cond.texi',
-            'line_nr' => 32,
-            'macro' => ''
+            'line_nr' => 32
           }
         },
         {
@@ -601,8 +587,7 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
                 'cmdname' => 'iftex',
                 'source_info' => {
                   'file_name' => 'cond.texi',
-                  'line_nr' => 36,
-                  'macro' => ''
+                  'line_nr' => 36
                 }
               },
               'position' => 1,
@@ -648,8 +633,7 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 38,
-                      'macro' => ''
+                      'line_nr' => 38
                     }
                   },
                   'position' => 20,
@@ -714,15 +698,13 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 42,
-                      'macro' => ''
+                      'line_nr' => 42
                     }
                   }
                 ],
                 'source_info' => {
                   'file_name' => 'cond.texi',
-                  'line_nr' => 40,
-                  'macro' => ''
+                  'line_nr' => 40
                 }
               },
               'position' => 1,
@@ -750,8 +732,7 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
       },
       'source_info' => {
         'file_name' => 'cond.texi',
-        'line_nr' => 20,
-        'macro' => ''
+        'line_nr' => 20
       }
     },
     {
diff --git 
a/tp/t/results/conditionals/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl 
b/tp/t/results/conditionals/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
index ad85859e2e..84ca580e20 100644
--- a/tp/t/results/conditionals/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
+++ b/tp/t/results/conditionals/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
@@ -93,15 +93,13 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
                   },
                   'source_info' => {
                     'file_name' => 'cond.texi',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'cond.texi',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -155,15 +153,13 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = 
{
                         },
                         'source_info' => {
                           'file_name' => 'cond.texi',
-                          'line_nr' => 11,
-                          'macro' => ''
+                          'line_nr' => 11
                         }
                       }
                     ],
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 9,
-                      'macro' => ''
+                      'line_nr' => 9
                     }
                   },
                   'position' => 1,
@@ -193,8 +189,7 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
                     'cmdname' => 'ifnothtml',
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 13,
-                      'macro' => ''
+                      'line_nr' => 13
                     }
                   },
                   'position' => 1,
@@ -243,8 +238,7 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 15,
-                      'macro' => ''
+                      'line_nr' => 15
                     }
                   },
                   'position' => 24,
@@ -295,8 +289,7 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
       },
       'source_info' => {
         'file_name' => 'cond.texi',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -332,8 +325,7 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
       },
       'source_info' => {
         'file_name' => 'cond.texi',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -411,15 +403,13 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = 
{
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 25,
-                      'macro' => ''
+                      'line_nr' => 25
                     }
                   }
                 ],
                 'source_info' => {
                   'file_name' => 'cond.texi',
-                  'line_nr' => 23,
-                  'macro' => ''
+                  'line_nr' => 23
                 }
               },
               'position' => 1,
@@ -449,8 +439,7 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
                 'cmdname' => 'ifnotinfo',
                 'source_info' => {
                   'file_name' => 'cond.texi',
-                  'line_nr' => 27,
-                  'macro' => ''
+                  'line_nr' => 27
                 }
               },
               'position' => 1,
@@ -496,8 +485,7 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 29,
-                      'macro' => ''
+                      'line_nr' => 29
                     }
                   },
                   'position' => 24,
@@ -573,15 +561,13 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = 
{
               },
               'source_info' => {
                 'file_name' => 'cond.texi',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             }
           ],
           'source_info' => {
             'file_name' => 'cond.texi',
-            'line_nr' => 32,
-            'macro' => ''
+            'line_nr' => 32
           }
         },
         {
@@ -635,15 +621,13 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = 
{
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 38,
-                      'macro' => ''
+                      'line_nr' => 38
                     }
                   }
                 ],
                 'source_info' => {
                   'file_name' => 'cond.texi',
-                  'line_nr' => 36,
-                  'macro' => ''
+                  'line_nr' => 36
                 }
               },
               'position' => 1,
@@ -673,8 +657,7 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
                 'cmdname' => 'ifnottex',
                 'source_info' => {
                   'file_name' => 'cond.texi',
-                  'line_nr' => 40,
-                  'macro' => ''
+                  'line_nr' => 40
                 }
               },
               'position' => 1,
@@ -720,8 +703,7 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 42,
-                      'macro' => ''
+                      'line_nr' => 42
                     }
                   },
                   'position' => 23,
@@ -752,8 +734,7 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
       },
       'source_info' => {
         'file_name' => 'cond.texi',
-        'line_nr' => 20,
-        'macro' => ''
+        'line_nr' => 20
       }
     },
     {
diff --git a/tp/t/results/conditionals/cond_no-ifhtml_no-ifinfo_no-iftex.pl 
b/tp/t/results/conditionals/cond_no-ifhtml_no-ifinfo_no-iftex.pl
index ef4fd4c0bf..f049898233 100644
--- a/tp/t/results/conditionals/cond_no-ifhtml_no-ifinfo_no-iftex.pl
+++ b/tp/t/results/conditionals/cond_no-ifhtml_no-ifinfo_no-iftex.pl
@@ -93,15 +93,13 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
                   },
                   'source_info' => {
                     'file_name' => 'cond.texi',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'cond.texi',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -155,15 +153,13 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
                         },
                         'source_info' => {
                           'file_name' => 'cond.texi',
-                          'line_nr' => 11,
-                          'macro' => ''
+                          'line_nr' => 11
                         }
                       }
                     ],
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 9,
-                      'macro' => ''
+                      'line_nr' => 9
                     }
                   },
                   'position' => 1,
@@ -193,8 +189,7 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
                     'cmdname' => 'ifnothtml',
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 13,
-                      'macro' => ''
+                      'line_nr' => 13
                     }
                   },
                   'position' => 1,
@@ -243,8 +238,7 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 15,
-                      'macro' => ''
+                      'line_nr' => 15
                     }
                   },
                   'position' => 24,
@@ -295,8 +289,7 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
       },
       'source_info' => {
         'file_name' => 'cond.texi',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -332,8 +325,7 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
       },
       'source_info' => {
         'file_name' => 'cond.texi',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -411,15 +403,13 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 25,
-                      'macro' => ''
+                      'line_nr' => 25
                     }
                   }
                 ],
                 'source_info' => {
                   'file_name' => 'cond.texi',
-                  'line_nr' => 23,
-                  'macro' => ''
+                  'line_nr' => 23
                 }
               },
               'position' => 1,
@@ -449,8 +439,7 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
                 'cmdname' => 'ifnotinfo',
                 'source_info' => {
                   'file_name' => 'cond.texi',
-                  'line_nr' => 27,
-                  'macro' => ''
+                  'line_nr' => 27
                 }
               },
               'position' => 1,
@@ -496,8 +485,7 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 29,
-                      'macro' => ''
+                      'line_nr' => 29
                     }
                   },
                   'position' => 24,
@@ -573,15 +561,13 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
               },
               'source_info' => {
                 'file_name' => 'cond.texi',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             }
           ],
           'source_info' => {
             'file_name' => 'cond.texi',
-            'line_nr' => 32,
-            'macro' => ''
+            'line_nr' => 32
           }
         },
         {
@@ -635,15 +621,13 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 38,
-                      'macro' => ''
+                      'line_nr' => 38
                     }
                   }
                 ],
                 'source_info' => {
                   'file_name' => 'cond.texi',
-                  'line_nr' => 36,
-                  'macro' => ''
+                  'line_nr' => 36
                 }
               },
               'position' => 1,
@@ -673,8 +657,7 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
                 'cmdname' => 'ifnottex',
                 'source_info' => {
                   'file_name' => 'cond.texi',
-                  'line_nr' => 40,
-                  'macro' => ''
+                  'line_nr' => 40
                 }
               },
               'position' => 1,
@@ -720,8 +703,7 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 42,
-                      'macro' => ''
+                      'line_nr' => 42
                     }
                   },
                   'position' => 23,
@@ -752,8 +734,7 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
       },
       'source_info' => {
         'file_name' => 'cond.texi',
-        'line_nr' => 20,
-        'macro' => ''
+        'line_nr' => 20
       }
     },
     {
diff --git a/tp/t/results/conditionals/cond_xml.pl 
b/tp/t/results/conditionals/cond_xml.pl
index feb7291916..f535a2408b 100644
--- a/tp/t/results/conditionals/cond_xml.pl
+++ b/tp/t/results/conditionals/cond_xml.pl
@@ -93,15 +93,13 @@ $result_trees{'cond_xml'} = {
                   },
                   'source_info' => {
                     'file_name' => 'cond.texi',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'cond.texi',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -155,15 +153,13 @@ $result_trees{'cond_xml'} = {
                         },
                         'source_info' => {
                           'file_name' => 'cond.texi',
-                          'line_nr' => 11,
-                          'macro' => ''
+                          'line_nr' => 11
                         }
                       }
                     ],
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 9,
-                      'macro' => ''
+                      'line_nr' => 9
                     }
                   },
                   'position' => 1,
@@ -193,8 +189,7 @@ $result_trees{'cond_xml'} = {
                     'cmdname' => 'ifnothtml',
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 13,
-                      'macro' => ''
+                      'line_nr' => 13
                     }
                   },
                   'position' => 1,
@@ -243,8 +238,7 @@ $result_trees{'cond_xml'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 15,
-                      'macro' => ''
+                      'line_nr' => 15
                     }
                   },
                   'position' => 24,
@@ -295,8 +289,7 @@ $result_trees{'cond_xml'} = {
       },
       'source_info' => {
         'file_name' => 'cond.texi',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -332,8 +325,7 @@ $result_trees{'cond_xml'} = {
       },
       'source_info' => {
         'file_name' => 'cond.texi',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -411,15 +403,13 @@ $result_trees{'cond_xml'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 25,
-                      'macro' => ''
+                      'line_nr' => 25
                     }
                   }
                 ],
                 'source_info' => {
                   'file_name' => 'cond.texi',
-                  'line_nr' => 23,
-                  'macro' => ''
+                  'line_nr' => 23
                 }
               },
               'position' => 1,
@@ -449,8 +439,7 @@ $result_trees{'cond_xml'} = {
                 'cmdname' => 'ifnotinfo',
                 'source_info' => {
                   'file_name' => 'cond.texi',
-                  'line_nr' => 27,
-                  'macro' => ''
+                  'line_nr' => 27
                 }
               },
               'position' => 1,
@@ -496,8 +485,7 @@ $result_trees{'cond_xml'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 29,
-                      'macro' => ''
+                      'line_nr' => 29
                     }
                   },
                   'position' => 24,
@@ -573,15 +561,13 @@ $result_trees{'cond_xml'} = {
               },
               'source_info' => {
                 'file_name' => 'cond.texi',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             }
           ],
           'source_info' => {
             'file_name' => 'cond.texi',
-            'line_nr' => 32,
-            'macro' => ''
+            'line_nr' => 32
           }
         },
         {
@@ -635,15 +621,13 @@ $result_trees{'cond_xml'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 38,
-                      'macro' => ''
+                      'line_nr' => 38
                     }
                   }
                 ],
                 'source_info' => {
                   'file_name' => 'cond.texi',
-                  'line_nr' => 36,
-                  'macro' => ''
+                  'line_nr' => 36
                 }
               },
               'position' => 1,
@@ -673,8 +657,7 @@ $result_trees{'cond_xml'} = {
                 'cmdname' => 'ifnottex',
                 'source_info' => {
                   'file_name' => 'cond.texi',
-                  'line_nr' => 40,
-                  'macro' => ''
+                  'line_nr' => 40
                 }
               },
               'position' => 1,
@@ -720,8 +703,7 @@ $result_trees{'cond_xml'} = {
                     },
                     'source_info' => {
                       'file_name' => 'cond.texi',
-                      'line_nr' => 42,
-                      'macro' => ''
+                      'line_nr' => 42
                     }
                   },
                   'position' => 23,
@@ -752,8 +734,7 @@ $result_trees{'cond_xml'} = {
       },
       'source_info' => {
         'file_name' => 'cond.texi',
-        'line_nr' => 20,
-        'macro' => ''
+        'line_nr' => 20
       }
     },
     {
diff --git a/tp/t/results/conditionals/conditional_not_closed.pl 
b/tp/t/results/conditionals/conditional_not_closed.pl
index 3d89d27d41..c864c2699f 100644
--- a/tp/t/results/conditionals/conditional_not_closed.pl
+++ b/tp/t/results/conditionals/conditional_not_closed.pl
@@ -35,8 +35,7 @@ $result_trees{'conditional_not_closed'} = {
                 ],
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 1,
-                  'macro' => ''
+                  'line_nr' => 1
                 }
               },
               'sourcemark_type' => 'ignored_conditional_block'
@@ -62,7 +61,6 @@ $result_errors{'conditional_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'no matching `@end ifhtml\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/conditionals/consecutive_conditionals.pl 
b/tp/t/results/conditionals/consecutive_conditionals.pl
index e4e0414e22..86532dab1a 100644
--- a/tp/t/results/conditionals/consecutive_conditionals.pl
+++ b/tp/t/results/conditionals/consecutive_conditionals.pl
@@ -60,15 +60,13 @@ $result_trees{'consecutive_conditionals'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 3,
-                      'macro' => ''
+                      'line_nr' => 3
                     }
                   }
                 ],
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 1,
-                  'macro' => ''
+                  'line_nr' => 1
                 }
               },
               'sourcemark_type' => 'ignored_conditional_block'
@@ -122,15 +120,13 @@ $result_trees{'consecutive_conditionals'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 6,
-                      'macro' => ''
+                      'line_nr' => 6
                     }
                   }
                 ],
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 4,
-                  'macro' => ''
+                  'line_nr' => 4
                 }
               },
               'sourcemark_type' => 'ignored_conditional_block'
@@ -216,8 +212,7 @@ $result_trees{'consecutive_conditionals'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 12,
-                      'macro' => ''
+                      'line_nr' => 12
                     }
                   }
                 ],
@@ -228,8 +223,7 @@ $result_trees{'consecutive_conditionals'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 10,
-                  'macro' => ''
+                  'line_nr' => 10
                 }
               },
               'position' => 1,
@@ -289,8 +283,7 @@ $result_trees{'consecutive_conditionals'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 15,
-                      'macro' => ''
+                      'line_nr' => 15
                     }
                   }
                 ],
@@ -301,8 +294,7 @@ $result_trees{'consecutive_conditionals'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 13,
-                  'macro' => ''
+                  'line_nr' => 13
                 }
               },
               'position' => 1,
diff --git a/tp/t/results/conditionals/defcondx_Dbar.pl 
b/tp/t/results/conditionals/defcondx_Dbar.pl
index b17f6caf9f..99cc56f38b 100644
--- a/tp/t/results/conditionals/defcondx_Dbar.pl
+++ b/tp/t/results/conditionals/defcondx_Dbar.pl
@@ -125,8 +125,7 @@ $result_trees{'defcondx_Dbar'} = {
               },
               'source_info' => {
                 'file_name' => 'defxcond.texi',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'def_line'
             },
@@ -161,8 +160,7 @@ $result_trees{'defcondx_Dbar'} = {
                         },
                         'source_info' => {
                           'file_name' => 'defxcond.texi',
-                          'line_nr' => 12,
-                          'macro' => ''
+                          'line_nr' => 12
                         }
                       },
                       'position' => 1,
@@ -209,8 +207,7 @@ $result_trees{'defcondx_Dbar'} = {
               },
               'source_info' => {
                 'file_name' => 'defxcond.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               },
               'source_marks' => [
                 {
@@ -243,8 +240,7 @@ $result_trees{'defcondx_Dbar'} = {
                     },
                     'source_info' => {
                       'file_name' => 'defxcond.texi',
-                      'line_nr' => 14,
-                      'macro' => ''
+                      'line_nr' => 14
                     }
                   },
                   'sourcemark_type' => 'expanded_conditional_command',
@@ -305,8 +301,7 @@ $result_trees{'defcondx_Dbar'} = {
               },
               'source_info' => {
                 'file_name' => 'defxcond.texi',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             }
           ],
@@ -317,8 +312,7 @@ $result_trees{'defcondx_Dbar'} = {
           },
           'source_info' => {
             'file_name' => 'defxcond.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -335,8 +329,7 @@ $result_trees{'defcondx_Dbar'} = {
       },
       'source_info' => {
         'file_name' => 'defxcond.texi',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -410,7 +403,6 @@ $result_errors{'defcondx_Dbar'} = [
 ',
     'file_name' => 'defxcond.texi',
     'line_nr' => 10,
-    'macro' => '',
     'text' => 'missing name for @deffn',
     'type' => 'warning'
   },
@@ -419,7 +411,6 @@ $result_errors{'defcondx_Dbar'} = [
 ',
     'file_name' => 'defxcond.texi',
     'line_nr' => 13,
-    'macro' => '',
     'text' => 'missing name for @deffnx',
     'type' => 'warning'
   }
diff --git a/tp/t/results/conditionals/defcondx_Ubar.pl 
b/tp/t/results/conditionals/defcondx_Ubar.pl
index bd27d9b342..54af83e2bd 100644
--- a/tp/t/results/conditionals/defcondx_Ubar.pl
+++ b/tp/t/results/conditionals/defcondx_Ubar.pl
@@ -125,8 +125,7 @@ $result_trees{'defcondx_Ubar'} = {
               },
               'source_info' => {
                 'file_name' => 'defxcond.texi',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'def_line'
             },
@@ -188,8 +187,7 @@ $result_trees{'defcondx_Ubar'} = {
                             },
                             'source_info' => {
                               'file_name' => 'defxcond.texi',
-                              'line_nr' => 14,
-                              'macro' => ''
+                              'line_nr' => 14
                             }
                           }
                         ],
@@ -200,8 +198,7 @@ $result_trees{'defcondx_Ubar'} = {
                         },
                         'source_info' => {
                           'file_name' => 'defxcond.texi',
-                          'line_nr' => 12,
-                          'macro' => ''
+                          'line_nr' => 12
                         }
                       },
                       'position' => 1,
@@ -262,8 +259,7 @@ $result_trees{'defcondx_Ubar'} = {
               },
               'source_info' => {
                 'file_name' => 'defxcond.texi',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             }
           ],
@@ -274,8 +270,7 @@ $result_trees{'defcondx_Ubar'} = {
           },
           'source_info' => {
             'file_name' => 'defxcond.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -292,8 +287,7 @@ $result_trees{'defcondx_Ubar'} = {
       },
       'source_info' => {
         'file_name' => 'defxcond.texi',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -365,7 +359,6 @@ $result_errors{'defcondx_Ubar'} = [
 ',
     'file_name' => 'defxcond.texi',
     'line_nr' => 10,
-    'macro' => '',
     'text' => 'missing name for @deffn',
     'type' => 'warning'
   }
diff --git a/tp/t/results/conditionals/empty_ifclear.pl 
b/tp/t/results/conditionals/empty_ifclear.pl
index 916a79e79f..56ca1fe532 100644
--- a/tp/t/results/conditionals/empty_ifclear.pl
+++ b/tp/t/results/conditionals/empty_ifclear.pl
@@ -70,15 +70,13 @@ $result_trees{'empty_ifclear'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 5,
-                      'macro' => ''
+                      'line_nr' => 5
                     }
                   }
                 ],
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 1,
-                  'macro' => ''
+                  'line_nr' => 1
                 }
               },
               'sourcemark_type' => 'ignored_conditional_block'
@@ -104,7 +102,6 @@ $result_errors{'empty_ifclear'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@ifclear requires a name',
     'type' => 'error'
   }
diff --git a/tp/t/results/conditionals/empty_ifset.pl 
b/tp/t/results/conditionals/empty_ifset.pl
index 6eb45852ca..ece5df1360 100644
--- a/tp/t/results/conditionals/empty_ifset.pl
+++ b/tp/t/results/conditionals/empty_ifset.pl
@@ -70,15 +70,13 @@ $result_trees{'empty_ifset'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 5,
-                      'macro' => ''
+                      'line_nr' => 5
                     }
                   }
                 ],
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 1,
-                  'macro' => ''
+                  'line_nr' => 1
                 }
               },
               'sourcemark_type' => 'ignored_conditional_block'
@@ -104,7 +102,6 @@ $result_errors{'empty_ifset'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@ifset requires a name',
     'type' => 'error'
   }
diff --git a/tp/t/results/conditionals/empty_ifset_in_ifset_no_set.pl 
b/tp/t/results/conditionals/empty_ifset_in_ifset_no_set.pl
index 503a9c8268..7eb9548c68 100644
--- a/tp/t/results/conditionals/empty_ifset_in_ifset_no_set.pl
+++ b/tp/t/results/conditionals/empty_ifset_in_ifset_no_set.pl
@@ -72,8 +72,7 @@ $result_trees{'empty_ifset_in_ifset_no_set'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 6,
-                                'macro' => ''
+                                'line_nr' => 6
                               }
                             }
                           ]
@@ -94,8 +93,7 @@ $result_trees{'empty_ifset_in_ifset_no_set'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 2,
-                  'macro' => ''
+                  'line_nr' => 2
                 }
               },
               'position' => 1,
@@ -126,7 +124,6 @@ $result_errors{'empty_ifset_in_ifset_no_set'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'no matching `@end ifset\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/conditionals/empty_ifset_in_ifset_set.pl 
b/tp/t/results/conditionals/empty_ifset_in_ifset_set.pl
index a2f250af44..c59be2d681 100644
--- a/tp/t/results/conditionals/empty_ifset_in_ifset_set.pl
+++ b/tp/t/results/conditionals/empty_ifset_in_ifset_set.pl
@@ -60,8 +60,7 @@ $result_trees{'empty_ifset_in_ifset_set'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 4,
-                  'macro' => ''
+                  'line_nr' => 4
                 }
               },
               'position' => 1,
@@ -120,15 +119,13 @@ $result_trees{'empty_ifset_in_ifset_set'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           },
           'source_marks' => [
             {
@@ -161,8 +158,7 @@ $result_trees{'empty_ifset_in_ifset_set'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 8,
-                  'macro' => ''
+                  'line_nr' => 8
                 }
               },
               'sourcemark_type' => 'expanded_conditional_command',
diff --git a/tp/t/results/conditionals/empty_set_in_ifclear.pl 
b/tp/t/results/conditionals/empty_set_in_ifclear.pl
index f3c9e8aa30..d27dd1aca2 100644
--- a/tp/t/results/conditionals/empty_set_in_ifclear.pl
+++ b/tp/t/results/conditionals/empty_set_in_ifclear.pl
@@ -76,8 +76,7 @@ $result_trees{'empty_set_in_ifclear'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 5,
-                      'macro' => ''
+                      'line_nr' => 5
                     }
                   }
                 ],
@@ -88,8 +87,7 @@ $result_trees{'empty_set_in_ifclear'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 3,
-                  'macro' => ''
+                  'line_nr' => 3
                 }
               },
               'position' => 1,
diff --git a/tp/t/results/conditionals/empty_set_in_ifset.pl 
b/tp/t/results/conditionals/empty_set_in_ifset.pl
index 99c2109dc9..1cff82ee02 100644
--- a/tp/t/results/conditionals/empty_set_in_ifset.pl
+++ b/tp/t/results/conditionals/empty_set_in_ifset.pl
@@ -55,8 +55,7 @@ $result_trees{'empty_set_in_ifset'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 3,
-                  'macro' => ''
+                  'line_nr' => 3
                 }
               },
               'position' => 1,
@@ -122,8 +121,7 @@ $result_trees{'empty_set_in_ifset'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 5,
-                      'macro' => ''
+                      'line_nr' => 5
                     }
                   },
                   'position' => 16,
diff --git a/tp/t/results/conditionals/end_conditional_not_at_line_begining.pl 
b/tp/t/results/conditionals/end_conditional_not_at_line_begining.pl
index 8c3822f10d..33c0261d12 100644
--- a/tp/t/results/conditionals/end_conditional_not_at_line_begining.pl
+++ b/tp/t/results/conditionals/end_conditional_not_at_line_begining.pl
@@ -64,15 +64,13 @@ $result_trees{'end_conditional_not_at_line_begining'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 3,
-                      'macro' => ''
+                      'line_nr' => 3
                     }
                   }
                 ],
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 1,
-                  'macro' => ''
+                  'line_nr' => 1
                 }
               },
               'sourcemark_type' => 'ignored_conditional_block'
@@ -98,7 +96,6 @@ $result_errors{'end_conditional_not_at_line_begining'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@end ifhtml should only appear at the beginning of a line',
     'type' => 'warning'
   }
diff --git a/tp/t/results/conditionals/end_ifset_in_format.pl 
b/tp/t/results/conditionals/end_ifset_in_format.pl
index b5d72ae0f1..c683c7cc1d 100644
--- a/tp/t/results/conditionals/end_ifset_in_format.pl
+++ b/tp/t/results/conditionals/end_ifset_in_format.pl
@@ -60,8 +60,7 @@ $result_trees{'end_ifset_in_format'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 4,
-                  'macro' => ''
+                  'line_nr' => 4
                 }
               },
               'position' => 1,
@@ -120,15 +119,13 @@ $result_trees{'end_ifset_in_format'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -165,8 +162,7 @@ $result_trees{'end_ifset_in_format'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 9,
-                      'macro' => ''
+                      'line_nr' => 9
                     }
                   },
                   'position' => 5,
@@ -209,8 +205,7 @@ $result_trees{'end_ifset_in_format'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 11,
-                  'macro' => ''
+                  'line_nr' => 11
                 }
               },
               'position' => 1,
@@ -269,15 +264,13 @@ $result_trees{'end_ifset_in_format'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           },
           'source_marks' => [
             {
@@ -310,8 +303,7 @@ $result_trees{'end_ifset_in_format'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 15,
-                  'macro' => ''
+                  'line_nr' => 15
                 }
               },
               'sourcemark_type' => 'expanded_conditional_command',
@@ -348,8 +340,7 @@ $result_trees{'end_ifset_in_format'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 17,
-                  'macro' => ''
+                  'line_nr' => 17
                 }
               },
               'position' => 1,
@@ -387,8 +378,7 @@ $result_trees{'end_ifset_in_format'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -423,8 +413,7 @@ $result_trees{'end_ifset_in_format'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 21,
-                      'macro' => ''
+                      'line_nr' => 21
                     }
                   },
                   'position' => 1,
diff --git a/tp/t/results/conditionals/false_format_not_closed.pl 
b/tp/t/results/conditionals/false_format_not_closed.pl
index 23bca0f03a..7476c8e502 100644
--- a/tp/t/results/conditionals/false_format_not_closed.pl
+++ b/tp/t/results/conditionals/false_format_not_closed.pl
@@ -36,8 +36,7 @@ $result_trees{'false_format_not_closed'} = {
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -60,7 +59,6 @@ $result_errors{'false_format_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'no matching `@end html\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/conditionals/if_not_closed.pl 
b/tp/t/results/conditionals/if_not_closed.pl
index 1a0e5600fd..66e3b278bf 100644
--- a/tp/t/results/conditionals/if_not_closed.pl
+++ b/tp/t/results/conditionals/if_not_closed.pl
@@ -22,8 +22,7 @@ $result_trees{'if_not_closed'} = {
                 'cmdname' => 'iftex',
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 1,
-                  'macro' => ''
+                  'line_nr' => 1
                 }
               },
               'sourcemark_type' => 'ignored_conditional_block'
@@ -49,7 +48,6 @@ $result_errors{'if_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'no matching `@end iftex\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/conditionals/ifclear_in_ifset.pl 
b/tp/t/results/conditionals/ifclear_in_ifset.pl
index 9c5f643c96..68a23161d7 100644
--- a/tp/t/results/conditionals/ifclear_in_ifset.pl
+++ b/tp/t/results/conditionals/ifclear_in_ifset.pl
@@ -70,8 +70,7 @@ $result_trees{'ifclear_in_ifset'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 5,
-                      'macro' => ''
+                      'line_nr' => 5
                     }
                   }
                 ],
@@ -82,8 +81,7 @@ $result_trees{'ifclear_in_ifset'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 2,
-                  'macro' => ''
+                  'line_nr' => 2
                 }
               },
               'position' => 1,
diff --git a/tp/t/results/conditionals/ifclear_in_ifset_set.pl 
b/tp/t/results/conditionals/ifclear_in_ifset_set.pl
index c2b91b7a15..7d8a609eac 100644
--- a/tp/t/results/conditionals/ifclear_in_ifset_set.pl
+++ b/tp/t/results/conditionals/ifclear_in_ifset_set.pl
@@ -60,8 +60,7 @@ $result_trees{'ifclear_in_ifset_set'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 4,
-                  'macro' => ''
+                  'line_nr' => 4
                 }
               },
               'position' => 1,
@@ -104,8 +103,7 @@ $result_trees{'ifclear_in_ifset_set'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 5,
-                  'macro' => ''
+                  'line_nr' => 5
                 }
               },
               'position' => 1,
@@ -145,8 +143,7 @@ $result_trees{'ifclear_in_ifset_set'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -184,7 +181,6 @@ $result_errors{'ifclear_in_ifset_set'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'unknown @end junky',
     'type' => 'warning'
   },
@@ -193,7 +189,6 @@ $result_errors{'ifclear_in_ifset_set'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'unmatched `@end ifset\'',
     'type' => 'error'
   },
@@ -202,7 +197,6 @@ $result_errors{'ifclear_in_ifset_set'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => 'expected @end ifclear',
     'type' => 'error'
   },
@@ -211,7 +205,6 @@ $result_errors{'ifclear_in_ifset_set'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => 'expected @end ifset',
     'type' => 'error'
   }
diff --git a/tp/t/results/conditionals/ifnot_format_conditional.pl 
b/tp/t/results/conditionals/ifnot_format_conditional.pl
index d85e5e7161..a7e5b01aee 100644
--- a/tp/t/results/conditionals/ifnot_format_conditional.pl
+++ b/tp/t/results/conditionals/ifnot_format_conditional.pl
@@ -28,8 +28,7 @@ $result_trees{'ifnot_format_conditional'} = {
                 'cmdname' => 'ifnottex',
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 1,
-                  'macro' => ''
+                  'line_nr' => 1
                 }
               },
               'sourcemark_type' => 'expanded_conditional_command',
@@ -72,8 +71,7 @@ $result_trees{'ifnot_format_conditional'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 3,
-                      'macro' => ''
+                      'line_nr' => 3
                     }
                   },
                   'position' => 8,
diff --git a/tp/t/results/conditionals/ifnotinfo_exception.pl 
b/tp/t/results/conditionals/ifnotinfo_exception.pl
index 7d885fc6cf..dde9727f3a 100644
--- a/tp/t/results/conditionals/ifnotinfo_exception.pl
+++ b/tp/t/results/conditionals/ifnotinfo_exception.pl
@@ -60,15 +60,13 @@ $result_trees{'ifnotinfo_exception'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 3,
-                      'macro' => ''
+                      'line_nr' => 3
                     }
                   }
                 ],
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 1,
-                  'macro' => ''
+                  'line_nr' => 1
                 }
               },
               'sourcemark_type' => 'ignored_conditional_block'
diff --git a/tp/t/results/conditionals/ifset_in_command.pl 
b/tp/t/results/conditionals/ifset_in_command.pl
index a9dc978c96..5cf7568a2a 100644
--- a/tp/t/results/conditionals/ifset_in_command.pl
+++ b/tp/t/results/conditionals/ifset_in_command.pl
@@ -76,8 +76,7 @@ $result_trees{'ifset_in_command'} = {
                                 },
                                 'source_info' => {
                                   'file_name' => '',
-                                  'line_nr' => 5,
-                                  'macro' => ''
+                                  'line_nr' => 5
                                 }
                               }
                             ],
@@ -88,8 +87,7 @@ $result_trees{'ifset_in_command'} = {
                             },
                             'source_info' => {
                               'file_name' => '',
-                              'line_nr' => 3,
-                              'macro' => ''
+                              'line_nr' => 3
                             }
                           },
                           'position' => 1,
@@ -122,8 +120,7 @@ $result_trees{'ifset_in_command'} = {
                             },
                             'source_info' => {
                               'file_name' => '',
-                              'line_nr' => 6,
-                              'macro' => ''
+                              'line_nr' => 6
                             }
                           },
                           'position' => 1,
@@ -166,8 +163,7 @@ $result_trees{'ifset_in_command'} = {
                             },
                             'source_info' => {
                               'file_name' => '',
-                              'line_nr' => 8,
-                              'macro' => ''
+                              'line_nr' => 8
                             }
                           },
                           'position' => 7,
@@ -185,8 +181,7 @@ $result_trees{'ifset_in_command'} = {
               'cmdname' => 'file',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
diff --git a/tp/t/results/conditionals/ifset_nonalpha.pl 
b/tp/t/results/conditionals/ifset_nonalpha.pl
index bd598819a2..e54e1b7f79 100644
--- a/tp/t/results/conditionals/ifset_nonalpha.pl
+++ b/tp/t/results/conditionals/ifset_nonalpha.pl
@@ -60,8 +60,7 @@ $result_trees{'ifset_nonalpha'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 2,
-                      'macro' => ''
+                      'line_nr' => 2
                     }
                   }
                 ],
@@ -72,8 +71,7 @@ $result_trees{'ifset_nonalpha'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 1,
-                  'macro' => ''
+                  'line_nr' => 1
                 }
               },
               'sourcemark_type' => 'ignored_conditional_block'
diff --git a/tp/t/results/conditionals/ignore_not_closed.pl 
b/tp/t/results/conditionals/ignore_not_closed.pl
index 5d7e764d6b..819d8743c9 100644
--- a/tp/t/results/conditionals/ignore_not_closed.pl
+++ b/tp/t/results/conditionals/ignore_not_closed.pl
@@ -36,8 +36,7 @@ $result_trees{'ignore_not_closed'} = {
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -61,7 +60,6 @@ $result_errors{'ignore_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'no matching `@end ignore\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/conditionals/ignore_spaces_and_comments.pl 
b/tp/t/results/conditionals/ignore_spaces_and_comments.pl
index 32196d62df..fdb24639d9 100644
--- a/tp/t/results/conditionals/ignore_spaces_and_comments.pl
+++ b/tp/t/results/conditionals/ignore_spaces_and_comments.pl
@@ -56,15 +56,13 @@ $result_trees{'ignore_spaces_and_comments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -119,15 +117,13 @@ $result_trees{'ignore_spaces_and_comments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -188,15 +184,13 @@ $result_trees{'ignore_spaces_and_comments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -257,8 +251,7 @@ $result_trees{'ignore_spaces_and_comments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
@@ -269,8 +262,7 @@ $result_trees{'ignore_spaces_and_comments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -331,8 +323,7 @@ $result_trees{'ignore_spaces_and_comments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             }
           ],
@@ -343,8 +334,7 @@ $result_trees{'ignore_spaces_and_comments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         }
       ],
diff --git a/tp/t/results/conditionals/ignored_in_ifset.pl 
b/tp/t/results/conditionals/ignored_in_ifset.pl
index 7240c795a0..42601258d6 100644
--- a/tp/t/results/conditionals/ignored_in_ifset.pl
+++ b/tp/t/results/conditionals/ignored_in_ifset.pl
@@ -65,8 +65,7 @@ $result_trees{'ignored_in_ifset'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 4,
-                      'macro' => ''
+                      'line_nr' => 4
                     }
                   }
                 ],
@@ -77,8 +76,7 @@ $result_trees{'ignored_in_ifset'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 2,
-                  'macro' => ''
+                  'line_nr' => 2
                 }
               },
               'position' => 1,
@@ -154,8 +152,7 @@ $result_trees{'ignored_in_ifset'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 11,
-                      'macro' => ''
+                      'line_nr' => 11
                     }
                   }
                 ],
@@ -166,8 +163,7 @@ $result_trees{'ignored_in_ifset'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 9,
-                  'macro' => ''
+                  'line_nr' => 9
                 }
               },
               'position' => 1,
@@ -234,8 +230,7 @@ $result_trees{'ignored_in_ifset'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 17,
-                      'macro' => ''
+                      'line_nr' => 17
                     }
                   }
                 ],
@@ -246,8 +241,7 @@ $result_trees{'ignored_in_ifset'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 15,
-                  'macro' => ''
+                  'line_nr' => 15
                 }
               },
               'position' => 1,
@@ -295,7 +289,6 @@ $result_errors{'ignored_in_ifset'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'unmatched `@end ignore\'',
     'type' => 'error'
   },
@@ -304,7 +297,6 @@ $result_errors{'ignored_in_ifset'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'unmatched `@end ifset\'',
     'type' => 'error'
   },
@@ -313,7 +305,6 @@ $result_errors{'ignored_in_ifset'} = [
 ',
     'file_name' => '',
     'line_nr' => 12,
-    'macro' => '',
     'text' => 'unmatched `@end verbatim\'',
     'type' => 'error'
   },
@@ -322,7 +313,6 @@ $result_errors{'ignored_in_ifset'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => 'unmatched `@end ifset\'',
     'type' => 'error'
   },
@@ -331,7 +321,6 @@ $result_errors{'ignored_in_ifset'} = [
 ',
     'file_name' => '',
     'line_nr' => 18,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   },
@@ -340,7 +329,6 @@ $result_errors{'ignored_in_ifset'} = [
 ',
     'file_name' => '',
     'line_nr' => 19,
-    'macro' => '',
     'text' => 'unmatched `@end ifset\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/conditionals/info_ifinfo_ifnotplaintext.pl 
b/tp/t/results/conditionals/info_ifinfo_ifnotplaintext.pl
index 9c5523ec1a..66ecbd0f0c 100644
--- a/tp/t/results/conditionals/info_ifinfo_ifnotplaintext.pl
+++ b/tp/t/results/conditionals/info_ifinfo_ifnotplaintext.pl
@@ -28,8 +28,7 @@ $result_trees{'info_ifinfo_ifnotplaintext'} = {
                 'cmdname' => 'ifinfo',
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 1,
-                  'macro' => ''
+                  'line_nr' => 1
                 }
               },
               'sourcemark_type' => 'expanded_conditional_command',
@@ -52,8 +51,7 @@ $result_trees{'info_ifinfo_ifnotplaintext'} = {
                 'cmdname' => 'ifnotplaintext',
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 2,
-                  'macro' => ''
+                  'line_nr' => 2
                 }
               },
               'sourcemark_type' => 'expanded_conditional_command',
@@ -96,8 +94,7 @@ $result_trees{'info_ifinfo_ifnotplaintext'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 4,
-                      'macro' => ''
+                      'line_nr' => 4
                     }
                   },
                   'position' => 42,
@@ -134,8 +131,7 @@ $result_trees{'info_ifinfo_ifnotplaintext'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 5,
-                      'macro' => ''
+                      'line_nr' => 5
                     }
                   },
                   'position' => 42,
diff --git a/tp/t/results/conditionals/info_ifplaintext.pl 
b/tp/t/results/conditionals/info_ifplaintext.pl
index 4f87be9f2f..f4513319dd 100644
--- a/tp/t/results/conditionals/info_ifplaintext.pl
+++ b/tp/t/results/conditionals/info_ifplaintext.pl
@@ -60,15 +60,13 @@ $result_trees{'info_ifplaintext'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 4,
-                      'macro' => ''
+                      'line_nr' => 4
                     }
                   }
                 ],
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 2,
-                  'macro' => ''
+                  'line_nr' => 2
                 }
               },
               'position' => 1,
diff --git a/tp/t/results/conditionals/inlinefmtifelse_nesting.pl 
b/tp/t/results/conditionals/inlinefmtifelse_nesting.pl
index 2a62ff60a4..91834a53e9 100644
--- a/tp/t/results/conditionals/inlinefmtifelse_nesting.pl
+++ b/tp/t/results/conditionals/inlinefmtifelse_nesting.pl
@@ -46,8 +46,7 @@ $result_trees{'inlinefmtifelse_nesting'} = {
                       'cmdname' => 'emph',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     }
                   ],
@@ -66,8 +65,7 @@ $result_trees{'inlinefmtifelse_nesting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
diff --git a/tp/t/results/conditionals/inlineiffmtifelse_not_closed.pl 
b/tp/t/results/conditionals/inlineiffmtifelse_not_closed.pl
index a4a347b2e5..c1e04d003f 100644
--- a/tp/t/results/conditionals/inlineiffmtifelse_not_closed.pl
+++ b/tp/t/results/conditionals/inlineiffmtifelse_not_closed.pl
@@ -39,8 +39,7 @@ $result_trees{'inlineiffmtifelse_not_closed'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -65,7 +64,6 @@ $result_errors{'inlineiffmtifelse_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@inlinefmtifelse missing closing brace',
     'type' => 'error'
   }
diff --git 
a/tp/t/results/conditionals/inlineiffmtifelse_not_closed_three_arg.pl 
b/tp/t/results/conditionals/inlineiffmtifelse_not_closed_three_arg.pl
index 3d5b1abae0..cb66675f71 100644
--- a/tp/t/results/conditionals/inlineiffmtifelse_not_closed_three_arg.pl
+++ b/tp/t/results/conditionals/inlineiffmtifelse_not_closed_three_arg.pl
@@ -52,8 +52,7 @@ $result_trees{'inlineiffmtifelse_not_closed_three_arg'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -79,7 +78,6 @@ $result_errors{'inlineiffmtifelse_not_closed_three_arg'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@inlinefmtifelse missing closing brace',
     'type' => 'error'
   }
diff --git a/tp/t/results/conditionals/inlineiffmtifelse_not_closed_two_arg.pl 
b/tp/t/results/conditionals/inlineiffmtifelse_not_closed_two_arg.pl
index 6412a4a7c4..7cad2a2e77 100644
--- a/tp/t/results/conditionals/inlineiffmtifelse_not_closed_two_arg.pl
+++ b/tp/t/results/conditionals/inlineiffmtifelse_not_closed_two_arg.pl
@@ -39,8 +39,7 @@ $result_trees{'inlineiffmtifelse_not_closed_two_arg'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -65,7 +64,6 @@ $result_errors{'inlineiffmtifelse_not_closed_two_arg'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@inlinefmtifelse missing closing brace',
     'type' => 'error'
   }
diff --git a/tp/t/results/conditionals/inlineifset_false_not_closed.pl 
b/tp/t/results/conditionals/inlineifset_false_not_closed.pl
index 350798b5dd..463c0c0566 100644
--- a/tp/t/results/conditionals/inlineifset_false_not_closed.pl
+++ b/tp/t/results/conditionals/inlineifset_false_not_closed.pl
@@ -38,8 +38,7 @@ $result_trees{'inlineifset_false_not_closed'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -64,7 +63,6 @@ $result_errors{'inlineifset_false_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@inlineifset missing closing brace',
     'type' => 'error'
   }
diff --git a/tp/t/results/conditionals/macro_in_ifset.pl 
b/tp/t/results/conditionals/macro_in_ifset.pl
index b01b7e0d94..818b9bd216 100644
--- a/tp/t/results/conditionals/macro_in_ifset.pl
+++ b/tp/t/results/conditionals/macro_in_ifset.pl
@@ -56,8 +56,7 @@ $result_trees{'macro_in_ifset'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -67,8 +66,7 @@ $result_trees{'macro_in_ifset'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -142,8 +140,7 @@ $result_trees{'macro_in_ifset'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 11,
-                      'macro' => ''
+                      'line_nr' => 11
                     }
                   }
                 ],
@@ -154,8 +151,7 @@ $result_trees{'macro_in_ifset'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 6,
-                  'macro' => ''
+                  'line_nr' => 6
                 }
               },
               'position' => 1,
diff --git a/tp/t/results/conditionals/macro_in_ifset_set.pl 
b/tp/t/results/conditionals/macro_in_ifset_set.pl
index a0893fbb30..762ff3a4a4 100644
--- a/tp/t/results/conditionals/macro_in_ifset_set.pl
+++ b/tp/t/results/conditionals/macro_in_ifset_set.pl
@@ -78,8 +78,7 @@ $result_trees{'macro_in_ifset_set'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -89,8 +88,7 @@ $result_trees{'macro_in_ifset_set'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -122,8 +120,7 @@ $result_trees{'macro_in_ifset_set'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 8,
-                  'macro' => ''
+                  'line_nr' => 8
                 }
               },
               'position' => 1,
@@ -190,8 +187,7 @@ $result_trees{'macro_in_ifset_set'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
@@ -201,8 +197,7 @@ $result_trees{'macro_in_ifset_set'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           },
           'source_marks' => [
             {
@@ -235,8 +230,7 @@ $result_trees{'macro_in_ifset_set'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 13,
-                  'macro' => ''
+                  'line_nr' => 13
                 }
               },
               'sourcemark_type' => 'expanded_conditional_command',
diff --git a/tp/t/results/conditionals/many_conditionals.pl 
b/tp/t/results/conditionals/many_conditionals.pl
index 1caceac23e..b38cc069ca 100644
--- a/tp/t/results/conditionals/many_conditionals.pl
+++ b/tp/t/results/conditionals/many_conditionals.pl
@@ -60,15 +60,13 @@ $result_trees{'many_conditionals'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -90,8 +88,7 @@ $result_trees{'many_conditionals'} = {
                 'cmdname' => 'ifhtml',
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 5,
-                  'macro' => ''
+                  'line_nr' => 5
                 }
               },
               'position' => 1,
@@ -137,8 +134,7 @@ $result_trees{'many_conditionals'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 7,
-                      'macro' => ''
+                      'line_nr' => 7
                     }
                   },
                   'position' => 21,
@@ -203,15 +199,13 @@ $result_trees{'many_conditionals'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 11,
-                      'macro' => ''
+                      'line_nr' => 11
                     }
                   }
                 ],
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 9,
-                  'macro' => ''
+                  'line_nr' => 9
                 }
               },
               'position' => 1,
@@ -246,8 +240,7 @@ $result_trees{'many_conditionals'} = {
                 'cmdname' => 'ifinfo',
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 14,
-                  'macro' => ''
+                  'line_nr' => 14
                 }
               },
               'position' => 1,
@@ -293,8 +286,7 @@ $result_trees{'many_conditionals'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 16,
-                      'macro' => ''
+                      'line_nr' => 16
                     }
                   },
                   'position' => 21,
@@ -359,15 +351,13 @@ $result_trees{'many_conditionals'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 20,
-                      'macro' => ''
+                      'line_nr' => 20
                     }
                   }
                 ],
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 18,
-                  'macro' => ''
+                  'line_nr' => 18
                 }
               },
               'position' => 1,
@@ -440,15 +430,13 @@ $result_trees{'many_conditionals'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           }
         },
         {
@@ -502,15 +490,13 @@ $result_trees{'many_conditionals'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 29,
-                      'macro' => ''
+                      'line_nr' => 29
                     }
                   }
                 ],
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 27,
-                  'macro' => ''
+                  'line_nr' => 27
                 }
               },
               'position' => 1,
@@ -540,8 +526,7 @@ $result_trees{'many_conditionals'} = {
                 'cmdname' => 'ifnottex',
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 31,
-                  'macro' => ''
+                  'line_nr' => 31
                 }
               },
               'position' => 1,
@@ -587,8 +572,7 @@ $result_trees{'many_conditionals'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 33,
-                      'macro' => ''
+                      'line_nr' => 33
                     }
                   },
                   'position' => 23,
diff --git a/tp/t/results/conditionals/nested_ifset_ifclear.pl 
b/tp/t/results/conditionals/nested_ifset_ifclear.pl
index 1bae9d74eb..5cb713a5ac 100644
--- a/tp/t/results/conditionals/nested_ifset_ifclear.pl
+++ b/tp/t/results/conditionals/nested_ifset_ifclear.pl
@@ -91,8 +91,7 @@ $result_trees{'nested_ifset_ifclear'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
@@ -102,8 +101,7 @@ $result_trees{'nested_ifset_ifclear'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
diff --git 
a/tp/t/results/conditionals/nested_ifset_prepended_to_command_name.pl 
b/tp/t/results/conditionals/nested_ifset_prepended_to_command_name.pl
index 5b3fd5c57c..4a53c5e1a4 100644
--- a/tp/t/results/conditionals/nested_ifset_prepended_to_command_name.pl
+++ b/tp/t/results/conditionals/nested_ifset_prepended_to_command_name.pl
@@ -70,8 +70,7 @@ $result_trees{'nested_ifset_prepended_to_command_name'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 4,
-                      'macro' => ''
+                      'line_nr' => 4
                     }
                   }
                 ],
@@ -82,8 +81,7 @@ $result_trees{'nested_ifset_prepended_to_command_name'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 1,
-                  'macro' => ''
+                  'line_nr' => 1
                 }
               },
               'sourcemark_type' => 'ignored_conditional_block'
@@ -109,7 +107,6 @@ $result_errors{'nested_ifset_prepended_to_command_name'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'unmatched `@end ifset\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/conditionals/nested_ignore.pl 
b/tp/t/results/conditionals/nested_ignore.pl
index c4e0d3def4..ca7b9c13eb 100644
--- a/tp/t/results/conditionals/nested_ignore.pl
+++ b/tp/t/results/conditionals/nested_ignore.pl
@@ -91,8 +91,7 @@ $result_trees{'nested_ignore'} = {
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -127,7 +126,6 @@ $result_errors{'nested_ignore'} = [
 ',
     'file_name' => '',
     'line_nr' => 14,
-    'macro' => '',
     'text' => 'no matching `@end ignore\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/conditionals/nested_ignore_comment_no_eol.pl 
b/tp/t/results/conditionals/nested_ignore_comment_no_eol.pl
index 8de368d38a..7b73841250 100644
--- a/tp/t/results/conditionals/nested_ignore_comment_no_eol.pl
+++ b/tp/t/results/conditionals/nested_ignore_comment_no_eol.pl
@@ -30,8 +30,7 @@ $result_trees{'nested_ignore_comment_no_eol'} = {
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -53,7 +52,6 @@ $result_errors{'nested_ignore_comment_no_eol'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'expected @end ignore',
     'type' => 'error'
   },
@@ -62,7 +60,6 @@ $result_errors{'nested_ignore_comment_no_eol'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'no matching `@end ignore\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/conditionals/nested_ignore_with_comments.pl 
b/tp/t/results/conditionals/nested_ignore_with_comments.pl
index 486e9cd88c..ee7cbd3236 100644
--- a/tp/t/results/conditionals/nested_ignore_with_comments.pl
+++ b/tp/t/results/conditionals/nested_ignore_with_comments.pl
@@ -191,15 +191,13 @@ $result_trees{'nested_ignore_with_comments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/conditionals/not_set.pl 
b/tp/t/results/conditionals/not_set.pl
index 5d0e977421..bcb18eca44 100644
--- a/tp/t/results/conditionals/not_set.pl
+++ b/tp/t/results/conditionals/not_set.pl
@@ -75,8 +75,7 @@ $result_trees{'not_set'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 5,
-                      'macro' => ''
+                      'line_nr' => 5
                     }
                   }
                 ],
@@ -87,8 +86,7 @@ $result_trees{'not_set'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 1,
-                  'macro' => ''
+                  'line_nr' => 1
                 }
               },
               'sourcemark_type' => 'ignored_conditional_block'
diff --git a/tp/t/results/conditionals/plaintext_ifinfo.pl 
b/tp/t/results/conditionals/plaintext_ifinfo.pl
index d07c6749e3..b23b741da8 100644
--- a/tp/t/results/conditionals/plaintext_ifinfo.pl
+++ b/tp/t/results/conditionals/plaintext_ifinfo.pl
@@ -28,8 +28,7 @@ $result_trees{'plaintext_ifinfo'} = {
                 'cmdname' => 'ifinfo',
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 2,
-                  'macro' => ''
+                  'line_nr' => 2
                 }
               },
               'position' => 1,
@@ -75,8 +74,7 @@ $result_trees{'plaintext_ifinfo'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 4,
-                      'macro' => ''
+                      'line_nr' => 4
                     }
                   },
                   'position' => 51,
diff --git a/tp/t/results/conditionals/plaintext_ifinfo_ifnotplaintext.pl 
b/tp/t/results/conditionals/plaintext_ifinfo_ifnotplaintext.pl
index dd8dc73f8f..2673974bd0 100644
--- a/tp/t/results/conditionals/plaintext_ifinfo_ifnotplaintext.pl
+++ b/tp/t/results/conditionals/plaintext_ifinfo_ifnotplaintext.pl
@@ -28,8 +28,7 @@ $result_trees{'plaintext_ifinfo_ifnotplaintext'} = {
                 'cmdname' => 'ifinfo',
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 1,
-                  'macro' => ''
+                  'line_nr' => 1
                 }
               },
               'sourcemark_type' => 'expanded_conditional_command',
@@ -84,15 +83,13 @@ $result_trees{'plaintext_ifinfo_ifnotplaintext'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 4,
-                      'macro' => ''
+                      'line_nr' => 4
                     }
                   }
                 ],
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 2,
-                  'macro' => ''
+                  'line_nr' => 2
                 }
               },
               'sourcemark_type' => 'ignored_conditional_block'
@@ -127,8 +124,7 @@ $result_trees{'plaintext_ifinfo_ifnotplaintext'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 5,
-                  'macro' => ''
+                  'line_nr' => 5
                 }
               },
               'sourcemark_type' => 'expanded_conditional_command',
diff --git a/tp/t/results/conditionals/superfluous_argument_to_end.pl 
b/tp/t/results/conditionals/superfluous_argument_to_end.pl
index 51c408a5b6..30ac9a5b4c 100644
--- a/tp/t/results/conditionals/superfluous_argument_to_end.pl
+++ b/tp/t/results/conditionals/superfluous_argument_to_end.pl
@@ -28,8 +28,7 @@ $result_trees{'superfluous_argument_to_end'} = {
                 'cmdname' => 'ifnothtml',
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 1,
-                  'macro' => ''
+                  'line_nr' => 1
                 }
               },
               'sourcemark_type' => 'expanded_conditional_command',
@@ -72,8 +71,7 @@ $result_trees{'superfluous_argument_to_end'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 3,
-                      'macro' => ''
+                      'line_nr' => 3
                     }
                   },
                   'position' => 9,
@@ -107,7 +105,6 @@ $result_errors{'superfluous_argument_to_end'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'bad argument to @end: ifnothtml superfluous',
     'type' => 'error'
   }
diff --git a/tp/t/results/conditionals/text_on_conditional_line.pl 
b/tp/t/results/conditionals/text_on_conditional_line.pl
index 00b3ea1199..c8695749ba 100644
--- a/tp/t/results/conditionals/text_on_conditional_line.pl
+++ b/tp/t/results/conditionals/text_on_conditional_line.pl
@@ -65,8 +65,7 @@ $result_trees{'text_on_conditional_line'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 3,
-                      'macro' => ''
+                      'line_nr' => 3
                     }
                   }
                 ],
@@ -77,8 +76,7 @@ $result_trees{'text_on_conditional_line'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 1,
-                  'macro' => ''
+                  'line_nr' => 1
                 }
               },
               'sourcemark_type' => 'ignored_conditional_block'
@@ -104,7 +102,6 @@ $result_errors{'text_on_conditional_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'unexpected argument on @ifnothtml line: text following 
ifnothtml,',
     'type' => 'warning'
   }
diff --git a/tp/t/results/conditionals/text_on_conditional_line_expanded.pl 
b/tp/t/results/conditionals/text_on_conditional_line_expanded.pl
index 53e4dfce16..ede43fd0bd 100644
--- a/tp/t/results/conditionals/text_on_conditional_line_expanded.pl
+++ b/tp/t/results/conditionals/text_on_conditional_line_expanded.pl
@@ -38,8 +38,7 @@ $result_trees{'text_on_conditional_line_expanded'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 1,
-                  'macro' => ''
+                  'line_nr' => 1
                 }
               },
               'sourcemark_type' => 'expanded_conditional_command',
@@ -82,8 +81,7 @@ $result_trees{'text_on_conditional_line_expanded'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 3,
-                      'macro' => ''
+                      'line_nr' => 3
                     }
                   },
                   'position' => 2,
@@ -117,7 +115,6 @@ $result_errors{'text_on_conditional_line_expanded'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'unexpected argument on @ifnothtml line: text following 
ifnothtml,',
     'type' => 'warning'
   }
diff --git a/tp/t/results/conditionals/txiinternalvalue.pl 
b/tp/t/results/conditionals/txiinternalvalue.pl
index afa1de04cc..53a54cd420 100644
--- a/tp/t/results/conditionals/txiinternalvalue.pl
+++ b/tp/t/results/conditionals/txiinternalvalue.pl
@@ -34,7 +34,6 @@ $result_errors{'txiinternalvalue'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'unknown command `txiinternalvalue\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/conditionals/user_defined_txiinternalvalue.pl 
b/tp/t/results/conditionals/user_defined_txiinternalvalue.pl
index 5437e0106e..82a8e443a4 100644
--- a/tp/t/results/conditionals/user_defined_txiinternalvalue.pl
+++ b/tp/t/results/conditionals/user_defined_txiinternalvalue.pl
@@ -51,8 +51,7 @@ $result_trees{'user_defined_txiinternalvalue'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'user_defined_txiinternalvalue'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/converters_tests/accent_with_text.pl 
b/tp/t/results/converters_tests/accent_with_text.pl
index dc935a84d5..fb8a0aa2bd 100644
--- a/tp/t/results/converters_tests/accent_with_text.pl
+++ b/tp/t/results/converters_tests/accent_with_text.pl
@@ -25,8 +25,7 @@ $result_trees{'accent_with_text'} = {
               'cmdname' => 'u',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -46,8 +45,7 @@ $result_trees{'accent_with_text'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -74,8 +72,7 @@ $result_trees{'accent_with_text'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     }
                   ],
@@ -85,8 +82,7 @@ $result_trees{'accent_with_text'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -113,8 +109,7 @@ $result_trees{'accent_with_text'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     }
                   ],
@@ -124,8 +119,7 @@ $result_trees{'accent_with_text'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -145,8 +139,7 @@ $result_trees{'accent_with_text'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -176,7 +169,6 @@ $result_errors{'accent_with_text'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@dotless expects `i\' or `j\' as argument, not `--b\'',
     'type' => 'error'
   }
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 0c4907d920..f1550b4281 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -39,8 +39,7 @@ $result_trees{'at_commands_in_raw'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -109,8 +108,7 @@ $result_trees{'at_commands_in_raw'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -120,8 +118,7 @@ $result_trees{'at_commands_in_raw'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -138,8 +135,7 @@ $result_trees{'at_commands_in_raw'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -172,8 +168,7 @@ $result_trees{'at_commands_in_raw'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -238,8 +233,7 @@ $result_trees{'at_commands_in_raw'} = {
                   'cmdname' => 'footnote',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 12,
-                    'macro' => ''
+                    'line_nr' => 12
                   }
                 },
                 {
@@ -264,8 +258,7 @@ $result_trees{'at_commands_in_raw'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 13,
-                    'macro' => ''
+                    'line_nr' => 13
                   }
                 },
                 {
@@ -304,15 +297,13 @@ $result_trees{'at_commands_in_raw'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -331,8 +322,7 @@ $result_trees{'at_commands_in_raw'} = {
               'cmdname' => 'kbd',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -354,8 +344,7 @@ $result_trees{'at_commands_in_raw'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -632,15 +621,13 @@ $result_trees{'at_commands_in_raw'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -701,8 +688,7 @@ $result_trees{'at_commands_in_raw'} = {
               'cmdname' => 'kbd',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 67,
-                'macro' => ''
+                'line_nr' => 67
               }
             },
             {
@@ -741,8 +727,7 @@ $result_trees{'at_commands_in_raw'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 69,
-                'macro' => ''
+                'line_nr' => 69
               }
             },
             {
@@ -781,8 +766,7 @@ $result_trees{'at_commands_in_raw'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             },
             {
@@ -822,8 +806,7 @@ $result_trees{'at_commands_in_raw'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 72,
-                'macro' => ''
+                'line_nr' => 72
               },
               'type' => 'index_entry_command'
             }
@@ -883,8 +866,7 @@ $result_trees{'at_commands_in_raw'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 76,
-            'macro' => ''
+            'line_nr' => 76
           }
         },
         {
@@ -917,8 +899,7 @@ $result_trees{'at_commands_in_raw'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 77,
-            'macro' => ''
+            'line_nr' => 77
           }
         },
         {
@@ -954,8 +935,7 @@ $result_trees{'at_commands_in_raw'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 79,
-            'macro' => ''
+            'line_nr' => 79
           }
         },
         {
@@ -979,8 +959,7 @@ $result_trees{'at_commands_in_raw'} = {
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 81,
-                'macro' => ''
+                'line_nr' => 81
               }
             },
             {
@@ -1087,8 +1066,7 @@ $result_trees{'at_commands_in_raw'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     }
   ],
@@ -1332,7 +1310,6 @@ $result_errors{'at_commands_in_raw'} = [
 ',
     'file_name' => '',
     'line_nr' => 65,
-    'macro' => '',
     'text' => 'undefined flag: flag',
     'type' => 'warning'
   },
@@ -1341,7 +1318,6 @@ $result_errors{'at_commands_in_raw'} = [
 ',
     'file_name' => '',
     'line_nr' => 74,
-    'macro' => '',
     'text' => 'unknown command `newindex\'',
     'type' => 'error'
   },
@@ -1350,7 +1326,6 @@ $result_errors{'at_commands_in_raw'} = [
 ',
     'file_name' => '',
     'line_nr' => 83,
-    'macro' => '',
     'text' => 'unknown command `a\'',
     'type' => 'error'
   },
@@ -1359,7 +1334,6 @@ $result_errors{'at_commands_in_raw'} = [
 ',
     'file_name' => '',
     'line_nr' => 83,
-    'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
   },
@@ -1368,7 +1342,6 @@ $result_errors{'at_commands_in_raw'} = [
 ',
     'file_name' => '',
     'line_nr' => 83,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   },
@@ -1377,7 +1350,6 @@ $result_errors{'at_commands_in_raw'} = [
 ',
     'file_name' => '',
     'line_nr' => 85,
-    'macro' => '',
     'text' => 'unknown command `moviecite\'',
     'type' => 'error'
   },
@@ -1386,7 +1358,6 @@ $result_errors{'at_commands_in_raw'} = [
 ',
     'file_name' => '',
     'line_nr' => 85,
-    'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
   },
@@ -1395,7 +1366,6 @@ $result_errors{'at_commands_in_raw'} = [
 ',
     'file_name' => '',
     'line_nr' => 85,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   },
@@ -1404,7 +1374,6 @@ $result_errors{'at_commands_in_raw'} = [
 ',
     'file_name' => '',
     'line_nr' => 89,
-    'macro' => '',
     'text' => 'unknown command `mymacro\'',
     'type' => 'error'
   },
@@ -1413,7 +1382,6 @@ $result_errors{'at_commands_in_raw'} = [
 ',
     'file_name' => '',
     'line_nr' => 89,
-    'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
   },
@@ -1422,7 +1390,6 @@ $result_errors{'at_commands_in_raw'} = [
 ',
     'file_name' => '',
     'line_nr' => 89,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   },
@@ -1431,7 +1398,6 @@ $result_errors{'at_commands_in_raw'} = [
 ',
     'file_name' => '',
     'line_nr' => 89,
-    'macro' => '',
     'text' => 'unknown command `macroarg\'',
     'type' => 'error'
   },
@@ -1440,7 +1406,6 @@ $result_errors{'at_commands_in_raw'} = [
 ',
     'file_name' => '',
     'line_nr' => 89,
-    'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
   },
@@ -1449,7 +1414,6 @@ $result_errors{'at_commands_in_raw'} = [
 ',
     'file_name' => '',
     'line_nr' => 89,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   },
@@ -1458,7 +1422,6 @@ $result_errors{'at_commands_in_raw'} = [
 ',
     'file_name' => '',
     'line_nr' => 71,
-    'macro' => '',
     'text' => '@ref reference to nonexistent node `anchor in tex\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/converters_tests/combined_fonts.pl 
b/tp/t/results/converters_tests/combined_fonts.pl
index 018672b4d0..2e3eebe3f1 100644
--- a/tp/t/results/converters_tests/combined_fonts.pl
+++ b/tp/t/results/converters_tests/combined_fonts.pl
@@ -39,8 +39,7 @@ $result_trees{'combined_fonts'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -83,8 +82,7 @@ $result_trees{'combined_fonts'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -120,8 +118,7 @@ $result_trees{'combined_fonts'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -153,8 +150,7 @@ $result_trees{'combined_fonts'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -197,8 +193,7 @@ $result_trees{'combined_fonts'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -218,8 +213,7 @@ $result_trees{'combined_fonts'} = {
               'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -239,8 +233,7 @@ $result_trees{'combined_fonts'} = {
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -260,8 +253,7 @@ $result_trees{'combined_fonts'} = {
               'cmdname' => 'strong',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -281,8 +273,7 @@ $result_trees{'combined_fonts'} = {
               'cmdname' => 'kbd',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -302,8 +293,7 @@ $result_trees{'combined_fonts'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -338,8 +328,7 @@ $result_trees{'combined_fonts'} = {
                       'cmdname' => 'dfn',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     }
                   ],
@@ -349,8 +338,7 @@ $result_trees{'combined_fonts'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -375,8 +363,7 @@ $result_trees{'combined_fonts'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     }
                   ],
@@ -386,8 +373,7 @@ $result_trees{'combined_fonts'} = {
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -412,8 +398,7 @@ $result_trees{'combined_fonts'} = {
                       'cmdname' => 'var',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     }
                   ],
@@ -423,8 +408,7 @@ $result_trees{'combined_fonts'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -449,8 +433,7 @@ $result_trees{'combined_fonts'} = {
                       'cmdname' => 'kbd',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     }
                   ],
@@ -460,8 +443,7 @@ $result_trees{'combined_fonts'} = {
               'cmdname' => 'strong',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -486,8 +468,7 @@ $result_trees{'combined_fonts'} = {
                       'cmdname' => 'strong',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     }
                   ],
@@ -497,8 +478,7 @@ $result_trees{'combined_fonts'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -523,8 +503,7 @@ $result_trees{'combined_fonts'} = {
                       'cmdname' => 'samp',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     }
                   ],
@@ -534,8 +513,7 @@ $result_trees{'combined_fonts'} = {
               'cmdname' => 'strong',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -566,8 +544,7 @@ $result_trees{'combined_fonts'} = {
               'cmdname' => 'cite',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -602,8 +579,7 @@ $result_trees{'combined_fonts'} = {
                       'cmdname' => 'cite',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     }
                   ],
@@ -613,8 +589,7 @@ $result_trees{'combined_fonts'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -639,8 +614,7 @@ $result_trees{'combined_fonts'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 21,
-                        'macro' => ''
+                        'line_nr' => 21
                       }
                     }
                   ],
@@ -650,8 +624,7 @@ $result_trees{'combined_fonts'} = {
               'cmdname' => 'cite',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -682,8 +655,7 @@ $result_trees{'combined_fonts'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -703,8 +675,7 @@ $result_trees{'combined_fonts'} = {
               'cmdname' => 'slanted',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -724,8 +695,7 @@ $result_trees{'combined_fonts'} = {
               'cmdname' => 'b',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -745,8 +715,7 @@ $result_trees{'combined_fonts'} = {
               'cmdname' => 't',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -781,8 +750,7 @@ $result_trees{'combined_fonts'} = {
                       'cmdname' => 'slanted',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 25,
-                        'macro' => ''
+                        'line_nr' => 25
                       }
                     }
                   ],
@@ -792,8 +760,7 @@ $result_trees{'combined_fonts'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               }
             },
             {
@@ -818,8 +785,7 @@ $result_trees{'combined_fonts'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 26,
-                        'macro' => ''
+                        'line_nr' => 26
                       }
                     }
                   ],
@@ -829,8 +795,7 @@ $result_trees{'combined_fonts'} = {
               'cmdname' => 'slanted',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             },
             {
@@ -855,8 +820,7 @@ $result_trees{'combined_fonts'} = {
                       'cmdname' => 'slanted',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 27,
-                        'macro' => ''
+                        'line_nr' => 27
                       }
                     }
                   ],
@@ -866,8 +830,7 @@ $result_trees{'combined_fonts'} = {
               'cmdname' => 'b',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             },
             {
@@ -892,8 +855,7 @@ $result_trees{'combined_fonts'} = {
                       'cmdname' => 'b',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       }
                     }
                   ],
@@ -903,8 +865,7 @@ $result_trees{'combined_fonts'} = {
               'cmdname' => 'slanted',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             },
             {
@@ -929,8 +890,7 @@ $result_trees{'combined_fonts'} = {
                       'cmdname' => 'slanted',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 29,
-                        'macro' => ''
+                        'line_nr' => 29
                       }
                     }
                   ],
@@ -940,8 +900,7 @@ $result_trees{'combined_fonts'} = {
               'cmdname' => 't',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             },
             {
@@ -966,8 +925,7 @@ $result_trees{'combined_fonts'} = {
                       'cmdname' => 't',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 30,
-                        'macro' => ''
+                        'line_nr' => 30
                       }
                     }
                   ],
@@ -977,8 +935,7 @@ $result_trees{'combined_fonts'} = {
               'cmdname' => 'slanted',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -1003,8 +960,7 @@ $result_trees{'combined_fonts'} = {
                       'cmdname' => 'var',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 31,
-                        'macro' => ''
+                        'line_nr' => 31
                       }
                     }
                   ],
@@ -1014,8 +970,7 @@ $result_trees{'combined_fonts'} = {
               'cmdname' => 't',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               }
             },
             {
@@ -1040,8 +995,7 @@ $result_trees{'combined_fonts'} = {
                       'cmdname' => 't',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 32,
-                        'macro' => ''
+                        'line_nr' => 32
                       }
                     }
                   ],
@@ -1051,8 +1005,7 @@ $result_trees{'combined_fonts'} = {
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               }
             },
             {
@@ -1097,8 +1050,7 @@ $result_trees{'combined_fonts'} = {
                   'cmdname' => 'var',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 35,
-                    'macro' => ''
+                    'line_nr' => 35
                   }
                 },
                 {
@@ -1119,8 +1071,7 @@ $result_trees{'combined_fonts'} = {
                   'cmdname' => 'cite',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 36,
-                    'macro' => ''
+                    'line_nr' => 36
                   }
                 },
                 {
@@ -1158,15 +1109,13 @@ $result_trees{'combined_fonts'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 37,
-                'macro' => ''
+                'line_nr' => 37
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 34,
-            'macro' => ''
+            'line_nr' => 34
           }
         }
       ],
@@ -1180,8 +1129,7 @@ $result_trees{'combined_fonts'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     }
   ],
diff --git a/tp/t/results/converters_tests/commands_in_sc.pl 
b/tp/t/results/converters_tests/commands_in_sc.pl
index 49a14f6e67..72625bb440 100644
--- a/tp/t/results/converters_tests/commands_in_sc.pl
+++ b/tp/t/results/converters_tests/commands_in_sc.pl
@@ -39,8 +39,7 @@ $result_trees{'commands_in_sc'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -76,8 +75,7 @@ $result_trees{'commands_in_sc'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -109,8 +107,7 @@ $result_trees{'commands_in_sc'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -160,8 +157,7 @@ $result_trees{'commands_in_sc'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     },
                     {
@@ -176,8 +172,7 @@ $result_trees{'commands_in_sc'} = {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     },
                     {
@@ -192,8 +187,7 @@ $result_trees{'commands_in_sc'} = {
                       'cmdname' => 'TeX',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     },
                     {
@@ -216,8 +210,7 @@ $result_trees{'commands_in_sc'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     },
                     {
@@ -245,8 +238,7 @@ $result_trees{'commands_in_sc'} = {
                       'cmdname' => 'ref',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     },
                     {
@@ -287,8 +279,7 @@ $result_trees{'commands_in_sc'} = {
                       'cmdname' => 'xref',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     },
                     {
@@ -335,8 +326,7 @@ $result_trees{'commands_in_sc'} = {
                       'cmdname' => 'ref',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     },
                     {
@@ -381,8 +371,7 @@ $result_trees{'commands_in_sc'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 8,
-                                'macro' => ''
+                                'line_nr' => 8
                               }
                             }
                           ],
@@ -396,8 +385,7 @@ $result_trees{'commands_in_sc'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     },
                     {
@@ -421,8 +409,7 @@ $result_trees{'commands_in_sc'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     },
                     {
@@ -443,8 +430,7 @@ $result_trees{'commands_in_sc'} = {
                       'cmdname' => 'hyphenation',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     },
                     {
@@ -466,8 +452,7 @@ $result_trees{'commands_in_sc'} = {
                       'cmdname' => 'U',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -487,8 +472,7 @@ $result_trees{'commands_in_sc'} = {
                       'cmdname' => 'math',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -513,8 +497,7 @@ $result_trees{'commands_in_sc'} = {
                       'cmdname' => 'footnote',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -534,8 +517,7 @@ $result_trees{'commands_in_sc'} = {
                       'cmdname' => 'url',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -563,8 +545,7 @@ $result_trees{'commands_in_sc'} = {
                       'cmdname' => 'url',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -592,8 +573,7 @@ $result_trees{'commands_in_sc'} = {
                       'cmdname' => 'url',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -620,8 +600,7 @@ $result_trees{'commands_in_sc'} = {
                       'cmdname' => 'url',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     },
                     {
@@ -660,8 +639,7 @@ $result_trees{'commands_in_sc'} = {
                       'cmdname' => 'email',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     },
                     {
@@ -694,8 +672,7 @@ $result_trees{'commands_in_sc'} = {
                       'cmdname' => 'abbr',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     }
                   ],
@@ -705,8 +682,7 @@ $result_trees{'commands_in_sc'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -723,8 +699,7 @@ $result_trees{'commands_in_sc'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
@@ -881,7 +856,6 @@ $result_converted_errors{'plaintext'}->{'commands_in_sc'} = 
[
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'could not find @image file `myimage.txt\' nor alternate text',
     'type' => 'warning'
   }
@@ -922,7 +896,6 @@ $result_converted_errors{'html_text'}->{'commands_in_sc'} = 
[
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '@image file `myimage\' (for HTML) not found, using 
`myimage.jpg\'',
     'type' => 'warning'
   }
@@ -958,7 +931,6 @@ $result_converted_errors{'docbook'}->{'commands_in_sc'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '@image file `myimage\' not found, using `myimage.jpg\'',
     'type' => 'warning'
   }
@@ -981,7 +953,6 @@ $result_converted_errors{'latex_text'}->{'commands_in_sc'} 
= [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '@image file `myimage\' (for LaTeX) not found',
     'type' => 'warning'
   }
@@ -1036,7 +1007,6 @@ $result_converted_errors{'info'}->{'commands_in_sc'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'could not find @image file `myimage.txt\' nor alternate text',
     'type' => 'warning'
   }
diff --git a/tp/t/results/converters_tests/commands_in_settitle_with_title.pl 
b/tp/t/results/converters_tests/commands_in_settitle_with_title.pl
index c93eadee43..1fa0a46d7a 100644
--- a/tp/t/results/converters_tests/commands_in_settitle_with_title.pl
+++ b/tp/t/results/converters_tests/commands_in_settitle_with_title.pl
@@ -34,8 +34,7 @@ $result_trees{'commands_in_settitle_with_title'} = {
                           'cmdname' => '~',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 1,
-                            'macro' => ''
+                            'line_nr' => 1
                           }
                         },
                         {
@@ -50,8 +49,7 @@ $result_trees{'commands_in_settitle_with_title'} = {
                           'cmdname' => 'aa',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 1,
-                            'macro' => ''
+                            'line_nr' => 1
                           }
                         },
                         {
@@ -66,8 +64,7 @@ $result_trees{'commands_in_settitle_with_title'} = {
                           'cmdname' => 'TeX',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 1,
-                            'macro' => ''
+                            'line_nr' => 1
                           }
                         }
                       ],
@@ -77,8 +74,7 @@ $result_trees{'commands_in_settitle_with_title'} = {
                   'cmdname' => 'sc',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -98,8 +94,7 @@ $result_trees{'commands_in_settitle_with_title'} = {
                   'cmdname' => '"',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -123,8 +118,7 @@ $result_trees{'commands_in_settitle_with_title'} = {
                           'cmdname' => 'dotless',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 1,
-                            'macro' => ''
+                            'line_nr' => 1
                           }
                         }
                       ],
@@ -134,8 +128,7 @@ $result_trees{'commands_in_settitle_with_title'} = {
                   'cmdname' => '"',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -159,8 +152,7 @@ $result_trees{'commands_in_settitle_with_title'} = {
                           'cmdname' => '=',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 1,
-                            'macro' => ''
+                            'line_nr' => 1
                           }
                         }
                       ],
@@ -170,8 +162,7 @@ $result_trees{'commands_in_settitle_with_title'} = {
                   'cmdname' => '`',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -186,8 +177,7 @@ $result_trees{'commands_in_settitle_with_title'} = {
                   'cmdname' => 'l',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -211,8 +201,7 @@ $result_trees{'commands_in_settitle_with_title'} = {
                           'cmdname' => '\'',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 1,
-                            'macro' => ''
+                            'line_nr' => 1
                           }
                         }
                       ],
@@ -222,8 +211,7 @@ $result_trees{'commands_in_settitle_with_title'} = {
                   'cmdname' => ',',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -238,8 +226,7 @@ $result_trees{'commands_in_settitle_with_title'} = {
                   'cmdname' => 'exclamdown',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 }
               ],
@@ -260,8 +247,7 @@ $result_trees{'commands_in_settitle_with_title'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -301,8 +287,7 @@ $result_trees{'commands_in_settitle_with_title'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -338,8 +323,7 @@ $result_trees{'commands_in_settitle_with_title'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -371,8 +355,7 @@ $result_trees{'commands_in_settitle_with_title'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -424,8 +407,7 @@ $result_trees{'commands_in_settitle_with_title'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     }
   ],
diff --git a/tp/t/results/converters_tests/commands_in_var.pl 
b/tp/t/results/converters_tests/commands_in_var.pl
index 35b9de960b..8ac0416828 100644
--- a/tp/t/results/converters_tests/commands_in_var.pl
+++ b/tp/t/results/converters_tests/commands_in_var.pl
@@ -39,8 +39,7 @@ $result_trees{'commands_in_var'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -76,8 +75,7 @@ $result_trees{'commands_in_var'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -109,8 +107,7 @@ $result_trees{'commands_in_var'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -160,8 +157,7 @@ $result_trees{'commands_in_var'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     },
                     {
@@ -176,8 +172,7 @@ $result_trees{'commands_in_var'} = {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     },
                     {
@@ -192,8 +187,7 @@ $result_trees{'commands_in_var'} = {
                       'cmdname' => 'TeX',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     },
                     {
@@ -216,8 +210,7 @@ $result_trees{'commands_in_var'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     },
                     {
@@ -245,8 +238,7 @@ $result_trees{'commands_in_var'} = {
                       'cmdname' => 'ref',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     },
                     {
@@ -287,8 +279,7 @@ $result_trees{'commands_in_var'} = {
                       'cmdname' => 'xref',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     },
                     {
@@ -335,8 +326,7 @@ $result_trees{'commands_in_var'} = {
                       'cmdname' => 'ref',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     },
                     {
@@ -381,8 +371,7 @@ $result_trees{'commands_in_var'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 8,
-                                'macro' => ''
+                                'line_nr' => 8
                               }
                             }
                           ],
@@ -396,8 +385,7 @@ $result_trees{'commands_in_var'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     },
                     {
@@ -421,8 +409,7 @@ $result_trees{'commands_in_var'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     },
                     {
@@ -443,8 +430,7 @@ $result_trees{'commands_in_var'} = {
                       'cmdname' => 'hyphenation',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     },
                     {
@@ -466,8 +452,7 @@ $result_trees{'commands_in_var'} = {
                       'cmdname' => 'U',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -487,8 +472,7 @@ $result_trees{'commands_in_var'} = {
                       'cmdname' => 'math',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -513,8 +497,7 @@ $result_trees{'commands_in_var'} = {
                       'cmdname' => 'footnote',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -534,8 +517,7 @@ $result_trees{'commands_in_var'} = {
                       'cmdname' => 'url',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -563,8 +545,7 @@ $result_trees{'commands_in_var'} = {
                       'cmdname' => 'url',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -592,8 +573,7 @@ $result_trees{'commands_in_var'} = {
                       'cmdname' => 'url',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -620,8 +600,7 @@ $result_trees{'commands_in_var'} = {
                       'cmdname' => 'url',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     },
                     {
@@ -660,8 +639,7 @@ $result_trees{'commands_in_var'} = {
                       'cmdname' => 'email',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     },
                     {
@@ -694,8 +672,7 @@ $result_trees{'commands_in_var'} = {
                       'cmdname' => 'abbr',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     }
                   ],
@@ -705,8 +682,7 @@ $result_trees{'commands_in_var'} = {
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -723,8 +699,7 @@ $result_trees{'commands_in_var'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
@@ -881,7 +856,6 @@ $result_converted_errors{'plaintext'}->{'commands_in_var'} 
= [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'could not find @image file `myimage.txt\' nor alternate text',
     'type' => 'warning'
   }
@@ -922,7 +896,6 @@ $result_converted_errors{'html_text'}->{'commands_in_var'} 
= [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '@image file `myimage\' (for HTML) not found, using 
`myimage.jpg\'',
     'type' => 'warning'
   }
@@ -958,7 +931,6 @@ $result_converted_errors{'docbook'}->{'commands_in_var'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '@image file `myimage\' not found, using `myimage.jpg\'',
     'type' => 'warning'
   }
@@ -981,7 +953,6 @@ $result_converted_errors{'latex_text'}->{'commands_in_var'} 
= [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '@image file `myimage\' (for LaTeX) not found',
     'type' => 'warning'
   }
diff --git a/tp/t/results/converters_tests/complex_nestings.pl 
b/tp/t/results/converters_tests/complex_nestings.pl
index 2b828011cd..6d6eddab72 100644
--- a/tp/t/results/converters_tests/complex_nestings.pl
+++ b/tp/t/results/converters_tests/complex_nestings.pl
@@ -39,8 +39,7 @@ $result_trees{'complex_nestings'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -76,8 +75,7 @@ $result_trees{'complex_nestings'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -109,8 +107,7 @@ $result_trees{'complex_nestings'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -196,8 +193,7 @@ $result_trees{'complex_nestings'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 9,
-                            'macro' => ''
+                            'line_nr' => 9
                           },
                           'type' => 'bracketed_arg'
                         },
@@ -238,8 +234,7 @@ $result_trees{'complex_nestings'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 9,
-                            'macro' => ''
+                            'line_nr' => 9
                           }
                         },
                         {
@@ -261,8 +256,7 @@ $result_trees{'complex_nestings'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 9,
-                            'macro' => ''
+                            'line_nr' => 9
                           }
                         }
                       ],
@@ -287,8 +281,7 @@ $result_trees{'complex_nestings'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   },
                   'type' => 'def_line'
                 },
@@ -325,8 +318,7 @@ $result_trees{'complex_nestings'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 10,
-                            'macro' => ''
+                            'line_nr' => 10
                           },
                           'type' => 'bracketed_arg'
                         },
@@ -384,8 +376,7 @@ $result_trees{'complex_nestings'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   },
                   'type' => 'def_line'
                 },
@@ -409,8 +400,7 @@ $result_trees{'complex_nestings'} = {
                                   },
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 11,
-                                    'macro' => ''
+                                    'line_nr' => 11
                                   },
                                   'type' => 'bracketed_arg'
                                 },
@@ -432,8 +422,7 @@ $result_trees{'complex_nestings'} = {
                                   },
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 11,
-                                    'macro' => ''
+                                    'line_nr' => 11
                                   },
                                   'type' => 'bracketed_arg'
                                 },
@@ -511,8 +500,7 @@ $result_trees{'complex_nestings'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 11,
-                            'macro' => ''
+                            'line_nr' => 11
                           },
                           'type' => 'def_line'
                         },
@@ -554,8 +542,7 @@ $result_trees{'complex_nestings'} = {
                                           },
                                           'source_info' => {
                                             'file_name' => '',
-                                            'line_nr' => 12,
-                                            'macro' => ''
+                                            'line_nr' => 12
                                           },
                                           'type' => 'bracketed_arg'
                                         },
@@ -594,8 +581,7 @@ $result_trees{'complex_nestings'} = {
                                   },
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 12,
-                                    'macro' => ''
+                                    'line_nr' => 12
                                   },
                                   'type' => 'def_line'
                                 },
@@ -647,8 +633,7 @@ $result_trees{'complex_nestings'} = {
                                           },
                                           'source_info' => {
                                             'file_name' => '',
-                                            'line_nr' => 14,
-                                            'macro' => ''
+                                            'line_nr' => 14
                                           },
                                           'type' => 'bracketed_arg'
                                         },
@@ -693,8 +678,7 @@ $result_trees{'complex_nestings'} = {
                                   },
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 14,
-                                    'macro' => ''
+                                    'line_nr' => 14
                                   },
                                   'type' => 'def_line'
                                 },
@@ -726,8 +710,7 @@ $result_trees{'complex_nestings'} = {
                                               'cmdname' => 'asis',
                                               'source_info' => {
                                                 'file_name' => '',
-                                                'line_nr' => 18,
-                                                'macro' => ''
+                                                'line_nr' => 18
                                               },
                                               'type' => 'command_as_argument'
                                             }
@@ -772,8 +755,7 @@ $result_trees{'complex_nestings'} = {
                                                   },
                                                   'source_info' => {
                                                     'file_name' => '',
-                                                    'line_nr' => 19,
-                                                    'macro' => ''
+                                                    'line_nr' => 19
                                                   }
                                                 }
                                               ],
@@ -834,8 +816,7 @@ $result_trees{'complex_nestings'} = {
                                                   },
                                                   'source_info' => {
                                                     'file_name' => '',
-                                                    'line_nr' => 23,
-                                                    'macro' => ''
+                                                    'line_nr' => 23
                                                   }
                                                 }
                                               ],
@@ -872,8 +853,7 @@ $result_trees{'complex_nestings'} = {
                                           },
                                           'source_info' => {
                                             'file_name' => '',
-                                            'line_nr' => 24,
-                                            'macro' => ''
+                                            'line_nr' => 24
                                           }
                                         }
                                       ],
@@ -887,8 +867,7 @@ $result_trees{'complex_nestings'} = {
                                       },
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 18,
-                                        'macro' => ''
+                                        'line_nr' => 18
                                       }
                                     },
                                     {
@@ -936,8 +915,7 @@ $result_trees{'complex_nestings'} = {
                                   },
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 27,
-                                    'macro' => ''
+                                    'line_nr' => 27
                                   }
                                 }
                               ],
@@ -948,8 +926,7 @@ $result_trees{'complex_nestings'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 12,
-                                'macro' => ''
+                                'line_nr' => 12
                               }
                             }
                           ],
@@ -983,8 +960,7 @@ $result_trees{'complex_nestings'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 28,
-                            'macro' => ''
+                            'line_nr' => 28
                           }
                         }
                       ],
@@ -995,8 +971,7 @@ $result_trees{'complex_nestings'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     }
                   ],
@@ -1030,8 +1005,7 @@ $result_trees{'complex_nestings'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 29,
-                    'macro' => ''
+                    'line_nr' => 29
                   }
                 }
               ],
@@ -1042,8 +1016,7 @@ $result_trees{'complex_nestings'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -1084,15 +1057,13 @@ $result_trees{'complex_nestings'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         }
       ],
@@ -1106,8 +1077,7 @@ $result_trees{'complex_nestings'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
diff --git a/tp/t/results/converters_tests/contents_at_document_begin.pl 
b/tp/t/results/converters_tests/contents_at_document_begin.pl
index 67c8d23a87..05fa280c40 100644
--- a/tp/t/results/converters_tests/contents_at_document_begin.pl
+++ b/tp/t/results/converters_tests/contents_at_document_begin.pl
@@ -37,8 +37,7 @@ $result_trees{'contents_at_document_begin'} = {
               'cmdname' => 'contents',
               'source_info' => {
                 'file_name' => 'contents_at_document_begin.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -81,8 +80,7 @@ $result_trees{'contents_at_document_begin'} = {
       },
       'source_info' => {
         'file_name' => 'contents_at_document_begin.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -180,8 +178,7 @@ $result_trees{'contents_at_document_begin'} = {
               ],
               'source_info' => {
                 'file_name' => 'contents_at_document_begin.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -213,15 +210,13 @@ $result_trees{'contents_at_document_begin'} = {
               },
               'source_info' => {
                 'file_name' => 'contents_at_document_begin.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => 'contents_at_document_begin.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -238,8 +233,7 @@ $result_trees{'contents_at_document_begin'} = {
       },
       'source_info' => {
         'file_name' => 'contents_at_document_begin.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -271,8 +265,7 @@ $result_trees{'contents_at_document_begin'} = {
       },
       'source_info' => {
         'file_name' => 'contents_at_document_begin.texi',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -324,8 +317,7 @@ $result_trees{'contents_at_document_begin'} = {
       },
       'source_info' => {
         'file_name' => 'contents_at_document_begin.texi',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
diff --git a/tp/t/results/converters_tests/contents_at_document_begin_inline.pl 
b/tp/t/results/converters_tests/contents_at_document_begin_inline.pl
index ce22584fe8..cb934abd95 100644
--- a/tp/t/results/converters_tests/contents_at_document_begin_inline.pl
+++ b/tp/t/results/converters_tests/contents_at_document_begin_inline.pl
@@ -37,8 +37,7 @@ $result_trees{'contents_at_document_begin_inline'} = {
               'cmdname' => 'contents',
               'source_info' => {
                 'file_name' => 'contents_at_document_begin.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -81,8 +80,7 @@ $result_trees{'contents_at_document_begin_inline'} = {
       },
       'source_info' => {
         'file_name' => 'contents_at_document_begin.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -180,8 +178,7 @@ $result_trees{'contents_at_document_begin_inline'} = {
               ],
               'source_info' => {
                 'file_name' => 'contents_at_document_begin.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -213,15 +210,13 @@ $result_trees{'contents_at_document_begin_inline'} = {
               },
               'source_info' => {
                 'file_name' => 'contents_at_document_begin.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => 'contents_at_document_begin.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -238,8 +233,7 @@ $result_trees{'contents_at_document_begin_inline'} = {
       },
       'source_info' => {
         'file_name' => 'contents_at_document_begin.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -271,8 +265,7 @@ $result_trees{'contents_at_document_begin_inline'} = {
       },
       'source_info' => {
         'file_name' => 'contents_at_document_begin.texi',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -324,8 +317,7 @@ $result_trees{'contents_at_document_begin_inline'} = {
       },
       'source_info' => {
         'file_name' => 'contents_at_document_begin.texi',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
diff --git 
a/tp/t/results/converters_tests/contents_at_document_begin_separate_element.pl 
b/tp/t/results/converters_tests/contents_at_document_begin_separate_element.pl
index 76d96a4320..11ecc3079c 100644
--- 
a/tp/t/results/converters_tests/contents_at_document_begin_separate_element.pl
+++ 
b/tp/t/results/converters_tests/contents_at_document_begin_separate_element.pl
@@ -37,8 +37,7 @@ $result_trees{'contents_at_document_begin_separate_element'} 
= {
               'cmdname' => 'contents',
               'source_info' => {
                 'file_name' => 'contents_at_document_begin.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -81,8 +80,7 @@ $result_trees{'contents_at_document_begin_separate_element'} 
= {
       },
       'source_info' => {
         'file_name' => 'contents_at_document_begin.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -180,8 +178,7 @@ 
$result_trees{'contents_at_document_begin_separate_element'} = {
               ],
               'source_info' => {
                 'file_name' => 'contents_at_document_begin.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -213,15 +210,13 @@ 
$result_trees{'contents_at_document_begin_separate_element'} = {
               },
               'source_info' => {
                 'file_name' => 'contents_at_document_begin.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => 'contents_at_document_begin.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -238,8 +233,7 @@ 
$result_trees{'contents_at_document_begin_separate_element'} = {
       },
       'source_info' => {
         'file_name' => 'contents_at_document_begin.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -271,8 +265,7 @@ 
$result_trees{'contents_at_document_begin_separate_element'} = {
       },
       'source_info' => {
         'file_name' => 'contents_at_document_begin.texi',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -324,8 +317,7 @@ 
$result_trees{'contents_at_document_begin_separate_element'} = {
       },
       'source_info' => {
         'file_name' => 'contents_at_document_begin.texi',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
diff --git a/tp/t/results/converters_tests/definition_commands.pl 
b/tp/t/results/converters_tests/definition_commands.pl
index a81b62c4c3..0f2bacc0ab 100644
--- a/tp/t/results/converters_tests/definition_commands.pl
+++ b/tp/t/results/converters_tests/definition_commands.pl
@@ -44,8 +44,7 @@ $result_trees{'definition_commands'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -81,8 +80,7 @@ $result_trees{'definition_commands'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -114,8 +112,7 @@ $result_trees{'definition_commands'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -216,8 +213,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'def_line'
             },
@@ -242,8 +238,7 @@ $result_trees{'definition_commands'} = {
                       'cmdname' => 'var',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     },
                     {
@@ -263,8 +258,7 @@ $result_trees{'definition_commands'} = {
                       'cmdname' => 'var',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     },
                     {
@@ -305,8 +299,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
@@ -317,8 +310,7 @@ $result_trees{'definition_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -376,8 +368,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     },
                     {
@@ -404,8 +395,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     }
                   ],
@@ -430,8 +420,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'def_line'
             },
@@ -456,8 +445,7 @@ $result_trees{'definition_commands'} = {
                       'cmdname' => 'var',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     },
                     {
@@ -477,8 +465,7 @@ $result_trees{'definition_commands'} = {
                       'cmdname' => 'var',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     },
                     {
@@ -519,8 +506,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             }
           ],
@@ -531,8 +517,7 @@ $result_trees{'definition_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -591,8 +576,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'slanted',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 15,
-                                'macro' => ''
+                                'line_nr' => 15
                               }
                             }
                           ],
@@ -605,8 +589,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     },
                     {
@@ -634,8 +617,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'slanted',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 15,
-                                'macro' => ''
+                                'line_nr' => 15
                               }
                             }
                           ],
@@ -648,8 +630,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     }
                   ],
@@ -674,8 +655,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               },
               'type' => 'def_line'
             },
@@ -700,8 +680,7 @@ $result_trees{'definition_commands'} = {
                       'cmdname' => 'var',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -721,8 +700,7 @@ $result_trees{'definition_commands'} = {
                       'cmdname' => 'var',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -763,8 +741,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             }
           ],
@@ -775,8 +752,7 @@ $result_trees{'definition_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         },
         {
@@ -944,8 +920,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               },
               'type' => 'def_line'
             },
@@ -1021,8 +996,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     },
                     {
@@ -1068,8 +1042,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     },
                     {
@@ -1095,8 +1068,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     },
                     {
@@ -1147,8 +1119,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               },
               'type' => 'def_line'
             },
@@ -1224,8 +1195,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 21,
-                        'macro' => ''
+                        'line_nr' => 21
                       }
                     },
                     {
@@ -1271,8 +1241,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 21,
-                        'macro' => ''
+                        'line_nr' => 21
                       }
                     },
                     {
@@ -1298,8 +1267,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 21,
-                        'macro' => ''
+                        'line_nr' => 21
                       }
                     },
                     {
@@ -1350,8 +1318,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               },
               'type' => 'def_line'
             },
@@ -1427,8 +1394,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -1474,8 +1440,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -1501,8 +1466,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -1553,8 +1517,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               },
               'type' => 'def_line'
             },
@@ -1630,8 +1593,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 23,
-                        'macro' => ''
+                        'line_nr' => 23
                       }
                     },
                     {
@@ -1677,8 +1639,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 23,
-                        'macro' => ''
+                        'line_nr' => 23
                       }
                     },
                     {
@@ -1704,8 +1665,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 23,
-                        'macro' => ''
+                        'line_nr' => 23
                       }
                     },
                     {
@@ -1756,8 +1716,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               },
               'type' => 'def_line'
             },
@@ -1833,8 +1792,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1880,8 +1838,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1907,8 +1864,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1959,8 +1915,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               },
               'type' => 'def_line'
             },
@@ -2037,8 +1992,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'b',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 25,
-                                'macro' => ''
+                                'line_nr' => 25
                               }
                             }
                           ],
@@ -2051,8 +2005,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 25,
-                        'macro' => ''
+                        'line_nr' => 25
                       }
                     },
                     {
@@ -2099,8 +2052,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'b',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 25,
-                                'macro' => ''
+                                'line_nr' => 25
                               }
                             }
                           ],
@@ -2113,8 +2065,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 25,
-                        'macro' => ''
+                        'line_nr' => 25
                       }
                     },
                     {
@@ -2141,8 +2092,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'b',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 25,
-                                'macro' => ''
+                                'line_nr' => 25
                               }
                             }
                           ],
@@ -2155,8 +2105,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 25,
-                        'macro' => ''
+                        'line_nr' => 25
                       }
                     },
                     {
@@ -2207,8 +2156,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               },
               'type' => 'def_line'
             },
@@ -2285,8 +2233,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'var',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 26,
-                                'macro' => ''
+                                'line_nr' => 26
                               }
                             }
                           ],
@@ -2299,8 +2246,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 26,
-                        'macro' => ''
+                        'line_nr' => 26
                       }
                     },
                     {
@@ -2347,8 +2293,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'var',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 26,
-                                'macro' => ''
+                                'line_nr' => 26
                               }
                             }
                           ],
@@ -2361,8 +2306,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 26,
-                        'macro' => ''
+                        'line_nr' => 26
                       }
                     },
                     {
@@ -2389,8 +2333,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'var',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 26,
-                                'macro' => ''
+                                'line_nr' => 26
                               }
                             }
                           ],
@@ -2403,8 +2346,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 26,
-                        'macro' => ''
+                        'line_nr' => 26
                       }
                     },
                     {
@@ -2455,8 +2397,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               },
               'type' => 'def_line'
             },
@@ -2533,8 +2474,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'slanted',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 27,
-                                'macro' => ''
+                                'line_nr' => 27
                               }
                             }
                           ],
@@ -2547,8 +2487,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 27,
-                        'macro' => ''
+                        'line_nr' => 27
                       }
                     },
                     {
@@ -2595,8 +2534,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'slanted',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 27,
-                                'macro' => ''
+                                'line_nr' => 27
                               }
                             }
                           ],
@@ -2609,8 +2547,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 27,
-                        'macro' => ''
+                        'line_nr' => 27
                       }
                     },
                     {
@@ -2637,8 +2574,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'slanted',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 27,
-                                'macro' => ''
+                                'line_nr' => 27
                               }
                             }
                           ],
@@ -2651,8 +2587,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 27,
-                        'macro' => ''
+                        'line_nr' => 27
                       }
                     },
                     {
@@ -2703,8 +2638,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               },
               'type' => 'def_line'
             },
@@ -2781,8 +2715,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'code',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 28,
-                                'macro' => ''
+                                'line_nr' => 28
                               }
                             }
                           ],
@@ -2795,8 +2728,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       }
                     },
                     {
@@ -2843,8 +2775,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'code',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 28,
-                                'macro' => ''
+                                'line_nr' => 28
                               }
                             }
                           ],
@@ -2857,8 +2788,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       }
                     },
                     {
@@ -2885,8 +2815,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'code',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 28,
-                                'macro' => ''
+                                'line_nr' => 28
                               }
                             }
                           ],
@@ -2899,8 +2828,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       }
                     },
                     {
@@ -2951,8 +2879,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               },
               'type' => 'def_line'
             },
@@ -3029,8 +2956,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 't',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 29,
-                                'macro' => ''
+                                'line_nr' => 29
                               }
                             }
                           ],
@@ -3043,8 +2969,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 29,
-                        'macro' => ''
+                        'line_nr' => 29
                       }
                     },
                     {
@@ -3091,8 +3016,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 't',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 29,
-                                'macro' => ''
+                                'line_nr' => 29
                               }
                             }
                           ],
@@ -3105,8 +3029,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 29,
-                        'macro' => ''
+                        'line_nr' => 29
                       }
                     },
                     {
@@ -3133,8 +3056,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 't',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 29,
-                                'macro' => ''
+                                'line_nr' => 29
                               }
                             }
                           ],
@@ -3147,8 +3069,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 29,
-                        'macro' => ''
+                        'line_nr' => 29
                       }
                     },
                     {
@@ -3199,8 +3120,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               },
               'type' => 'def_line'
             },
@@ -3277,8 +3197,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'var',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 30,
-                                'macro' => ''
+                                'line_nr' => 30
                               }
                             }
                           ],
@@ -3291,8 +3210,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 30,
-                        'macro' => ''
+                        'line_nr' => 30
                       }
                     },
                     {
@@ -3339,8 +3257,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'var',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 30,
-                                'macro' => ''
+                                'line_nr' => 30
                               }
                             }
                           ],
@@ -3353,8 +3270,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 30,
-                        'macro' => ''
+                        'line_nr' => 30
                       }
                     },
                     {
@@ -3381,8 +3297,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'var',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 30,
-                                'macro' => ''
+                                'line_nr' => 30
                               }
                             }
                           ],
@@ -3395,8 +3310,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 30,
-                        'macro' => ''
+                        'line_nr' => 30
                       }
                     },
                     {
@@ -3447,8 +3361,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               },
               'type' => 'def_line'
             },
@@ -3525,8 +3438,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'var',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 31,
-                                'macro' => ''
+                                'line_nr' => 31
                               }
                             }
                           ],
@@ -3539,8 +3451,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 31,
-                        'macro' => ''
+                        'line_nr' => 31
                       }
                     },
                     {
@@ -3587,8 +3498,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'var',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 31,
-                                'macro' => ''
+                                'line_nr' => 31
                               }
                             }
                           ],
@@ -3601,8 +3511,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 31,
-                        'macro' => ''
+                        'line_nr' => 31
                       }
                     },
                     {
@@ -3629,8 +3538,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'var',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 31,
-                                'macro' => ''
+                                'line_nr' => 31
                               }
                             }
                           ],
@@ -3643,8 +3551,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 31,
-                        'macro' => ''
+                        'line_nr' => 31
                       }
                     },
                     {
@@ -3695,8 +3602,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               },
               'type' => 'def_line'
             },
@@ -3773,8 +3679,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'slanted',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 32,
-                                'macro' => ''
+                                'line_nr' => 32
                               }
                             }
                           ],
@@ -3787,8 +3692,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 32,
-                        'macro' => ''
+                        'line_nr' => 32
                       }
                     },
                     {
@@ -3835,8 +3739,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'slanted',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 32,
-                                'macro' => ''
+                                'line_nr' => 32
                               }
                             }
                           ],
@@ -3849,8 +3752,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 32,
-                        'macro' => ''
+                        'line_nr' => 32
                       }
                     },
                     {
@@ -3877,8 +3779,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'slanted',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 32,
-                                'macro' => ''
+                                'line_nr' => 32
                               }
                             }
                           ],
@@ -3891,8 +3792,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 32,
-                        'macro' => ''
+                        'line_nr' => 32
                       }
                     },
                     {
@@ -3943,8 +3843,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               },
               'type' => 'def_line'
             },
@@ -4021,8 +3920,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'slanted',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 33,
-                                'macro' => ''
+                                'line_nr' => 33
                               }
                             }
                           ],
@@ -4035,8 +3933,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 33,
-                        'macro' => ''
+                        'line_nr' => 33
                       }
                     },
                     {
@@ -4083,8 +3980,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'slanted',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 33,
-                                'macro' => ''
+                                'line_nr' => 33
                               }
                             }
                           ],
@@ -4097,8 +3993,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 33,
-                        'macro' => ''
+                        'line_nr' => 33
                       }
                     },
                     {
@@ -4125,8 +4020,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'slanted',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 33,
-                                'macro' => ''
+                                'line_nr' => 33
                               }
                             }
                           ],
@@ -4139,8 +4033,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 33,
-                        'macro' => ''
+                        'line_nr' => 33
                       }
                     },
                     {
@@ -4191,8 +4084,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               },
               'type' => 'def_line'
             },
@@ -4238,8 +4130,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             }
           ],
@@ -4250,8 +4141,7 @@ $result_trees{'definition_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         },
         {
@@ -4338,8 +4228,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 37,
-                'macro' => ''
+                'line_nr' => 37
               },
               'type' => 'def_line'
             },
@@ -4395,8 +4284,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 38,
-                        'macro' => ''
+                        'line_nr' => 38
                       }
                     },
                     {
@@ -4440,8 +4328,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               },
               'type' => 'def_line'
             },
@@ -4497,8 +4384,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 39,
-                        'macro' => ''
+                        'line_nr' => 39
                       }
                     },
                     {
@@ -4542,8 +4428,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 39,
-                'macro' => ''
+                'line_nr' => 39
               },
               'type' => 'def_line'
             },
@@ -4599,8 +4484,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 40,
-                        'macro' => ''
+                        'line_nr' => 40
                       }
                     },
                     {
@@ -4644,8 +4528,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               },
               'type' => 'def_line'
             },
@@ -4701,8 +4584,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 41,
-                        'macro' => ''
+                        'line_nr' => 41
                       }
                     },
                     {
@@ -4746,8 +4628,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 41,
-                'macro' => ''
+                'line_nr' => 41
               },
               'type' => 'def_line'
             },
@@ -4803,8 +4684,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 42,
-                        'macro' => ''
+                        'line_nr' => 42
                       }
                     },
                     {
@@ -4848,8 +4728,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               },
               'type' => 'def_line'
             },
@@ -4906,8 +4785,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'b',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 43,
-                                'macro' => ''
+                                'line_nr' => 43
                               }
                             }
                           ],
@@ -4920,8 +4798,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 43,
-                        'macro' => ''
+                        'line_nr' => 43
                       }
                     },
                     {
@@ -4965,8 +4842,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               },
               'type' => 'def_line'
             },
@@ -5023,8 +4899,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'var',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 44,
-                                'macro' => ''
+                                'line_nr' => 44
                               }
                             }
                           ],
@@ -5037,8 +4912,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 44,
-                        'macro' => ''
+                        'line_nr' => 44
                       }
                     },
                     {
@@ -5082,8 +4956,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               },
               'type' => 'def_line'
             },
@@ -5140,8 +5013,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'slanted',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 45,
-                                'macro' => ''
+                                'line_nr' => 45
                               }
                             }
                           ],
@@ -5154,8 +5026,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 45,
-                        'macro' => ''
+                        'line_nr' => 45
                       }
                     },
                     {
@@ -5199,8 +5070,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 45,
-                'macro' => ''
+                'line_nr' => 45
               },
               'type' => 'def_line'
             },
@@ -5257,8 +5127,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'code',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 46,
-                                'macro' => ''
+                                'line_nr' => 46
                               }
                             }
                           ],
@@ -5271,8 +5140,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 46,
-                        'macro' => ''
+                        'line_nr' => 46
                       }
                     },
                     {
@@ -5316,8 +5184,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               },
               'type' => 'def_line'
             },
@@ -5374,8 +5241,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 't',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 47,
-                                'macro' => ''
+                                'line_nr' => 47
                               }
                             }
                           ],
@@ -5388,8 +5254,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 47,
-                        'macro' => ''
+                        'line_nr' => 47
                       }
                     },
                     {
@@ -5433,8 +5298,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               },
               'type' => 'def_line'
             },
@@ -5491,8 +5355,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'var',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 48,
-                                'macro' => ''
+                                'line_nr' => 48
                               }
                             }
                           ],
@@ -5505,8 +5368,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 48,
-                        'macro' => ''
+                        'line_nr' => 48
                       }
                     },
                     {
@@ -5550,8 +5412,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               },
               'type' => 'def_line'
             },
@@ -5608,8 +5469,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'var',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 49,
-                                'macro' => ''
+                                'line_nr' => 49
                               }
                             }
                           ],
@@ -5622,8 +5482,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 49,
-                        'macro' => ''
+                        'line_nr' => 49
                       }
                     },
                     {
@@ -5667,8 +5526,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               },
               'type' => 'def_line'
             },
@@ -5725,8 +5583,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'slanted',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 50,
-                                'macro' => ''
+                                'line_nr' => 50
                               }
                             }
                           ],
@@ -5739,8 +5596,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 50,
-                        'macro' => ''
+                        'line_nr' => 50
                       }
                     },
                     {
@@ -5784,8 +5640,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               },
               'type' => 'def_line'
             },
@@ -5842,8 +5697,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'slanted',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 51,
-                                'macro' => ''
+                                'line_nr' => 51
                               }
                             }
                           ],
@@ -5856,8 +5710,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 51,
-                        'macro' => ''
+                        'line_nr' => 51
                       }
                     },
                     {
@@ -5901,8 +5754,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 51,
-                'macro' => ''
+                'line_nr' => 51
               },
               'type' => 'def_line'
             },
@@ -5948,8 +5800,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               }
             }
           ],
@@ -5960,8 +5811,7 @@ $result_trees{'definition_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 37,
-            'macro' => ''
+            'line_nr' => 37
           }
         },
         {
@@ -6006,8 +5856,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 55,
-                        'macro' => ''
+                        'line_nr' => 55
                       }
                     },
                     {
@@ -6042,8 +5891,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'slanted',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 55,
-                                'macro' => ''
+                                'line_nr' => 55
                               }
                             }
                           ],
@@ -6056,8 +5904,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 55,
-                        'macro' => ''
+                        'line_nr' => 55
                       }
                     },
                     {
@@ -6089,8 +5936,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 55,
-                'macro' => ''
+                'line_nr' => 55
               },
               'type' => 'def_line'
             },
@@ -6112,8 +5958,7 @@ $result_trees{'definition_commands'} = {
                           'cmdname' => 'tie',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 56,
-                            'macro' => ''
+                            'line_nr' => 56
                           }
                         },
                         {
@@ -6148,8 +5993,7 @@ $result_trees{'definition_commands'} = {
                           'cmdname' => 't',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 56,
-                            'macro' => ''
+                            'line_nr' => 56
                           }
                         },
                         {
@@ -6170,8 +6014,7 @@ $result_trees{'definition_commands'} = {
                                   'cmdname' => 'slanted',
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 56,
-                                    'macro' => ''
+                                    'line_nr' => 56
                                   }
                                 }
                               ],
@@ -6181,8 +6024,7 @@ $result_trees{'definition_commands'} = {
                           'cmdname' => 'r',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 56,
-                            'macro' => ''
+                            'line_nr' => 56
                           }
                         },
                         {
@@ -6194,8 +6036,7 @@ $result_trees{'definition_commands'} = {
                           'cmdname' => 't',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 56,
-                            'macro' => ''
+                            'line_nr' => 56
                           }
                         }
                       ],
@@ -6232,8 +6073,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               },
               'type' => 'def_line'
             },
@@ -6255,8 +6095,7 @@ $result_trees{'definition_commands'} = {
                           'cmdname' => 'tie',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 57,
-                            'macro' => ''
+                            'line_nr' => 57
                           }
                         },
                         {
@@ -6291,8 +6130,7 @@ $result_trees{'definition_commands'} = {
                           'cmdname' => 't',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 57,
-                            'macro' => ''
+                            'line_nr' => 57
                           }
                         },
                         {
@@ -6313,8 +6151,7 @@ $result_trees{'definition_commands'} = {
                                   'cmdname' => 'slanted',
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 57,
-                                    'macro' => ''
+                                    'line_nr' => 57
                                   }
                                 }
                               ],
@@ -6324,8 +6161,7 @@ $result_trees{'definition_commands'} = {
                           'cmdname' => 'r',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 57,
-                            'macro' => ''
+                            'line_nr' => 57
                           }
                         },
                         {
@@ -6337,8 +6173,7 @@ $result_trees{'definition_commands'} = {
                           'cmdname' => 't',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 57,
-                            'macro' => ''
+                            'line_nr' => 57
                           }
                         }
                       ],
@@ -6375,8 +6210,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 57,
-                'macro' => ''
+                'line_nr' => 57
               },
               'type' => 'def_line'
             },
@@ -6398,8 +6232,7 @@ $result_trees{'definition_commands'} = {
                           'cmdname' => 'tie',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 58,
-                            'macro' => ''
+                            'line_nr' => 58
                           }
                         },
                         {
@@ -6434,8 +6267,7 @@ $result_trees{'definition_commands'} = {
                           'cmdname' => 't',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 58,
-                            'macro' => ''
+                            'line_nr' => 58
                           }
                         },
                         {
@@ -6456,8 +6288,7 @@ $result_trees{'definition_commands'} = {
                                   'cmdname' => 'slanted',
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 58,
-                                    'macro' => ''
+                                    'line_nr' => 58
                                   }
                                 }
                               ],
@@ -6467,8 +6298,7 @@ $result_trees{'definition_commands'} = {
                           'cmdname' => 'r',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 58,
-                            'macro' => ''
+                            'line_nr' => 58
                           }
                         },
                         {
@@ -6485,8 +6315,7 @@ $result_trees{'definition_commands'} = {
                           'cmdname' => 't',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 58,
-                            'macro' => ''
+                            'line_nr' => 58
                           }
                         }
                       ],
@@ -6519,8 +6348,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 58,
-                        'macro' => ''
+                        'line_nr' => 58
                       }
                     },
                     {
@@ -6541,8 +6369,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'slanted',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 58,
-                                'macro' => ''
+                                'line_nr' => 58
                               }
                             }
                           ],
@@ -6555,8 +6382,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 58,
-                        'macro' => ''
+                        'line_nr' => 58
                       }
                     },
                     {
@@ -6576,8 +6402,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 58,
-                        'macro' => ''
+                        'line_nr' => 58
                       }
                     }
                   ],
@@ -6608,8 +6433,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               },
               'type' => 'def_line'
             },
@@ -6647,8 +6471,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 59,
-                        'macro' => ''
+                        'line_nr' => 59
                       }
                     }
                   ],
@@ -6679,8 +6502,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               },
               'type' => 'def_line'
             },
@@ -6705,8 +6527,7 @@ $result_trees{'definition_commands'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 60,
-                        'macro' => ''
+                        'line_nr' => 60
                       }
                     },
                     {
@@ -6726,8 +6547,7 @@ $result_trees{'definition_commands'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 60,
-                        'macro' => ''
+                        'line_nr' => 60
                       }
                     },
                     {
@@ -6751,8 +6571,7 @@ $result_trees{'definition_commands'} = {
                       'cmdname' => 'var',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 61,
-                        'macro' => ''
+                        'line_nr' => 61
                       }
                     },
                     {
@@ -6767,8 +6586,7 @@ $result_trees{'definition_commands'} = {
                       'cmdname' => 'tie',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 61,
-                        'macro' => ''
+                        'line_nr' => 61
                       }
                     },
                     {
@@ -6785,8 +6603,7 @@ $result_trees{'definition_commands'} = {
                       'cmdname' => 'var',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 61,
-                        'macro' => ''
+                        'line_nr' => 61
                       }
                     },
                     {
@@ -6807,8 +6624,7 @@ $result_trees{'definition_commands'} = {
                       'cmdname' => 'var',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 62,
-                        'macro' => ''
+                        'line_nr' => 62
                       }
                     },
                     {
@@ -6849,8 +6665,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 63,
-                'macro' => ''
+                'line_nr' => 63
               }
             }
           ],
@@ -6861,8 +6676,7 @@ $result_trees{'definition_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 55,
-            'macro' => ''
+            'line_nr' => 55
           }
         },
         {
@@ -6939,8 +6753,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
-                        'macro' => ''
+                        'line_nr' => 65
                       }
                     },
                     {
@@ -6967,8 +6780,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
-                        'macro' => ''
+                        'line_nr' => 65
                       }
                     },
                     {
@@ -6995,8 +6807,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
-                        'macro' => ''
+                        'line_nr' => 65
                       }
                     },
                     {
@@ -7023,8 +6834,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
-                        'macro' => ''
+                        'line_nr' => 65
                       }
                     },
                     {
@@ -7052,8 +6862,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'slanted',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 65,
-                                'macro' => ''
+                                'line_nr' => 65
                               }
                             }
                           ],
@@ -7066,8 +6875,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
-                        'macro' => ''
+                        'line_nr' => 65
                       }
                     },
                     {
@@ -7095,8 +6903,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'code',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 65,
-                                'macro' => ''
+                                'line_nr' => 65
                               }
                             }
                           ],
@@ -7109,8 +6916,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
-                        'macro' => ''
+                        'line_nr' => 65
                       }
                     },
                     {
@@ -7142,8 +6948,7 @@ $result_trees{'definition_commands'} = {
                                       'cmdname' => 'slanted',
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 65,
-                                        'macro' => ''
+                                        'line_nr' => 65
                                       }
                                     }
                                   ],
@@ -7153,8 +6958,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'code',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 65,
-                                'macro' => ''
+                                'line_nr' => 65
                               }
                             }
                           ],
@@ -7167,8 +6971,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
-                        'macro' => ''
+                        'line_nr' => 65
                       }
                     },
                     {
@@ -7196,8 +6999,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 't',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 65,
-                                'macro' => ''
+                                'line_nr' => 65
                               }
                             }
                           ],
@@ -7210,8 +7012,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
-                        'macro' => ''
+                        'line_nr' => 65
                       }
                     },
                     {
@@ -7252,8 +7053,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
-                        'macro' => ''
+                        'line_nr' => 65
                       }
                     },
                     {
@@ -7280,8 +7080,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
-                        'macro' => ''
+                        'line_nr' => 65
                       }
                     },
                     {
@@ -7308,8 +7107,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
-                        'macro' => ''
+                        'line_nr' => 65
                       }
                     },
                     {
@@ -7336,8 +7134,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
-                        'macro' => ''
+                        'line_nr' => 65
                       }
                     },
                     {
@@ -7365,8 +7162,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'slanted',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 65,
-                                'macro' => ''
+                                'line_nr' => 65
                               }
                             }
                           ],
@@ -7379,8 +7175,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
-                        'macro' => ''
+                        'line_nr' => 65
                       }
                     },
                     {
@@ -7408,8 +7203,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'code',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 65,
-                                'macro' => ''
+                                'line_nr' => 65
                               }
                             }
                           ],
@@ -7422,8 +7216,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
-                        'macro' => ''
+                        'line_nr' => 65
                       }
                     },
                     {
@@ -7455,8 +7248,7 @@ $result_trees{'definition_commands'} = {
                                       'cmdname' => 'slanted',
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 65,
-                                        'macro' => ''
+                                        'line_nr' => 65
                                       }
                                     }
                                   ],
@@ -7466,8 +7258,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'code',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 65,
-                                'macro' => ''
+                                'line_nr' => 65
                               }
                             }
                           ],
@@ -7480,8 +7271,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
-                        'macro' => ''
+                        'line_nr' => 65
                       }
                     },
                     {
@@ -7509,8 +7299,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 't',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 65,
-                                'macro' => ''
+                                'line_nr' => 65
                               }
                             }
                           ],
@@ -7523,8 +7312,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
-                        'macro' => ''
+                        'line_nr' => 65
                       }
                     },
                     {
@@ -7565,8 +7353,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
-                        'macro' => ''
+                        'line_nr' => 65
                       }
                     },
                     {
@@ -7593,8 +7380,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
-                        'macro' => ''
+                        'line_nr' => 65
                       }
                     },
                     {
@@ -7621,8 +7407,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
-                        'macro' => ''
+                        'line_nr' => 65
                       }
                     },
                     {
@@ -7649,8 +7434,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
-                        'macro' => ''
+                        'line_nr' => 65
                       }
                     },
                     {
@@ -7678,8 +7462,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'slanted',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 65,
-                                'macro' => ''
+                                'line_nr' => 65
                               }
                             }
                           ],
@@ -7692,8 +7475,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
-                        'macro' => ''
+                        'line_nr' => 65
                       }
                     },
                     {
@@ -7721,8 +7503,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'code',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 65,
-                                'macro' => ''
+                                'line_nr' => 65
                               }
                             }
                           ],
@@ -7735,8 +7516,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
-                        'macro' => ''
+                        'line_nr' => 65
                       }
                     },
                     {
@@ -7768,8 +7548,7 @@ $result_trees{'definition_commands'} = {
                                       'cmdname' => 'slanted',
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 65,
-                                        'macro' => ''
+                                        'line_nr' => 65
                                       }
                                     }
                                   ],
@@ -7779,8 +7558,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'code',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 65,
-                                'macro' => ''
+                                'line_nr' => 65
                               }
                             }
                           ],
@@ -7793,8 +7571,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
-                        'macro' => ''
+                        'line_nr' => 65
                       }
                     },
                     {
@@ -7822,8 +7599,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 't',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 65,
-                                'macro' => ''
+                                'line_nr' => 65
                               }
                             }
                           ],
@@ -7836,8 +7612,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
-                        'macro' => ''
+                        'line_nr' => 65
                       }
                     }
                   ],
@@ -7862,8 +7637,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               },
               'type' => 'def_line'
             },
@@ -7940,8 +7714,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 66,
-                        'macro' => ''
+                        'line_nr' => 66
                       }
                     },
                     {
@@ -7968,8 +7741,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 66,
-                        'macro' => ''
+                        'line_nr' => 66
                       }
                     },
                     {
@@ -7996,8 +7768,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 66,
-                        'macro' => ''
+                        'line_nr' => 66
                       }
                     },
                     {
@@ -8024,8 +7795,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 66,
-                        'macro' => ''
+                        'line_nr' => 66
                       }
                     },
                     {
@@ -8053,8 +7823,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'slanted',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 66,
-                                'macro' => ''
+                                'line_nr' => 66
                               }
                             }
                           ],
@@ -8067,8 +7836,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 66,
-                        'macro' => ''
+                        'line_nr' => 66
                       }
                     },
                     {
@@ -8096,8 +7864,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'code',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 66,
-                                'macro' => ''
+                                'line_nr' => 66
                               }
                             }
                           ],
@@ -8110,8 +7877,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 66,
-                        'macro' => ''
+                        'line_nr' => 66
                       }
                     },
                     {
@@ -8143,8 +7909,7 @@ $result_trees{'definition_commands'} = {
                                       'cmdname' => 'slanted',
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 66,
-                                        'macro' => ''
+                                        'line_nr' => 66
                                       }
                                     }
                                   ],
@@ -8154,8 +7919,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'code',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 66,
-                                'macro' => ''
+                                'line_nr' => 66
                               }
                             }
                           ],
@@ -8168,8 +7932,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 66,
-                        'macro' => ''
+                        'line_nr' => 66
                       }
                     }
                   ],
@@ -8200,8 +7963,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 66,
-                'macro' => ''
+                'line_nr' => 66
               },
               'type' => 'def_line'
             },
@@ -8247,8 +8009,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 68,
-                'macro' => ''
+                'line_nr' => 68
               }
             }
           ],
@@ -8259,8 +8020,7 @@ $result_trees{'definition_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 65,
-            'macro' => ''
+            'line_nr' => 65
           }
         },
         {
@@ -8286,8 +8046,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 70,
-                        'macro' => ''
+                        'line_nr' => 70
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -8361,8 +8120,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 70,
-                        'macro' => ''
+                        'line_nr' => 70
                       }
                     },
                     {
@@ -8409,8 +8167,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 70,
-                        'macro' => ''
+                        'line_nr' => 70
                       }
                     },
                     {
@@ -8442,8 +8199,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 70,
-                'macro' => ''
+                'line_nr' => 70
               },
               'type' => 'def_line'
             },
@@ -8460,8 +8216,7 @@ $result_trees{'definition_commands'} = {
                       'cmdname' => 'dots',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 71,
-                        'macro' => ''
+                        'line_nr' => 71
                       }
                     },
                     {
@@ -8481,8 +8236,7 @@ $result_trees{'definition_commands'} = {
                       'cmdname' => 'var',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 71,
-                        'macro' => ''
+                        'line_nr' => 71
                       }
                     },
                     {
@@ -8502,8 +8256,7 @@ $result_trees{'definition_commands'} = {
                       'cmdname' => 'var',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 71,
-                        'macro' => ''
+                        'line_nr' => 71
                       }
                     },
                     {
@@ -8544,8 +8297,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 72,
-                'macro' => ''
+                'line_nr' => 72
               }
             }
           ],
@@ -8556,8 +8308,7 @@ $result_trees{'definition_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 70,
-            'macro' => ''
+            'line_nr' => 70
           }
         },
         {
@@ -8583,8 +8334,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 74,
-                        'macro' => ''
+                        'line_nr' => 74
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -8659,8 +8409,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'slanted',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 74,
-                                'macro' => ''
+                                'line_nr' => 74
                               }
                             }
                           ],
@@ -8673,8 +8422,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 74,
-                        'macro' => ''
+                        'line_nr' => 74
                       }
                     },
                     {
@@ -8722,8 +8470,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'slanted',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 74,
-                                'macro' => ''
+                                'line_nr' => 74
                               }
                             }
                           ],
@@ -8736,8 +8483,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 74,
-                        'macro' => ''
+                        'line_nr' => 74
                       }
                     },
                     {
@@ -8769,8 +8515,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 74,
-                'macro' => ''
+                'line_nr' => 74
               },
               'type' => 'def_line'
             },
@@ -8787,8 +8532,7 @@ $result_trees{'definition_commands'} = {
                       'cmdname' => 'dots',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 75,
-                        'macro' => ''
+                        'line_nr' => 75
                       }
                     },
                     {
@@ -8808,8 +8552,7 @@ $result_trees{'definition_commands'} = {
                       'cmdname' => 'var',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 75,
-                        'macro' => ''
+                        'line_nr' => 75
                       }
                     },
                     {
@@ -8829,8 +8572,7 @@ $result_trees{'definition_commands'} = {
                       'cmdname' => 'var',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 75,
-                        'macro' => ''
+                        'line_nr' => 75
                       }
                     },
                     {
@@ -8871,8 +8613,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 76,
-                'macro' => ''
+                'line_nr' => 76
               }
             }
           ],
@@ -8883,8 +8624,7 @@ $result_trees{'definition_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 74,
-            'macro' => ''
+            'line_nr' => 74
           }
         },
         {
@@ -8896,8 +8636,7 @@ $result_trees{'definition_commands'} = {
           'cmdname' => 'noindent',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 78,
-            'macro' => ''
+            'line_nr' => 78
           }
         },
         {
@@ -8934,8 +8673,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 79,
-                        'macro' => ''
+                        'line_nr' => 79
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -8987,8 +8725,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 79,
-                'macro' => ''
+                'line_nr' => 79
               },
               'type' => 'def_line'
             },
@@ -9005,8 +8742,7 @@ $result_trees{'definition_commands'} = {
                       'cmdname' => 'dots',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 80,
-                        'macro' => ''
+                        'line_nr' => 80
                       }
                     },
                     {
@@ -9047,8 +8783,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 81,
-                'macro' => ''
+                'line_nr' => 81
               }
             }
           ],
@@ -9059,8 +8794,7 @@ $result_trees{'definition_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 79,
-            'macro' => ''
+            'line_nr' => 79
           }
         },
         {
@@ -9086,8 +8820,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 83,
-                        'macro' => ''
+                        'line_nr' => 83
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -9128,8 +8861,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 83,
-                        'macro' => ''
+                        'line_nr' => 83
                       }
                     },
                     {
@@ -9204,8 +8936,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 83,
-                'macro' => ''
+                'line_nr' => 83
               },
               'type' => 'def_line'
             },
@@ -9222,8 +8953,7 @@ $result_trees{'definition_commands'} = {
                       'cmdname' => 'dots',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 84,
-                        'macro' => ''
+                        'line_nr' => 84
                       }
                     },
                     {
@@ -9264,8 +8994,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 85,
-                'macro' => ''
+                'line_nr' => 85
               }
             }
           ],
@@ -9276,8 +9005,7 @@ $result_trees{'definition_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 83,
-            'macro' => ''
+            'line_nr' => 83
           }
         },
         {
@@ -9317,8 +9045,7 @@ $result_trees{'definition_commands'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 88,
-                            'macro' => ''
+                            'line_nr' => 88
                           },
                           'type' => 'bracketed_arg'
                         },
@@ -9392,8 +9119,7 @@ $result_trees{'definition_commands'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 88,
-                            'macro' => ''
+                            'line_nr' => 88
                           }
                         },
                         {
@@ -9440,8 +9166,7 @@ $result_trees{'definition_commands'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 88,
-                            'macro' => ''
+                            'line_nr' => 88
                           }
                         },
                         {
@@ -9473,8 +9198,7 @@ $result_trees{'definition_commands'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 88,
-                    'macro' => ''
+                    'line_nr' => 88
                   },
                   'type' => 'def_line'
                 },
@@ -9491,8 +9215,7 @@ $result_trees{'definition_commands'} = {
                           'cmdname' => 'dots',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 89,
-                            'macro' => ''
+                            'line_nr' => 89
                           }
                         },
                         {
@@ -9512,8 +9235,7 @@ $result_trees{'definition_commands'} = {
                           'cmdname' => 'var',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 89,
-                            'macro' => ''
+                            'line_nr' => 89
                           }
                         },
                         {
@@ -9533,8 +9255,7 @@ $result_trees{'definition_commands'} = {
                           'cmdname' => 'var',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 89,
-                            'macro' => ''
+                            'line_nr' => 89
                           }
                         },
                         {
@@ -9575,8 +9296,7 @@ $result_trees{'definition_commands'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 90,
-                    'macro' => ''
+                    'line_nr' => 90
                   }
                 }
               ],
@@ -9587,8 +9307,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 88,
-                'macro' => ''
+                'line_nr' => 88
               }
             },
             {
@@ -9619,15 +9338,13 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 91,
-                'macro' => ''
+                'line_nr' => 91
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 87,
-            'macro' => ''
+            'line_nr' => 87
           }
         },
         {
@@ -9727,8 +9444,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 93,
-                'macro' => ''
+                'line_nr' => 93
               },
               'type' => 'def_line'
             },
@@ -9750,8 +9466,7 @@ $result_trees{'definition_commands'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 94,
-                        'macro' => ''
+                        'line_nr' => 94
                       }
                     },
                     {
@@ -9771,8 +9486,7 @@ $result_trees{'definition_commands'} = {
                       'cmdname' => 'var',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 94,
-                        'macro' => ''
+                        'line_nr' => 94
                       }
                     },
                     {
@@ -9792,8 +9506,7 @@ $result_trees{'definition_commands'} = {
                       'cmdname' => 'var',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 94,
-                        'macro' => ''
+                        'line_nr' => 94
                       }
                     },
                     {
@@ -9834,8 +9547,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 95,
-                'macro' => ''
+                'line_nr' => 95
               }
             }
           ],
@@ -9846,8 +9558,7 @@ $result_trees{'definition_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 93,
-            'macro' => ''
+            'line_nr' => 93
           }
         },
         {
@@ -9924,8 +9635,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'b',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 97,
-                                'macro' => ''
+                                'line_nr' => 97
                               }
                             }
                           ],
@@ -9938,8 +9648,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 97,
-                        'macro' => ''
+                        'line_nr' => 97
                       }
                     },
                     {
@@ -9977,8 +9686,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 97,
-                'macro' => ''
+                'line_nr' => 97
               },
               'type' => 'def_line'
             },
@@ -10003,8 +9711,7 @@ $result_trees{'definition_commands'} = {
                       'cmdname' => 'var',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 98,
-                        'macro' => ''
+                        'line_nr' => 98
                       }
                     },
                     {
@@ -10024,8 +9731,7 @@ $result_trees{'definition_commands'} = {
                       'cmdname' => 'var',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 98,
-                        'macro' => ''
+                        'line_nr' => 98
                       }
                     },
                     {
@@ -10066,8 +9772,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 99,
-                'macro' => ''
+                'line_nr' => 99
               }
             }
           ],
@@ -10078,8 +9783,7 @@ $result_trees{'definition_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 97,
-            'macro' => ''
+            'line_nr' => 97
           }
         },
         {
@@ -10150,8 +9854,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 101,
-                        'macro' => ''
+                        'line_nr' => 101
                       }
                     },
                     {
@@ -10178,8 +9881,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 101,
-                        'macro' => ''
+                        'line_nr' => 101
                       }
                     },
                     {
@@ -10206,8 +9908,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 101,
-                        'macro' => ''
+                        'line_nr' => 101
                       }
                     },
                     {
@@ -10254,8 +9955,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 101,
-                        'macro' => ''
+                        'line_nr' => 101
                       }
                     },
                     {
@@ -10289,8 +9989,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 101,
-                        'macro' => ''
+                        'line_nr' => 101
                       }
                     },
                     {
@@ -10324,8 +10023,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 101,
-                        'macro' => ''
+                        'line_nr' => 101
                       }
                     },
                     {
@@ -10366,8 +10064,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 102,
-                        'macro' => ''
+                        'line_nr' => 102
                       }
                     },
                     {
@@ -10401,8 +10098,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 102,
-                        'macro' => ''
+                        'line_nr' => 102
                       }
                     },
                     {
@@ -10448,8 +10144,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 101,
-                'macro' => ''
+                'line_nr' => 101
               },
               'type' => 'def_line'
             },
@@ -10495,8 +10190,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 104,
-                'macro' => ''
+                'line_nr' => 104
               }
             }
           ],
@@ -10507,8 +10201,7 @@ $result_trees{'definition_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 101,
-            'macro' => ''
+            'line_nr' => 101
           }
         },
         {
@@ -10534,8 +10227,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 106,
-                        'macro' => ''
+                        'line_nr' => 106
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -10609,8 +10301,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 106,
-                        'macro' => ''
+                        'line_nr' => 106
                       }
                     },
                     {
@@ -10664,8 +10355,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 106,
-                        'macro' => ''
+                        'line_nr' => 106
                       }
                     },
                     {
@@ -10717,8 +10407,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 106,
-                'macro' => ''
+                'line_nr' => 106
               },
               'type' => 'def_line'
             },
@@ -10737,8 +10426,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 107,
-                        'macro' => ''
+                        'line_nr' => 107
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -10812,8 +10500,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 107,
-                        'macro' => ''
+                        'line_nr' => 107
                       }
                     },
                     {
@@ -10833,8 +10520,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 107,
-                        'macro' => ''
+                        'line_nr' => 107
                       }
                     },
                     {
@@ -10881,8 +10567,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 107,
-                        'macro' => ''
+                        'line_nr' => 107
                       }
                     },
                     {
@@ -10902,8 +10587,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 107,
-                        'macro' => ''
+                        'line_nr' => 107
                       }
                     },
                     {
@@ -10954,8 +10638,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 107,
-                'macro' => ''
+                'line_nr' => 107
               },
               'type' => 'def_line'
             },
@@ -10974,8 +10657,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 108,
-                        'macro' => ''
+                        'line_nr' => 108
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -11049,8 +10731,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 108,
-                        'macro' => ''
+                        'line_nr' => 108
                       }
                     },
                     {
@@ -11070,8 +10751,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 108,
-                        'macro' => ''
+                        'line_nr' => 108
                       }
                     },
                     {
@@ -11118,8 +10798,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 108,
-                        'macro' => ''
+                        'line_nr' => 108
                       }
                     },
                     {
@@ -11139,8 +10818,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 108,
-                        'macro' => ''
+                        'line_nr' => 108
                       }
                     },
                     {
@@ -11191,8 +10869,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 108,
-                'macro' => ''
+                'line_nr' => 108
               },
               'type' => 'def_line'
             },
@@ -11211,8 +10888,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 109,
-                        'macro' => ''
+                        'line_nr' => 109
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -11286,8 +10962,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 109,
-                        'macro' => ''
+                        'line_nr' => 109
                       }
                     },
                     {
@@ -11307,8 +10982,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 109,
-                        'macro' => ''
+                        'line_nr' => 109
                       }
                     },
                     {
@@ -11355,8 +11029,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 109,
-                        'macro' => ''
+                        'line_nr' => 109
                       }
                     },
                     {
@@ -11376,8 +11049,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 109,
-                        'macro' => ''
+                        'line_nr' => 109
                       }
                     },
                     {
@@ -11428,8 +11100,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 109,
-                'macro' => ''
+                'line_nr' => 109
               },
               'type' => 'def_line'
             },
@@ -11448,8 +11119,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 110,
-                        'macro' => ''
+                        'line_nr' => 110
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -11523,8 +11193,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 110,
-                        'macro' => ''
+                        'line_nr' => 110
                       }
                     },
                     {
@@ -11544,8 +11213,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 110,
-                        'macro' => ''
+                        'line_nr' => 110
                       }
                     },
                     {
@@ -11592,8 +11260,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 110,
-                        'macro' => ''
+                        'line_nr' => 110
                       }
                     },
                     {
@@ -11613,8 +11280,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 110,
-                        'macro' => ''
+                        'line_nr' => 110
                       }
                     },
                     {
@@ -11665,8 +11331,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 110,
-                'macro' => ''
+                'line_nr' => 110
               },
               'type' => 'def_line'
             },
@@ -11685,8 +11350,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 111,
-                        'macro' => ''
+                        'line_nr' => 111
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -11760,8 +11424,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 111,
-                        'macro' => ''
+                        'line_nr' => 111
                       }
                     },
                     {
@@ -11781,8 +11444,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 111,
-                        'macro' => ''
+                        'line_nr' => 111
                       }
                     },
                     {
@@ -11829,8 +11491,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 111,
-                        'macro' => ''
+                        'line_nr' => 111
                       }
                     },
                     {
@@ -11850,8 +11511,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 111,
-                        'macro' => ''
+                        'line_nr' => 111
                       }
                     },
                     {
@@ -11902,8 +11562,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 111,
-                'macro' => ''
+                'line_nr' => 111
               },
               'type' => 'def_line'
             },
@@ -11922,8 +11581,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 112,
-                        'macro' => ''
+                        'line_nr' => 112
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -11997,8 +11655,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 112,
-                        'macro' => ''
+                        'line_nr' => 112
                       }
                     },
                     {
@@ -12019,8 +11676,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'b',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 112,
-                                'macro' => ''
+                                'line_nr' => 112
                               }
                             }
                           ],
@@ -12033,8 +11689,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 112,
-                        'macro' => ''
+                        'line_nr' => 112
                       }
                     },
                     {
@@ -12081,8 +11736,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 112,
-                        'macro' => ''
+                        'line_nr' => 112
                       }
                     },
                     {
@@ -12103,8 +11757,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'b',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 112,
-                                'macro' => ''
+                                'line_nr' => 112
                               }
                             }
                           ],
@@ -12117,8 +11770,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 112,
-                        'macro' => ''
+                        'line_nr' => 112
                       }
                     },
                     {
@@ -12169,8 +11821,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 112,
-                'macro' => ''
+                'line_nr' => 112
               },
               'type' => 'def_line'
             },
@@ -12189,8 +11840,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 113,
-                        'macro' => ''
+                        'line_nr' => 113
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -12264,8 +11914,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 113,
-                        'macro' => ''
+                        'line_nr' => 113
                       }
                     },
                     {
@@ -12286,8 +11935,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'var',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 113,
-                                'macro' => ''
+                                'line_nr' => 113
                               }
                             }
                           ],
@@ -12300,8 +11948,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 113,
-                        'macro' => ''
+                        'line_nr' => 113
                       }
                     },
                     {
@@ -12348,8 +11995,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 113,
-                        'macro' => ''
+                        'line_nr' => 113
                       }
                     },
                     {
@@ -12370,8 +12016,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'var',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 113,
-                                'macro' => ''
+                                'line_nr' => 113
                               }
                             }
                           ],
@@ -12384,8 +12029,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 113,
-                        'macro' => ''
+                        'line_nr' => 113
                       }
                     },
                     {
@@ -12436,8 +12080,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 113,
-                'macro' => ''
+                'line_nr' => 113
               },
               'type' => 'def_line'
             },
@@ -12456,8 +12099,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 114,
-                        'macro' => ''
+                        'line_nr' => 114
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -12531,8 +12173,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 114,
-                        'macro' => ''
+                        'line_nr' => 114
                       }
                     },
                     {
@@ -12553,8 +12194,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'slanted',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 114,
-                                'macro' => ''
+                                'line_nr' => 114
                               }
                             }
                           ],
@@ -12567,8 +12207,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 114,
-                        'macro' => ''
+                        'line_nr' => 114
                       }
                     },
                     {
@@ -12615,8 +12254,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 114,
-                        'macro' => ''
+                        'line_nr' => 114
                       }
                     },
                     {
@@ -12637,8 +12275,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'slanted',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 114,
-                                'macro' => ''
+                                'line_nr' => 114
                               }
                             }
                           ],
@@ -12651,8 +12288,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 114,
-                        'macro' => ''
+                        'line_nr' => 114
                       }
                     },
                     {
@@ -12703,8 +12339,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 114,
-                'macro' => ''
+                'line_nr' => 114
               },
               'type' => 'def_line'
             },
@@ -12723,8 +12358,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 115,
-                        'macro' => ''
+                        'line_nr' => 115
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -12798,8 +12432,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 115,
-                        'macro' => ''
+                        'line_nr' => 115
                       }
                     },
                     {
@@ -12820,8 +12453,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'code',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 115,
-                                'macro' => ''
+                                'line_nr' => 115
                               }
                             }
                           ],
@@ -12834,8 +12466,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 115,
-                        'macro' => ''
+                        'line_nr' => 115
                       }
                     },
                     {
@@ -12882,8 +12513,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 115,
-                        'macro' => ''
+                        'line_nr' => 115
                       }
                     },
                     {
@@ -12904,8 +12534,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'code',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 115,
-                                'macro' => ''
+                                'line_nr' => 115
                               }
                             }
                           ],
@@ -12918,8 +12547,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 115,
-                        'macro' => ''
+                        'line_nr' => 115
                       }
                     },
                     {
@@ -12970,8 +12598,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 115,
-                'macro' => ''
+                'line_nr' => 115
               },
               'type' => 'def_line'
             },
@@ -12990,8 +12617,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 116,
-                        'macro' => ''
+                        'line_nr' => 116
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -13065,8 +12691,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 116,
-                        'macro' => ''
+                        'line_nr' => 116
                       }
                     },
                     {
@@ -13087,8 +12712,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 't',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 116,
-                                'macro' => ''
+                                'line_nr' => 116
                               }
                             }
                           ],
@@ -13101,8 +12725,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 116,
-                        'macro' => ''
+                        'line_nr' => 116
                       }
                     },
                     {
@@ -13149,8 +12772,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 116,
-                        'macro' => ''
+                        'line_nr' => 116
                       }
                     },
                     {
@@ -13171,8 +12793,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 't',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 116,
-                                'macro' => ''
+                                'line_nr' => 116
                               }
                             }
                           ],
@@ -13185,8 +12806,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 116,
-                        'macro' => ''
+                        'line_nr' => 116
                       }
                     },
                     {
@@ -13237,8 +12857,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 116,
-                'macro' => ''
+                'line_nr' => 116
               },
               'type' => 'def_line'
             },
@@ -13257,8 +12876,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 117,
-                        'macro' => ''
+                        'line_nr' => 117
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -13332,8 +12950,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 117,
-                        'macro' => ''
+                        'line_nr' => 117
                       }
                     },
                     {
@@ -13354,8 +12971,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'var',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 117,
-                                'macro' => ''
+                                'line_nr' => 117
                               }
                             }
                           ],
@@ -13368,8 +12984,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 117,
-                        'macro' => ''
+                        'line_nr' => 117
                       }
                     },
                     {
@@ -13416,8 +13031,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 117,
-                        'macro' => ''
+                        'line_nr' => 117
                       }
                     },
                     {
@@ -13438,8 +13052,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'var',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 117,
-                                'macro' => ''
+                                'line_nr' => 117
                               }
                             }
                           ],
@@ -13452,8 +13065,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 117,
-                        'macro' => ''
+                        'line_nr' => 117
                       }
                     },
                     {
@@ -13504,8 +13116,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 117,
-                'macro' => ''
+                'line_nr' => 117
               },
               'type' => 'def_line'
             },
@@ -13524,8 +13135,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 118,
-                        'macro' => ''
+                        'line_nr' => 118
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -13599,8 +13209,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 118,
-                        'macro' => ''
+                        'line_nr' => 118
                       }
                     },
                     {
@@ -13621,8 +13230,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'var',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 118,
-                                'macro' => ''
+                                'line_nr' => 118
                               }
                             }
                           ],
@@ -13635,8 +13243,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 118,
-                        'macro' => ''
+                        'line_nr' => 118
                       }
                     },
                     {
@@ -13683,8 +13290,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 118,
-                        'macro' => ''
+                        'line_nr' => 118
                       }
                     },
                     {
@@ -13705,8 +13311,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'var',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 118,
-                                'macro' => ''
+                                'line_nr' => 118
                               }
                             }
                           ],
@@ -13719,8 +13324,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 118,
-                        'macro' => ''
+                        'line_nr' => 118
                       }
                     },
                     {
@@ -13771,8 +13375,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 118,
-                'macro' => ''
+                'line_nr' => 118
               },
               'type' => 'def_line'
             },
@@ -13791,8 +13394,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 119,
-                        'macro' => ''
+                        'line_nr' => 119
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -13866,8 +13468,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 119,
-                        'macro' => ''
+                        'line_nr' => 119
                       }
                     },
                     {
@@ -13888,8 +13489,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'slanted',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 119,
-                                'macro' => ''
+                                'line_nr' => 119
                               }
                             }
                           ],
@@ -13902,8 +13502,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 119,
-                        'macro' => ''
+                        'line_nr' => 119
                       }
                     },
                     {
@@ -13950,8 +13549,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 119,
-                        'macro' => ''
+                        'line_nr' => 119
                       }
                     },
                     {
@@ -13972,8 +13570,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'slanted',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 119,
-                                'macro' => ''
+                                'line_nr' => 119
                               }
                             }
                           ],
@@ -13986,8 +13583,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 119,
-                        'macro' => ''
+                        'line_nr' => 119
                       }
                     },
                     {
@@ -14038,8 +13634,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 119,
-                'macro' => ''
+                'line_nr' => 119
               },
               'type' => 'def_line'
             },
@@ -14058,8 +13653,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 120,
-                        'macro' => ''
+                        'line_nr' => 120
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -14133,8 +13727,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 120,
-                        'macro' => ''
+                        'line_nr' => 120
                       }
                     },
                     {
@@ -14155,8 +13748,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'slanted',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 120,
-                                'macro' => ''
+                                'line_nr' => 120
                               }
                             }
                           ],
@@ -14169,8 +13761,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 120,
-                        'macro' => ''
+                        'line_nr' => 120
                       }
                     },
                     {
@@ -14217,8 +13808,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 120,
-                        'macro' => ''
+                        'line_nr' => 120
                       }
                     },
                     {
@@ -14239,8 +13829,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'slanted',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 120,
-                                'macro' => ''
+                                'line_nr' => 120
                               }
                             }
                           ],
@@ -14253,8 +13842,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 120,
-                        'macro' => ''
+                        'line_nr' => 120
                       }
                     },
                     {
@@ -14305,8 +13893,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 120,
-                'macro' => ''
+                'line_nr' => 120
               },
               'type' => 'def_line'
             },
@@ -14352,8 +13939,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 122,
-                'macro' => ''
+                'line_nr' => 122
               }
             }
           ],
@@ -14364,8 +13950,7 @@ $result_trees{'definition_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 106,
-            'macro' => ''
+            'line_nr' => 106
           }
         },
         {
@@ -14391,8 +13976,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 124,
-                        'macro' => ''
+                        'line_nr' => 124
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -14466,8 +14050,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 124,
-                        'macro' => ''
+                        'line_nr' => 124
                       }
                     },
                     {
@@ -14521,8 +14104,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 124,
-                        'macro' => ''
+                        'line_nr' => 124
                       }
                     },
                     {
@@ -14574,8 +14156,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 124,
-                'macro' => ''
+                'line_nr' => 124
               },
               'type' => 'def_line'
             },
@@ -14594,8 +14175,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 125,
-                        'macro' => ''
+                        'line_nr' => 125
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -14656,8 +14236,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 125,
-                        'macro' => ''
+                        'line_nr' => 125
                       }
                     },
                     {
@@ -14684,8 +14263,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 125,
-                        'macro' => ''
+                        'line_nr' => 125
                       }
                     },
                     {
@@ -14739,8 +14317,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 125,
-                        'macro' => ''
+                        'line_nr' => 125
                       }
                     },
                     {
@@ -14798,8 +14375,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 125,
-                'macro' => ''
+                'line_nr' => 125
               },
               'type' => 'def_line'
             },
@@ -14818,8 +14394,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 126,
-                        'macro' => ''
+                        'line_nr' => 126
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -14880,8 +14455,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 126,
-                        'macro' => ''
+                        'line_nr' => 126
                       }
                     },
                     {
@@ -14908,8 +14482,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 126,
-                        'macro' => ''
+                        'line_nr' => 126
                       }
                     },
                     {
@@ -14963,8 +14536,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 126,
-                        'macro' => ''
+                        'line_nr' => 126
                       }
                     },
                     {
@@ -15022,8 +14594,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 126,
-                'macro' => ''
+                'line_nr' => 126
               },
               'type' => 'def_line'
             },
@@ -15042,8 +14613,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 127,
-                        'macro' => ''
+                        'line_nr' => 127
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -15104,8 +14674,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 127,
-                        'macro' => ''
+                        'line_nr' => 127
                       }
                     },
                     {
@@ -15132,8 +14701,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 127,
-                        'macro' => ''
+                        'line_nr' => 127
                       }
                     },
                     {
@@ -15187,8 +14755,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 127,
-                        'macro' => ''
+                        'line_nr' => 127
                       }
                     },
                     {
@@ -15246,8 +14813,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 127,
-                'macro' => ''
+                'line_nr' => 127
               },
               'type' => 'def_line'
             },
@@ -15266,8 +14832,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 128,
-                        'macro' => ''
+                        'line_nr' => 128
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -15328,8 +14893,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 128,
-                        'macro' => ''
+                        'line_nr' => 128
                       }
                     },
                     {
@@ -15356,8 +14920,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 128,
-                        'macro' => ''
+                        'line_nr' => 128
                       }
                     },
                     {
@@ -15411,8 +14974,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 128,
-                        'macro' => ''
+                        'line_nr' => 128
                       }
                     },
                     {
@@ -15470,8 +15032,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 128,
-                'macro' => ''
+                'line_nr' => 128
               },
               'type' => 'def_line'
             },
@@ -15490,8 +15051,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 129,
-                        'macro' => ''
+                        'line_nr' => 129
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -15552,8 +15112,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 129,
-                        'macro' => ''
+                        'line_nr' => 129
                       }
                     },
                     {
@@ -15580,8 +15139,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 129,
-                        'macro' => ''
+                        'line_nr' => 129
                       }
                     },
                     {
@@ -15635,8 +15193,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 129,
-                        'macro' => ''
+                        'line_nr' => 129
                       }
                     },
                     {
@@ -15694,8 +15251,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 129,
-                'macro' => ''
+                'line_nr' => 129
               },
               'type' => 'def_line'
             },
@@ -15714,8 +15270,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 130,
-                        'macro' => ''
+                        'line_nr' => 130
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -15777,8 +15332,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'b',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 130,
-                                'macro' => ''
+                                'line_nr' => 130
                               }
                             }
                           ],
@@ -15791,8 +15345,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 130,
-                        'macro' => ''
+                        'line_nr' => 130
                       }
                     },
                     {
@@ -15819,8 +15372,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 130,
-                        'macro' => ''
+                        'line_nr' => 130
                       }
                     },
                     {
@@ -15874,8 +15426,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 130,
-                        'macro' => ''
+                        'line_nr' => 130
                       }
                     },
                     {
@@ -15933,8 +15484,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 130,
-                'macro' => ''
+                'line_nr' => 130
               },
               'type' => 'def_line'
             },
@@ -15953,8 +15503,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 131,
-                        'macro' => ''
+                        'line_nr' => 131
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -16016,8 +15565,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'var',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 131,
-                                'macro' => ''
+                                'line_nr' => 131
                               }
                             }
                           ],
@@ -16030,8 +15578,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 131,
-                        'macro' => ''
+                        'line_nr' => 131
                       }
                     },
                     {
@@ -16058,8 +15605,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 131,
-                        'macro' => ''
+                        'line_nr' => 131
                       }
                     },
                     {
@@ -16113,8 +15659,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 131,
-                        'macro' => ''
+                        'line_nr' => 131
                       }
                     },
                     {
@@ -16172,8 +15717,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 131,
-                'macro' => ''
+                'line_nr' => 131
               },
               'type' => 'def_line'
             },
@@ -16192,8 +15736,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 132,
-                        'macro' => ''
+                        'line_nr' => 132
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -16255,8 +15798,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'slanted',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 132,
-                                'macro' => ''
+                                'line_nr' => 132
                               }
                             }
                           ],
@@ -16269,8 +15811,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 132,
-                        'macro' => ''
+                        'line_nr' => 132
                       }
                     },
                     {
@@ -16297,8 +15838,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 132,
-                        'macro' => ''
+                        'line_nr' => 132
                       }
                     },
                     {
@@ -16352,8 +15892,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 132,
-                        'macro' => ''
+                        'line_nr' => 132
                       }
                     },
                     {
@@ -16411,8 +15950,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 132,
-                'macro' => ''
+                'line_nr' => 132
               },
               'type' => 'def_line'
             },
@@ -16431,8 +15969,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 133,
-                        'macro' => ''
+                        'line_nr' => 133
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -16494,8 +16031,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'code',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 133,
-                                'macro' => ''
+                                'line_nr' => 133
                               }
                             }
                           ],
@@ -16508,8 +16044,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 133,
-                        'macro' => ''
+                        'line_nr' => 133
                       }
                     },
                     {
@@ -16536,8 +16071,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 133,
-                        'macro' => ''
+                        'line_nr' => 133
                       }
                     },
                     {
@@ -16591,8 +16125,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 133,
-                        'macro' => ''
+                        'line_nr' => 133
                       }
                     },
                     {
@@ -16650,8 +16183,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 133,
-                'macro' => ''
+                'line_nr' => 133
               },
               'type' => 'def_line'
             },
@@ -16670,8 +16202,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 134,
-                        'macro' => ''
+                        'line_nr' => 134
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -16733,8 +16264,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 't',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 134,
-                                'macro' => ''
+                                'line_nr' => 134
                               }
                             }
                           ],
@@ -16747,8 +16277,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 134,
-                        'macro' => ''
+                        'line_nr' => 134
                       }
                     },
                     {
@@ -16775,8 +16304,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 134,
-                        'macro' => ''
+                        'line_nr' => 134
                       }
                     },
                     {
@@ -16830,8 +16358,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 134,
-                        'macro' => ''
+                        'line_nr' => 134
                       }
                     },
                     {
@@ -16889,8 +16416,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 134,
-                'macro' => ''
+                'line_nr' => 134
               },
               'type' => 'def_line'
             },
@@ -16909,8 +16435,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 135,
-                        'macro' => ''
+                        'line_nr' => 135
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -16972,8 +16497,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'var',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 135,
-                                'macro' => ''
+                                'line_nr' => 135
                               }
                             }
                           ],
@@ -16986,8 +16510,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 135,
-                        'macro' => ''
+                        'line_nr' => 135
                       }
                     },
                     {
@@ -17014,8 +16537,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 135,
-                        'macro' => ''
+                        'line_nr' => 135
                       }
                     },
                     {
@@ -17069,8 +16591,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 135,
-                        'macro' => ''
+                        'line_nr' => 135
                       }
                     },
                     {
@@ -17128,8 +16649,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 135,
-                'macro' => ''
+                'line_nr' => 135
               },
               'type' => 'def_line'
             },
@@ -17148,8 +16668,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 136,
-                        'macro' => ''
+                        'line_nr' => 136
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -17211,8 +16730,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'var',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 136,
-                                'macro' => ''
+                                'line_nr' => 136
                               }
                             }
                           ],
@@ -17225,8 +16743,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 136,
-                        'macro' => ''
+                        'line_nr' => 136
                       }
                     },
                     {
@@ -17253,8 +16770,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 136,
-                        'macro' => ''
+                        'line_nr' => 136
                       }
                     },
                     {
@@ -17308,8 +16824,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 136,
-                        'macro' => ''
+                        'line_nr' => 136
                       }
                     },
                     {
@@ -17367,8 +16882,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 136,
-                'macro' => ''
+                'line_nr' => 136
               },
               'type' => 'def_line'
             },
@@ -17387,8 +16901,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 137,
-                        'macro' => ''
+                        'line_nr' => 137
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -17450,8 +16963,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'slanted',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 137,
-                                'macro' => ''
+                                'line_nr' => 137
                               }
                             }
                           ],
@@ -17464,8 +16976,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 137,
-                        'macro' => ''
+                        'line_nr' => 137
                       }
                     },
                     {
@@ -17492,8 +17003,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 137,
-                        'macro' => ''
+                        'line_nr' => 137
                       }
                     },
                     {
@@ -17547,8 +17057,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 137,
-                        'macro' => ''
+                        'line_nr' => 137
                       }
                     },
                     {
@@ -17606,8 +17115,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 137,
-                'macro' => ''
+                'line_nr' => 137
               },
               'type' => 'def_line'
             },
@@ -17626,8 +17134,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 138,
-                        'macro' => ''
+                        'line_nr' => 138
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -17689,8 +17196,7 @@ $result_trees{'definition_commands'} = {
                               'cmdname' => 'slanted',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 138,
-                                'macro' => ''
+                                'line_nr' => 138
                               }
                             }
                           ],
@@ -17703,8 +17209,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 138,
-                        'macro' => ''
+                        'line_nr' => 138
                       }
                     },
                     {
@@ -17731,8 +17236,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 138,
-                        'macro' => ''
+                        'line_nr' => 138
                       }
                     },
                     {
@@ -17786,8 +17290,7 @@ $result_trees{'definition_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 138,
-                        'macro' => ''
+                        'line_nr' => 138
                       }
                     },
                     {
@@ -17845,8 +17348,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 138,
-                'macro' => ''
+                'line_nr' => 138
               },
               'type' => 'def_line'
             },
@@ -17892,8 +17394,7 @@ $result_trees{'definition_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 140,
-                'macro' => ''
+                'line_nr' => 140
               }
             }
           ],
@@ -17904,8 +17405,7 @@ $result_trees{'definition_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 124,
-            'macro' => ''
+            'line_nr' => 124
           }
         },
         {
@@ -17924,8 +17424,7 @@ $result_trees{'definition_commands'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
diff --git a/tp/t/results/converters_tests/email_table_command_as_argument.pl 
b/tp/t/results/converters_tests/email_table_command_as_argument.pl
index 76f381b20c..205afa1736 100644
--- a/tp/t/results/converters_tests/email_table_command_as_argument.pl
+++ b/tp/t/results/converters_tests/email_table_command_as_argument.pl
@@ -17,8 +17,7 @@ $result_trees{'email_table_command_as_argument'} = {
                   'cmdname' => 'email',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'command_as_argument'
                 }
@@ -69,8 +68,7 @@ $result_trees{'email_table_command_as_argument'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -121,8 +119,7 @@ $result_trees{'email_table_command_as_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -136,8 +133,7 @@ $result_trees{'email_table_command_as_argument'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/converters_tests/empty_accent.pl 
b/tp/t/results/converters_tests/empty_accent.pl
index d9d921f5ea..802cc32b8f 100644
--- a/tp/t/results/converters_tests/empty_accent.pl
+++ b/tp/t/results/converters_tests/empty_accent.pl
@@ -20,8 +20,7 @@ $result_trees{'empty_accent'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
diff --git a/tp/t/results/converters_tests/enumerate_above_ten.pl 
b/tp/t/results/converters_tests/enumerate_above_ten.pl
index 72d4232ec5..3f6905f92e 100644
--- a/tp/t/results/converters_tests/enumerate_above_ten.pl
+++ b/tp/t/results/converters_tests/enumerate_above_ten.pl
@@ -50,8 +50,7 @@ $result_trees{'enumerate_above_ten'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -82,8 +81,7 @@ $result_trees{'enumerate_above_ten'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -97,8 +95,7 @@ $result_trees{'enumerate_above_ten'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/converters_tests/footnote_no_number.pl 
b/tp/t/results/converters_tests/footnote_no_number.pl
index 264e34c016..45864e8591 100644
--- a/tp/t/results/converters_tests/footnote_no_number.pl
+++ b/tp/t/results/converters_tests/footnote_no_number.pl
@@ -39,8 +39,7 @@ $result_trees{'footnote_no_number'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -76,8 +75,7 @@ $result_trees{'footnote_no_number'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -109,8 +107,7 @@ $result_trees{'footnote_no_number'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -161,8 +158,7 @@ $result_trees{'footnote_no_number'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -201,8 +197,7 @@ $result_trees{'footnote_no_number'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -223,8 +218,7 @@ $result_trees{'footnote_no_number'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
diff --git a/tp/t/results/converters_tests/footnote_no_number_separate.pl 
b/tp/t/results/converters_tests/footnote_no_number_separate.pl
index 16780eb64b..bf337e03ab 100644
--- a/tp/t/results/converters_tests/footnote_no_number_separate.pl
+++ b/tp/t/results/converters_tests/footnote_no_number_separate.pl
@@ -39,8 +39,7 @@ $result_trees{'footnote_no_number_separate'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -76,8 +75,7 @@ $result_trees{'footnote_no_number_separate'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -109,8 +107,7 @@ $result_trees{'footnote_no_number_separate'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -161,8 +158,7 @@ $result_trees{'footnote_no_number_separate'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -201,8 +197,7 @@ $result_trees{'footnote_no_number_separate'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -223,8 +218,7 @@ $result_trees{'footnote_no_number_separate'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
diff --git a/tp/t/results/converters_tests/form_feeds.pl 
b/tp/t/results/converters_tests/form_feeds.pl
index 97bfdc933f..3bde04e5da 100644
--- a/tp/t/results/converters_tests/form_feeds.pl
+++ b/tp/t/results/converters_tests/form_feeds.pl
@@ -46,8 +46,7 @@ $result_trees{'form_feeds'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -156,8 +155,7 @@ $result_trees{'form_feeds'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -188,8 +186,7 @@ $result_trees{'form_feeds'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -220,8 +217,7 @@ $result_trees{'form_feeds'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -260,8 +256,7 @@ $result_trees{'form_feeds'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -327,15 +322,13 @@ $result_trees{'form_feeds'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         },
         {
@@ -368,8 +361,7 @@ $result_trees{'form_feeds'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           }
         },
         {
@@ -397,8 +389,7 @@ $result_trees{'form_feeds'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 24,
-            'macro' => ''
+            'line_nr' => 24
           }
         },
         {
@@ -422,8 +413,7 @@ $result_trees{'form_feeds'} = {
               'cmdname' => 'indicateurl',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             },
             {
@@ -464,8 +454,7 @@ $result_trees{'form_feeds'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -495,8 +484,7 @@ $result_trees{'form_feeds'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -526,8 +514,7 @@ $result_trees{'form_feeds'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -557,8 +544,7 @@ $result_trees{'form_feeds'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -588,8 +574,7 @@ $result_trees{'form_feeds'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -615,8 +600,7 @@ $result_trees{'form_feeds'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               },
               'type' => 'def_line'
             },
@@ -643,8 +627,7 @@ $result_trees{'form_feeds'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 29,
-                        'macro' => ''
+                        'line_nr' => 29
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -674,8 +657,7 @@ $result_trees{'form_feeds'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 29,
-                        'macro' => ''
+                        'line_nr' => 29
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -705,8 +687,7 @@ $result_trees{'form_feeds'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 29,
-                        'macro' => ''
+                        'line_nr' => 29
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -736,8 +717,7 @@ $result_trees{'form_feeds'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 29,
-                        'macro' => ''
+                        'line_nr' => 29
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -767,8 +747,7 @@ $result_trees{'form_feeds'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 29,
-                        'macro' => ''
+                        'line_nr' => 29
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -800,8 +779,7 @@ $result_trees{'form_feeds'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               },
               'type' => 'def_line'
             },
@@ -847,8 +825,7 @@ $result_trees{'form_feeds'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               }
             }
           ],
@@ -859,8 +836,7 @@ $result_trees{'form_feeds'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 28,
-            'macro' => ''
+            'line_nr' => 28
           }
         },
         {
@@ -938,8 +914,7 @@ $result_trees{'form_feeds'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             },
             {
@@ -1002,8 +977,7 @@ $result_trees{'form_feeds'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               }
             },
             {
@@ -1047,8 +1021,7 @@ $result_trees{'form_feeds'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 37,
-                'macro' => ''
+                'line_nr' => 37
               }
             }
           ],
@@ -1059,8 +1032,7 @@ $result_trees{'form_feeds'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 33,
-            'macro' => ''
+            'line_nr' => 33
           }
         },
         {
@@ -1140,8 +1112,7 @@ $result_trees{'form_feeds'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 41,
-                'macro' => ''
+                'line_nr' => 41
               }
             }
           ],
@@ -1157,8 +1128,7 @@ $result_trees{'form_feeds'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 39,
-            'macro' => ''
+            'line_nr' => 39
           }
         },
         {
@@ -1194,8 +1164,7 @@ $result_trees{'form_feeds'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 43,
-            'macro' => ''
+            'line_nr' => 43
           }
         },
         {
@@ -1215,8 +1184,7 @@ $result_trees{'form_feeds'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     }
   ],
diff --git a/tp/t/results/converters_tests/frenchspacing_and_code.pl 
b/tp/t/results/converters_tests/frenchspacing_and_code.pl
index 5a2462256b..ee6f797382 100644
--- a/tp/t/results/converters_tests/frenchspacing_and_code.pl
+++ b/tp/t/results/converters_tests/frenchspacing_and_code.pl
@@ -44,8 +44,7 @@ $result_trees{'frenchspacing_and_code'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -85,8 +84,7 @@ $result_trees{'frenchspacing_and_code'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -122,8 +120,7 @@ $result_trees{'frenchspacing_and_code'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -155,8 +152,7 @@ $result_trees{'frenchspacing_and_code'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -213,8 +209,7 @@ $result_trees{'frenchspacing_and_code'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -280,15 +275,13 @@ $result_trees{'frenchspacing_and_code'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           }
         },
         {
@@ -314,8 +307,7 @@ $result_trees{'frenchspacing_and_code'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -337,8 +329,7 @@ $result_trees{'frenchspacing_and_code'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -360,8 +351,7 @@ $result_trees{'frenchspacing_and_code'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -383,8 +373,7 @@ $result_trees{'frenchspacing_and_code'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -451,8 +440,7 @@ $result_trees{'frenchspacing_and_code'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       }
                     },
                     {
@@ -479,8 +467,7 @@ $result_trees{'frenchspacing_and_code'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       }
                     }
                   ],
@@ -562,8 +549,7 @@ $result_trees{'frenchspacing_and_code'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               },
               'type' => 'def_line'
             },
@@ -609,8 +595,7 @@ $result_trees{'frenchspacing_and_code'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             }
           ],
@@ -621,8 +606,7 @@ $result_trees{'frenchspacing_and_code'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           }
         },
         {
@@ -648,8 +632,7 @@ $result_trees{'frenchspacing_and_code'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -671,8 +654,7 @@ $result_trees{'frenchspacing_and_code'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -694,8 +676,7 @@ $result_trees{'frenchspacing_and_code'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -762,8 +743,7 @@ $result_trees{'frenchspacing_and_code'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -790,8 +770,7 @@ $result_trees{'frenchspacing_and_code'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -873,8 +852,7 @@ $result_trees{'frenchspacing_and_code'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               },
               'type' => 'def_line'
             },
@@ -920,8 +898,7 @@ $result_trees{'frenchspacing_and_code'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             }
           ],
@@ -932,8 +909,7 @@ $result_trees{'frenchspacing_and_code'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 22,
-            'macro' => ''
+            'line_nr' => 22
           }
         },
         {
@@ -971,8 +947,7 @@ $result_trees{'frenchspacing_and_code'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         }
       ],
@@ -986,8 +961,7 @@ $result_trees{'frenchspacing_and_code'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -1019,8 +993,7 @@ $result_trees{'frenchspacing_and_code'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 27,
-        'macro' => ''
+        'line_nr' => 27
       }
     },
     {
@@ -1077,8 +1050,7 @@ $result_trees{'frenchspacing_and_code'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               }
             },
             {
@@ -1144,15 +1116,13 @@ $result_trees{'frenchspacing_and_code'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 34,
-            'macro' => ''
+            'line_nr' => 34
           }
         },
         {
@@ -1178,8 +1148,7 @@ $result_trees{'frenchspacing_and_code'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 38,
-                        'macro' => ''
+                        'line_nr' => 38
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -1201,8 +1170,7 @@ $result_trees{'frenchspacing_and_code'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 38,
-                        'macro' => ''
+                        'line_nr' => 38
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -1224,8 +1192,7 @@ $result_trees{'frenchspacing_and_code'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 38,
-                        'macro' => ''
+                        'line_nr' => 38
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -1247,8 +1214,7 @@ $result_trees{'frenchspacing_and_code'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 38,
-                        'macro' => ''
+                        'line_nr' => 38
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -1315,8 +1281,7 @@ $result_trees{'frenchspacing_and_code'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 38,
-                        'macro' => ''
+                        'line_nr' => 38
                       }
                     },
                     {
@@ -1343,8 +1308,7 @@ $result_trees{'frenchspacing_and_code'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 38,
-                        'macro' => ''
+                        'line_nr' => 38
                       }
                     }
                   ],
@@ -1426,8 +1390,7 @@ $result_trees{'frenchspacing_and_code'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               },
               'type' => 'def_line'
             },
@@ -1473,8 +1436,7 @@ $result_trees{'frenchspacing_and_code'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               }
             }
           ],
@@ -1485,8 +1447,7 @@ $result_trees{'frenchspacing_and_code'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 38,
-            'macro' => ''
+            'line_nr' => 38
           }
         },
         {
@@ -1512,8 +1473,7 @@ $result_trees{'frenchspacing_and_code'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 42,
-                        'macro' => ''
+                        'line_nr' => 42
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -1535,8 +1495,7 @@ $result_trees{'frenchspacing_and_code'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 42,
-                        'macro' => ''
+                        'line_nr' => 42
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -1558,8 +1517,7 @@ $result_trees{'frenchspacing_and_code'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 42,
-                        'macro' => ''
+                        'line_nr' => 42
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -1626,8 +1584,7 @@ $result_trees{'frenchspacing_and_code'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 42,
-                        'macro' => ''
+                        'line_nr' => 42
                       }
                     },
                     {
@@ -1654,8 +1611,7 @@ $result_trees{'frenchspacing_and_code'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 42,
-                        'macro' => ''
+                        'line_nr' => 42
                       }
                     }
                   ],
@@ -1737,8 +1693,7 @@ $result_trees{'frenchspacing_and_code'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               },
               'type' => 'def_line'
             },
@@ -1784,8 +1739,7 @@ $result_trees{'frenchspacing_and_code'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             }
           ],
@@ -1796,8 +1750,7 @@ $result_trees{'frenchspacing_and_code'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 42,
-            'macro' => ''
+            'line_nr' => 42
           }
         }
       ],
@@ -1811,8 +1764,7 @@ $result_trees{'frenchspacing_and_code'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 28,
-        'macro' => ''
+        'line_nr' => 28
       }
     }
   ],
diff --git a/tp/t/results/converters_tests/image_extension.pl 
b/tp/t/results/converters_tests/image_extension.pl
index 722d263ec6..49d238be43 100644
--- a/tp/t/results/converters_tests/image_extension.pl
+++ b/tp/t/results/converters_tests/image_extension.pl
@@ -43,8 +43,7 @@ $result_trees{'image_extension'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -81,7 +80,6 @@ $result_converted_errors{'plaintext'}->{'image_extension'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'could not find @image file `f---ile.txt\' nor alternate text',
     'type' => 'warning'
   }
@@ -98,7 +96,6 @@ $result_converted_errors{'html_text'}->{'image_extension'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@image file `f---ile\' (for HTML) not found, using 
`f---ile.gr--a\'',
     'type' => 'warning'
   }
@@ -119,7 +116,6 @@ $result_converted_errors{'docbook'}->{'image_extension'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@image file `f---ile\' not found, using `f---ile.jpg\'',
     'type' => 'warning'
   }
@@ -136,7 +132,6 @@ $result_converted_errors{'latex_text'}->{'image_extension'} 
= [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@image file `f---ile\' (for LaTeX) not found',
     'type' => 'warning'
   }
@@ -171,7 +166,6 @@ $result_converted_errors{'info'}->{'image_extension'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'could not find @image file `f---ile.txt\' nor alternate text',
     'type' => 'warning'
   }
diff --git a/tp/t/results/converters_tests/image_formatting.pl 
b/tp/t/results/converters_tests/image_formatting.pl
index 133f2f906b..2578722ef1 100644
--- a/tp/t/results/converters_tests/image_formatting.pl
+++ b/tp/t/results/converters_tests/image_formatting.pl
@@ -39,8 +39,7 @@ $result_trees{'image_formatting'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -76,8 +75,7 @@ $result_trees{'image_formatting'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -109,8 +107,7 @@ $result_trees{'image_formatting'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -165,8 +162,7 @@ $result_trees{'image_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -189,8 +185,7 @@ $result_trees{'image_formatting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -223,8 +218,7 @@ $result_trees{'image_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -255,8 +249,7 @@ $result_trees{'image_formatting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -289,8 +282,7 @@ $result_trees{'image_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -324,8 +316,7 @@ $result_trees{'image_formatting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -358,8 +349,7 @@ $result_trees{'image_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -396,8 +386,7 @@ $result_trees{'image_formatting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -430,8 +419,7 @@ $result_trees{'image_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -471,8 +459,7 @@ $result_trees{'image_formatting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -505,8 +492,7 @@ $result_trees{'image_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -561,8 +547,7 @@ $result_trees{'image_formatting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -592,8 +577,7 @@ $result_trees{'image_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -643,8 +627,7 @@ $result_trees{'image_formatting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -677,8 +660,7 @@ $result_trees{'image_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -720,8 +702,7 @@ $result_trees{'image_formatting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -799,8 +780,7 @@ $result_trees{'image_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -824,8 +804,7 @@ $result_trees{'image_formatting'} = {
                       'cmdname' => 'file',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     },
                     {
@@ -877,8 +856,7 @@ $result_trees{'image_formatting'} = {
                       'cmdname' => 'file',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     },
                     {
@@ -897,8 +875,7 @@ $result_trees{'image_formatting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -922,8 +899,7 @@ $result_trees{'image_formatting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -946,8 +922,7 @@ $result_trees{'image_formatting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -1004,8 +979,7 @@ $result_trees{'image_formatting'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 19,
-                    'macro' => ''
+                    'line_nr' => 19
                   }
                 },
                 {
@@ -1028,8 +1002,7 @@ $result_trees{'image_formatting'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 19,
-                    'macro' => ''
+                    'line_nr' => 19
                   }
                 },
                 {
@@ -1062,8 +1035,7 @@ $result_trees{'image_formatting'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 20,
-                    'macro' => ''
+                    'line_nr' => 20
                   }
                 },
                 {
@@ -1094,8 +1066,7 @@ $result_trees{'image_formatting'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 20,
-                    'macro' => ''
+                    'line_nr' => 20
                   }
                 },
                 {
@@ -1128,8 +1099,7 @@ $result_trees{'image_formatting'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 21,
-                    'macro' => ''
+                    'line_nr' => 21
                   }
                 },
                 {
@@ -1163,8 +1133,7 @@ $result_trees{'image_formatting'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 21,
-                    'macro' => ''
+                    'line_nr' => 21
                   }
                 },
                 {
@@ -1197,8 +1166,7 @@ $result_trees{'image_formatting'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 22,
-                    'macro' => ''
+                    'line_nr' => 22
                   }
                 },
                 {
@@ -1235,8 +1203,7 @@ $result_trees{'image_formatting'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 22,
-                    'macro' => ''
+                    'line_nr' => 22
                   }
                 },
                 {
@@ -1269,8 +1236,7 @@ $result_trees{'image_formatting'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 23,
-                    'macro' => ''
+                    'line_nr' => 23
                   }
                 },
                 {
@@ -1310,8 +1276,7 @@ $result_trees{'image_formatting'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 23,
-                    'macro' => ''
+                    'line_nr' => 23
                   }
                 },
                 {
@@ -1344,8 +1309,7 @@ $result_trees{'image_formatting'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 24,
-                    'macro' => ''
+                    'line_nr' => 24
                   }
                 },
                 {
@@ -1400,8 +1364,7 @@ $result_trees{'image_formatting'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 24,
-                    'macro' => ''
+                    'line_nr' => 24
                   }
                 },
                 {
@@ -1434,8 +1397,7 @@ $result_trees{'image_formatting'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 25,
-                    'macro' => ''
+                    'line_nr' => 25
                   }
                 },
                 {
@@ -1477,8 +1439,7 @@ $result_trees{'image_formatting'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 25,
-                    'macro' => ''
+                    'line_nr' => 25
                   }
                 },
                 {
@@ -1556,8 +1517,7 @@ $result_trees{'image_formatting'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 26,
-                    'macro' => ''
+                    'line_nr' => 26
                   }
                 },
                 {
@@ -1581,8 +1541,7 @@ $result_trees{'image_formatting'} = {
                           'cmdname' => 'file',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 26,
-                            'macro' => ''
+                            'line_nr' => 26
                           }
                         },
                         {
@@ -1634,8 +1593,7 @@ $result_trees{'image_formatting'} = {
                           'cmdname' => 'file',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 26,
-                            'macro' => ''
+                            'line_nr' => 26
                           }
                         },
                         {
@@ -1654,8 +1612,7 @@ $result_trees{'image_formatting'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 26,
-                    'macro' => ''
+                    'line_nr' => 26
                   }
                 },
                 {
@@ -1679,8 +1636,7 @@ $result_trees{'image_formatting'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 27,
-                    'macro' => ''
+                    'line_nr' => 27
                   }
                 },
                 {
@@ -1703,8 +1659,7 @@ $result_trees{'image_formatting'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 27,
-                    'macro' => ''
+                    'line_nr' => 27
                   }
                 },
                 {
@@ -1742,15 +1697,13 @@ $result_trees{'image_formatting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           }
         },
         {
@@ -1789,8 +1742,7 @@ $result_trees{'image_formatting'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 30,
-            'macro' => ''
+            'line_nr' => 30
           }
         },
         {
@@ -1839,8 +1791,7 @@ $result_trees{'image_formatting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               }
             },
             {
@@ -1861,8 +1812,7 @@ $result_trees{'image_formatting'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
@@ -2128,7 +2078,6 @@ 
$result_converted_errors{'html_text'}->{'image_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 14,
-    'macro' => '',
     'text' => '@image file `f-ile\' (for HTML) not found, using `f-ile.jpg\'',
     'type' => 'warning'
   },
@@ -2137,7 +2086,6 @@ 
$result_converted_errors{'html_text'}->{'image_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 15,
-    'macro' => '',
     'text' => '@image file `f--ile@.\' (for HTML) not found, using 
`f--ile@.file ext e--xt}\'',
     'type' => 'warning'
   },
@@ -2146,7 +2094,6 @@ 
$result_converted_errors{'html_text'}->{'image_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => '@image file `image\' (for HTML) not found, using `image.jpg\'',
     'type' => 'warning'
   },
@@ -2155,7 +2102,6 @@ 
$result_converted_errors{'html_text'}->{'image_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => '@image file `image\' (for HTML) not found, using `image.jpg\'',
     'type' => 'warning'
   },
@@ -2164,7 +2110,6 @@ 
$result_converted_errors{'html_text'}->{'image_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 25,
-    'macro' => '',
     'text' => '@image file `f-ile\' (for HTML) not found, using `f-ile.jpg\'',
     'type' => 'warning'
   },
@@ -2173,7 +2118,6 @@ 
$result_converted_errors{'html_text'}->{'image_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 26,
-    'macro' => '',
     'text' => '@image file `f--ile@.\' (for HTML) not found, using 
`f--ile@.file ext e--xt}\'',
     'type' => 'warning'
   },
@@ -2182,7 +2126,6 @@ 
$result_converted_errors{'html_text'}->{'image_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 27,
-    'macro' => '',
     'text' => '@image file `image\' (for HTML) not found, using `image.jpg\'',
     'type' => 'warning'
   },
@@ -2191,7 +2134,6 @@ 
$result_converted_errors{'html_text'}->{'image_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 27,
-    'macro' => '',
     'text' => '@image file `image\' (for HTML) not found, using `image.jpg\'',
     'type' => 'warning'
   }
@@ -2282,7 +2224,6 @@ $result_converted_errors{'docbook'}->{'image_formatting'} 
= [
 ',
     'file_name' => '',
     'line_nr' => 14,
-    'macro' => '',
     'text' => '@image file `f-ile\' not found, using `f-ile.jpg\'',
     'type' => 'warning'
   },
@@ -2291,7 +2232,6 @@ $result_converted_errors{'docbook'}->{'image_formatting'} 
= [
 ',
     'file_name' => '',
     'line_nr' => 15,
-    'macro' => '',
     'text' => '@image file `f--ile@.\' not found, using `f--ile@..jpg\'',
     'type' => 'warning'
   },
@@ -2300,7 +2240,6 @@ $result_converted_errors{'docbook'}->{'image_formatting'} 
= [
 ',
     'file_name' => '',
     'line_nr' => 25,
-    'macro' => '',
     'text' => '@image file `f-ile\' not found, using `f-ile.jpg\'',
     'type' => 'warning'
   },
@@ -2309,7 +2248,6 @@ $result_converted_errors{'docbook'}->{'image_formatting'} 
= [
 ',
     'file_name' => '',
     'line_nr' => 26,
-    'macro' => '',
     'text' => '@image file `f--ile@.\' not found, using `f--ile@..jpg\'',
     'type' => 'warning'
   }
@@ -2358,7 +2296,6 @@ 
$result_converted_errors{'latex_text'}->{'image_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 14,
-    'macro' => '',
     'text' => '@image file `f-ile\' (for LaTeX) not found',
     'type' => 'warning'
   },
@@ -2367,7 +2304,6 @@ 
$result_converted_errors{'latex_text'}->{'image_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 15,
-    'macro' => '',
     'text' => '@image file `f--ile@.\' (for LaTeX) not found',
     'type' => 'warning'
   },
@@ -2376,7 +2312,6 @@ 
$result_converted_errors{'latex_text'}->{'image_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => '@image file `image\' (for LaTeX) not found',
     'type' => 'warning'
   },
@@ -2385,7 +2320,6 @@ 
$result_converted_errors{'latex_text'}->{'image_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => '@image file `image\' (for LaTeX) not found',
     'type' => 'warning'
   },
@@ -2394,7 +2328,6 @@ 
$result_converted_errors{'latex_text'}->{'image_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 25,
-    'macro' => '',
     'text' => '@image file `f-ile\' (for LaTeX) not found',
     'type' => 'warning'
   },
@@ -2403,7 +2336,6 @@ 
$result_converted_errors{'latex_text'}->{'image_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 26,
-    'macro' => '',
     'text' => '@image file `f--ile@.\' (for LaTeX) not found',
     'type' => 'warning'
   },
@@ -2412,7 +2344,6 @@ 
$result_converted_errors{'latex_text'}->{'image_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 27,
-    'macro' => '',
     'text' => '@image file `image\' (for LaTeX) not found',
     'type' => 'warning'
   },
@@ -2421,7 +2352,6 @@ 
$result_converted_errors{'latex_text'}->{'image_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 27,
-    'macro' => '',
     'text' => '@image file `image\' (for LaTeX) not found',
     'type' => 'warning'
   }
diff --git a/tp/t/results/converters_tests/image_with_spaces.pl 
b/tp/t/results/converters_tests/image_with_spaces.pl
index 3daf30a682..8114f79157 100644
Binary files a/tp/t/results/converters_tests/image_with_spaces.pl and 
b/tp/t/results/converters_tests/image_with_spaces.pl differ
diff --git a/tp/t/results/converters_tests/index_entry_in_preformatted.pl 
b/tp/t/results/converters_tests/index_entry_in_preformatted.pl
index ee1b560586..56146115c9 100644
--- a/tp/t/results/converters_tests/index_entry_in_preformatted.pl
+++ b/tp/t/results/converters_tests/index_entry_in_preformatted.pl
@@ -39,8 +39,7 @@ $result_trees{'index_entry_in_preformatted'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -76,8 +75,7 @@ $result_trees{'index_entry_in_preformatted'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -109,8 +107,7 @@ $result_trees{'index_entry_in_preformatted'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -186,8 +183,7 @@ $result_trees{'index_entry_in_preformatted'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 8,
-                    'macro' => ''
+                    'line_nr' => 8
                   },
                   'type' => 'index_entry_command'
                 },
@@ -242,8 +238,7 @@ $result_trees{'index_entry_in_preformatted'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   },
                   'type' => 'index_entry_command'
                 },
@@ -284,8 +279,7 @@ $result_trees{'index_entry_in_preformatted'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 13,
-                    'macro' => ''
+                    'line_nr' => 13
                   },
                   'type' => 'index_entry_command'
                 }
@@ -320,15 +314,13 @@ $result_trees{'index_entry_in_preformatted'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         }
       ],
@@ -342,8 +334,7 @@ $result_trees{'index_entry_in_preformatted'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
diff --git a/tp/t/results/converters_tests/indices_in_begin_tables_lists.pl 
b/tp/t/results/converters_tests/indices_in_begin_tables_lists.pl
index 5a19e6a99b..54c30a848b 100644
--- a/tp/t/results/converters_tests/indices_in_begin_tables_lists.pl
+++ b/tp/t/results/converters_tests/indices_in_begin_tables_lists.pl
@@ -59,8 +59,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
       },
       'source_info' => {
         'file_name' => 'indices_in_begin_tables_lists.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -96,8 +95,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
       },
       'source_info' => {
         'file_name' => 'indices_in_begin_tables_lists.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -129,8 +127,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
       },
       'source_info' => {
         'file_name' => 'indices_in_begin_tables_lists.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -165,8 +162,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'minus',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   },
                   'type' => 'command_as_argument'
                 }
@@ -227,8 +223,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   },
                   'type' => 'index_entry_command'
                 }
@@ -257,8 +252,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -289,8 +283,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             }
           ],
@@ -304,8 +297,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -321,8 +313,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'bullet',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 15,
-                    'macro' => ''
+                    'line_nr' => 15
                   },
                   'type' => 'command_as_argument'
                 }
@@ -373,8 +364,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 16,
-                    'macro' => ''
+                    'line_nr' => 16
                   },
                   'type' => 'index_entry_command'
                 }
@@ -403,8 +393,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -453,8 +442,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 18,
-                    'macro' => ''
+                    'line_nr' => 18
                   },
                   'type' => 'index_entry_command'
                 },
@@ -473,8 +461,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -505,8 +492,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             }
           ],
@@ -520,8 +506,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         },
         {
@@ -600,8 +585,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 25,
-                        'macro' => ''
+                        'line_nr' => 25
                       },
                       'type' => 'index_entry_command'
                     }
@@ -633,8 +617,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             },
             {
@@ -665,8 +648,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             }
           ],
@@ -675,8 +657,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 22,
-            'macro' => ''
+            'line_nr' => 22
           }
         },
         {
@@ -740,8 +721,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               }
             },
             {
@@ -772,8 +752,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               }
             }
           ],
@@ -782,8 +761,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 29,
-            'macro' => ''
+            'line_nr' => 29
           }
         },
         {
@@ -845,8 +823,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 37,
-                    'macro' => ''
+                    'line_nr' => 37
                   },
                   'type' => 'index_entry_command'
                 },
@@ -880,8 +857,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 39,
-                'macro' => ''
+                'line_nr' => 39
               }
             },
             {
@@ -912,8 +888,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               }
             }
           ],
@@ -922,8 +897,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 35,
-            'macro' => ''
+            'line_nr' => 35
           }
         },
         {
@@ -985,8 +959,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 44,
-                    'macro' => ''
+                    'line_nr' => 44
                   },
                   'type' => 'index_entry_command'
                 }
@@ -1015,8 +988,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 45,
-                'macro' => ''
+                'line_nr' => 45
               }
             },
             {
@@ -1047,8 +1019,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             }
           ],
@@ -1057,8 +1028,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 42,
-            'macro' => ''
+            'line_nr' => 42
           }
         },
         {
@@ -1115,8 +1085,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 49,
-                    'macro' => ''
+                    'line_nr' => 49
                   },
                   'type' => 'index_entry_command'
                 },
@@ -1150,8 +1119,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 51,
-                'macro' => ''
+                'line_nr' => 51
               }
             },
             {
@@ -1182,8 +1150,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               }
             }
           ],
@@ -1192,8 +1159,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 48,
-            'macro' => ''
+            'line_nr' => 48
           }
         },
         {
@@ -1256,8 +1222,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 56,
-                        'macro' => ''
+                        'line_nr' => 56
                       },
                       'type' => 'index_entry_command'
                     }
@@ -1289,8 +1254,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 57,
-                'macro' => ''
+                'line_nr' => 57
               }
             },
             {
@@ -1321,8 +1285,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             }
           ],
@@ -1331,8 +1294,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 54,
-            'macro' => ''
+            'line_nr' => 54
           }
         },
         {
@@ -1389,8 +1351,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 61,
-                    'macro' => ''
+                    'line_nr' => 61
                   },
                   'type' => 'index_entry_command'
                 },
@@ -1437,8 +1398,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 63,
-                    'macro' => ''
+                    'line_nr' => 63
                   },
                   'type' => 'index_entry_command'
                 },
@@ -1475,8 +1435,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 64,
-                    'macro' => ''
+                    'line_nr' => 64
                   },
                   'type' => 'index_entry_command'
                 }
@@ -1505,8 +1464,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             },
             {
@@ -1537,8 +1495,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 66,
-                'macro' => ''
+                'line_nr' => 66
               }
             }
           ],
@@ -1547,8 +1504,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 60,
-            'macro' => ''
+            'line_nr' => 60
           }
         },
         {
@@ -1564,8 +1520,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 68,
-                    'macro' => ''
+                    'line_nr' => 68
                   },
                   'type' => 'command_as_argument'
                 }
@@ -1627,8 +1582,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 70,
-                        'macro' => ''
+                        'line_nr' => 70
                       }
                     }
                   ],
@@ -1679,8 +1633,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 72,
-                'macro' => ''
+                'line_nr' => 72
               }
             }
           ],
@@ -1694,8 +1647,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 68,
-            'macro' => ''
+            'line_nr' => 68
           }
         },
         {
@@ -1711,8 +1663,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'asis',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 74,
-                    'macro' => ''
+                    'line_nr' => 74
                   },
                   'type' => 'command_as_argument'
                 }
@@ -1764,8 +1715,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 75,
-                        'macro' => ''
+                        'line_nr' => 75
                       }
                     },
                     {
@@ -1815,8 +1765,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 77,
-                        'macro' => ''
+                        'line_nr' => 77
                       }
                     }
                   ],
@@ -1867,8 +1816,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 79,
-                'macro' => ''
+                'line_nr' => 79
               }
             }
           ],
@@ -1882,8 +1830,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 74,
-            'macro' => ''
+            'line_nr' => 74
           }
         },
         {
@@ -1899,8 +1846,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'var',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 81,
-                    'macro' => ''
+                    'line_nr' => 81
                   },
                   'type' => 'command_as_argument'
                 }
@@ -1952,8 +1898,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 82,
-                        'macro' => ''
+                        'line_nr' => 82
                       }
                     },
                     {
@@ -1991,8 +1936,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                           },
                           'source_info' => {
                             'file_name' => 
'indices_in_begin_tables_lists.texi',
-                            'line_nr' => 83,
-                            'macro' => ''
+                            'line_nr' => 83
                           },
                           'type' => 'index_entry_command'
                         },
@@ -2051,8 +1995,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 86,
-                        'macro' => ''
+                        'line_nr' => 86
                       }
                     }
                   ],
@@ -2111,8 +2054,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 88,
-                        'macro' => ''
+                        'line_nr' => 88
                       }
                     },
                     {
@@ -2172,8 +2114,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 92,
-                        'macro' => ''
+                        'line_nr' => 92
                       }
                     }
                   ],
@@ -2230,8 +2171,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 95,
-                'macro' => ''
+                'line_nr' => 95
               }
             }
           ],
@@ -2245,8 +2185,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 81,
-            'macro' => ''
+            'line_nr' => 81
           }
         },
         {
@@ -2262,8 +2201,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 97,
-                    'macro' => ''
+                    'line_nr' => 97
                   },
                   'type' => 'command_as_argument'
                 }
@@ -2316,8 +2254,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 98,
-                        'macro' => ''
+                        'line_nr' => 98
                       },
                       'type' => 'index_entry_command'
                     },
@@ -2356,8 +2293,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 100,
-                        'macro' => ''
+                        'line_nr' => 100
                       }
                     }
                   ],
@@ -2408,8 +2344,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 102,
-                'macro' => ''
+                'line_nr' => 102
               }
             }
           ],
@@ -2423,8 +2358,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 97,
-            'macro' => ''
+            'line_nr' => 97
           }
         },
         {
@@ -2440,8 +2374,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 104,
-                    'macro' => ''
+                    'line_nr' => 104
                   },
                   'type' => 'command_as_argument'
                 }
@@ -2492,8 +2425,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 105,
-                    'macro' => ''
+                    'line_nr' => 105
                   },
                   'type' => 'index_entry_command'
                 },
@@ -2538,8 +2470,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 107,
-                        'macro' => ''
+                        'line_nr' => 107
                       }
                     }
                   ],
@@ -2576,8 +2507,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 108,
-                'macro' => ''
+                'line_nr' => 108
               }
             }
           ],
@@ -2591,8 +2521,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 104,
-            'macro' => ''
+            'line_nr' => 104
           }
         },
         {
@@ -2608,8 +2537,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 110,
-                    'macro' => ''
+                    'line_nr' => 110
                   },
                   'type' => 'command_as_argument'
                 }
@@ -2662,8 +2590,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 111,
-                        'macro' => ''
+                        'line_nr' => 111
                       },
                       'type' => 'index_entry_command'
                     },
@@ -2702,8 +2629,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 113,
-                        'macro' => ''
+                        'line_nr' => 113
                       }
                     }
                   ],
@@ -2754,8 +2680,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 115,
-                'macro' => ''
+                'line_nr' => 115
               }
             }
           ],
@@ -2769,8 +2694,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 110,
-            'macro' => ''
+            'line_nr' => 110
           }
         },
         {
@@ -2786,8 +2710,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 117,
-                    'macro' => ''
+                    'line_nr' => 117
                   },
                   'type' => 'command_as_argument'
                 }
@@ -2838,8 +2761,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 118,
-                    'macro' => ''
+                    'line_nr' => 118
                   },
                   'type' => 'index_entry_command'
                 },
@@ -2884,8 +2806,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 120,
-                        'macro' => ''
+                        'line_nr' => 120
                       }
                     }
                   ],
@@ -2922,8 +2843,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 121,
-                'macro' => ''
+                'line_nr' => 121
               }
             }
           ],
@@ -2937,8 +2857,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 117,
-            'macro' => ''
+            'line_nr' => 117
           }
         },
         {
@@ -2954,8 +2873,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 123,
-                    'macro' => ''
+                    'line_nr' => 123
                   },
                   'type' => 'command_as_argument'
                 }
@@ -3011,8 +2929,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 125,
-                    'macro' => ''
+                    'line_nr' => 125
                   },
                   'type' => 'index_entry_command'
                 },
@@ -3053,8 +2970,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 127,
-                        'macro' => ''
+                        'line_nr' => 127
                       }
                     }
                   ],
@@ -3091,8 +3007,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 128,
-                'macro' => ''
+                'line_nr' => 128
               }
             }
           ],
@@ -3106,8 +3021,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 123,
-            'macro' => ''
+            'line_nr' => 123
           }
         },
         {
@@ -3123,8 +3037,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 130,
-                    'macro' => ''
+                    'line_nr' => 130
                   },
                   'type' => 'command_as_argument'
                 }
@@ -3175,8 +3088,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 131,
-                    'macro' => ''
+                    'line_nr' => 131
                   },
                   'type' => 'index_entry_command'
                 },
@@ -3217,8 +3129,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 133,
-                        'macro' => ''
+                        'line_nr' => 133
                       }
                     }
                   ],
@@ -3255,8 +3166,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 134,
-                'macro' => ''
+                'line_nr' => 134
               }
             }
           ],
@@ -3270,8 +3180,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 130,
-            'macro' => ''
+            'line_nr' => 130
           }
         },
         {
@@ -3287,8 +3196,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 136,
-                    'macro' => ''
+                    'line_nr' => 136
                   },
                   'type' => 'command_as_argument'
                 }
@@ -3351,8 +3259,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 138,
-                        'macro' => ''
+                        'line_nr' => 138
                       },
                       'type' => 'index_entry_command'
                     },
@@ -3381,8 +3288,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 139,
-                        'macro' => ''
+                        'line_nr' => 139
                       }
                     }
                   ],
@@ -3419,8 +3325,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 140,
-                'macro' => ''
+                'line_nr' => 140
               }
             }
           ],
@@ -3434,8 +3339,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 136,
-            'macro' => ''
+            'line_nr' => 136
           }
         },
         {
@@ -3451,8 +3355,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 142,
-                    'macro' => ''
+                    'line_nr' => 142
                   },
                   'type' => 'command_as_argument'
                 }
@@ -3505,8 +3408,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 143,
-                        'macro' => ''
+                        'line_nr' => 143
                       },
                       'type' => 'index_entry_command'
                     },
@@ -3553,8 +3455,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 145,
-                        'macro' => ''
+                        'line_nr' => 145
                       },
                       'type' => 'index_entry_command'
                     },
@@ -3591,8 +3492,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 146,
-                        'macro' => ''
+                        'line_nr' => 146
                       },
                       'type' => 'index_entry_command'
                     },
@@ -3621,8 +3521,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 147,
-                        'macro' => ''
+                        'line_nr' => 147
                       }
                     }
                   ],
@@ -3659,8 +3558,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 148,
-                'macro' => ''
+                'line_nr' => 148
               }
             }
           ],
@@ -3674,8 +3572,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 142,
-            'macro' => ''
+            'line_nr' => 142
           }
         },
         {
@@ -3694,8 +3591,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
       },
       'source_info' => {
         'file_name' => 'indices_in_begin_tables_lists.texi',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -3728,8 +3624,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
       },
       'source_info' => {
         'file_name' => 'indices_in_begin_tables_lists.texi',
-        'line_nr' => 150,
-        'macro' => ''
+        'line_nr' => 150
       }
     },
     {
@@ -3786,8 +3681,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 153,
-            'macro' => ''
+            'line_nr' => 153
           }
         },
         {
@@ -3825,8 +3719,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 155,
-            'macro' => ''
+            'line_nr' => 155
           }
         },
         {
@@ -3864,8 +3757,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 157,
-            'macro' => ''
+            'line_nr' => 157
           }
         },
         {
@@ -3884,8 +3776,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
       },
       'source_info' => {
         'file_name' => 'indices_in_begin_tables_lists.texi',
-        'line_nr' => 151,
-        'macro' => ''
+        'line_nr' => 151
       }
     },
     {
diff --git 
a/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item.pl
 
b/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item.pl
index b36249b814..8c917fb8b4 100644
--- 
a/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item.pl
+++ 
b/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item.pl
@@ -59,8 +59,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
       },
       'source_info' => {
         'file_name' => 'indices_in_begin_tables_lists.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -96,8 +95,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
       },
       'source_info' => {
         'file_name' => 'indices_in_begin_tables_lists.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -129,8 +127,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
       },
       'source_info' => {
         'file_name' => 'indices_in_begin_tables_lists.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -165,8 +162,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'minus',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   },
                   'type' => 'command_as_argument'
                 }
@@ -238,8 +234,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   },
                   'type' => 'index_entry_command'
                 },
@@ -258,8 +253,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -290,8 +284,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             }
           ],
@@ -305,8 +298,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -322,8 +314,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'bullet',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 15,
-                    'macro' => ''
+                    'line_nr' => 15
                   },
                   'type' => 'command_as_argument'
                 }
@@ -383,8 +374,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 16,
-                    'macro' => ''
+                    'line_nr' => 16
                   },
                   'type' => 'index_entry_command'
                 },
@@ -403,8 +393,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -453,8 +442,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 18,
-                    'macro' => ''
+                    'line_nr' => 18
                   },
                   'type' => 'index_entry_command'
                 },
@@ -473,8 +461,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -505,8 +492,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             }
           ],
@@ -520,8 +506,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         },
         {
@@ -614,8 +599,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 25,
-                    'macro' => ''
+                    'line_nr' => 25
                   },
                   'type' => 'index_entry_command'
                 },
@@ -634,8 +618,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             },
             {
@@ -666,8 +649,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             }
           ],
@@ -676,8 +658,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 22,
-            'macro' => ''
+            'line_nr' => 22
           }
         },
         {
@@ -741,8 +722,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               }
             },
             {
@@ -773,8 +753,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               }
             }
           ],
@@ -783,8 +762,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 29,
-            'macro' => ''
+            'line_nr' => 29
           }
         },
         {
@@ -846,8 +824,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 37,
-                    'macro' => ''
+                    'line_nr' => 37
                   },
                   'type' => 'index_entry_command'
                 },
@@ -881,8 +858,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 39,
-                'macro' => ''
+                'line_nr' => 39
               }
             },
             {
@@ -913,8 +889,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               }
             }
           ],
@@ -923,8 +898,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 35,
-            'macro' => ''
+            'line_nr' => 35
           }
         },
         {
@@ -997,8 +971,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 44,
-                    'macro' => ''
+                    'line_nr' => 44
                   },
                   'type' => 'index_entry_command'
                 },
@@ -1017,8 +990,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 45,
-                'macro' => ''
+                'line_nr' => 45
               }
             },
             {
@@ -1049,8 +1021,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             }
           ],
@@ -1059,8 +1030,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 42,
-            'macro' => ''
+            'line_nr' => 42
           }
         },
         {
@@ -1117,8 +1087,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 49,
-                    'macro' => ''
+                    'line_nr' => 49
                   },
                   'type' => 'index_entry_command'
                 },
@@ -1152,8 +1121,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 51,
-                'macro' => ''
+                'line_nr' => 51
               }
             },
             {
@@ -1184,8 +1152,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               }
             }
           ],
@@ -1194,8 +1161,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 48,
-            'macro' => ''
+            'line_nr' => 48
           }
         },
         {
@@ -1272,8 +1238,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 56,
-                    'macro' => ''
+                    'line_nr' => 56
                   },
                   'type' => 'index_entry_command'
                 },
@@ -1292,8 +1257,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 57,
-                'macro' => ''
+                'line_nr' => 57
               }
             },
             {
@@ -1324,8 +1288,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             }
           ],
@@ -1334,8 +1297,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 54,
-            'macro' => ''
+            'line_nr' => 54
           }
         },
         {
@@ -1401,8 +1363,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 61,
-                    'macro' => ''
+                    'line_nr' => 61
                   },
                   'type' => 'index_entry_command'
                 },
@@ -1449,8 +1410,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 63,
-                    'macro' => ''
+                    'line_nr' => 63
                   },
                   'type' => 'index_entry_command'
                 },
@@ -1487,8 +1447,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 64,
-                    'macro' => ''
+                    'line_nr' => 64
                   },
                   'type' => 'index_entry_command'
                 },
@@ -1507,8 +1466,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             },
             {
@@ -1539,8 +1497,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 66,
-                'macro' => ''
+                'line_nr' => 66
               }
             }
           ],
@@ -1549,8 +1506,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 60,
-            'macro' => ''
+            'line_nr' => 60
           }
         },
         {
@@ -1566,8 +1522,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 68,
-                    'macro' => ''
+                    'line_nr' => 68
                   },
                   'type' => 'command_as_argument'
                 }
@@ -1629,8 +1584,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 70,
-                        'macro' => ''
+                        'line_nr' => 70
                       }
                     }
                   ],
@@ -1681,8 +1635,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 72,
-                'macro' => ''
+                'line_nr' => 72
               }
             }
           ],
@@ -1696,8 +1649,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 68,
-            'macro' => ''
+            'line_nr' => 68
           }
         },
         {
@@ -1713,8 +1665,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'asis',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 74,
-                    'macro' => ''
+                    'line_nr' => 74
                   },
                   'type' => 'command_as_argument'
                 }
@@ -1766,8 +1717,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 75,
-                        'macro' => ''
+                        'line_nr' => 75
                       }
                     },
                     {
@@ -1817,8 +1767,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 77,
-                        'macro' => ''
+                        'line_nr' => 77
                       }
                     }
                   ],
@@ -1869,8 +1818,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 79,
-                'macro' => ''
+                'line_nr' => 79
               }
             }
           ],
@@ -1884,8 +1832,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 74,
-            'macro' => ''
+            'line_nr' => 74
           }
         },
         {
@@ -1901,8 +1848,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'var',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 81,
-                    'macro' => ''
+                    'line_nr' => 81
                   },
                   'type' => 'command_as_argument'
                 }
@@ -1954,8 +1900,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 82,
-                        'macro' => ''
+                        'line_nr' => 82
                       }
                     },
                     {
@@ -1993,8 +1938,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                           },
                           'source_info' => {
                             'file_name' => 
'indices_in_begin_tables_lists.texi',
-                            'line_nr' => 83,
-                            'macro' => ''
+                            'line_nr' => 83
                           },
                           'type' => 'index_entry_command'
                         },
@@ -2053,8 +1997,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 86,
-                        'macro' => ''
+                        'line_nr' => 86
                       }
                     }
                   ],
@@ -2113,8 +2056,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 88,
-                        'macro' => ''
+                        'line_nr' => 88
                       }
                     },
                     {
@@ -2174,8 +2116,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 92,
-                        'macro' => ''
+                        'line_nr' => 92
                       }
                     }
                   ],
@@ -2232,8 +2173,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 95,
-                'macro' => ''
+                'line_nr' => 95
               }
             }
           ],
@@ -2247,8 +2187,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 81,
-            'macro' => ''
+            'line_nr' => 81
           }
         },
         {
@@ -2264,8 +2203,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 97,
-                    'macro' => ''
+                    'line_nr' => 97
                   },
                   'type' => 'command_as_argument'
                 }
@@ -2318,8 +2256,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 98,
-                        'macro' => ''
+                        'line_nr' => 98
                       },
                       'type' => 'index_entry_command'
                     },
@@ -2358,8 +2295,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 100,
-                        'macro' => ''
+                        'line_nr' => 100
                       }
                     }
                   ],
@@ -2410,8 +2346,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 102,
-                'macro' => ''
+                'line_nr' => 102
               }
             }
           ],
@@ -2425,8 +2360,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 97,
-            'macro' => ''
+            'line_nr' => 97
           }
         },
         {
@@ -2442,8 +2376,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 104,
-                    'macro' => ''
+                    'line_nr' => 104
                   },
                   'type' => 'command_as_argument'
                 }
@@ -2494,8 +2427,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 105,
-                    'macro' => ''
+                    'line_nr' => 105
                   },
                   'type' => 'index_entry_command'
                 },
@@ -2540,8 +2472,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 107,
-                        'macro' => ''
+                        'line_nr' => 107
                       }
                     }
                   ],
@@ -2578,8 +2509,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 108,
-                'macro' => ''
+                'line_nr' => 108
               }
             }
           ],
@@ -2593,8 +2523,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 104,
-            'macro' => ''
+            'line_nr' => 104
           }
         },
         {
@@ -2610,8 +2539,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 110,
-                    'macro' => ''
+                    'line_nr' => 110
                   },
                   'type' => 'command_as_argument'
                 }
@@ -2664,8 +2592,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 111,
-                        'macro' => ''
+                        'line_nr' => 111
                       },
                       'type' => 'index_entry_command'
                     },
@@ -2704,8 +2631,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 113,
-                        'macro' => ''
+                        'line_nr' => 113
                       }
                     }
                   ],
@@ -2756,8 +2682,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 115,
-                'macro' => ''
+                'line_nr' => 115
               }
             }
           ],
@@ -2771,8 +2696,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 110,
-            'macro' => ''
+            'line_nr' => 110
           }
         },
         {
@@ -2788,8 +2712,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 117,
-                    'macro' => ''
+                    'line_nr' => 117
                   },
                   'type' => 'command_as_argument'
                 }
@@ -2840,8 +2763,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 118,
-                    'macro' => ''
+                    'line_nr' => 118
                   },
                   'type' => 'index_entry_command'
                 },
@@ -2886,8 +2808,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 120,
-                        'macro' => ''
+                        'line_nr' => 120
                       }
                     }
                   ],
@@ -2924,8 +2845,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 121,
-                'macro' => ''
+                'line_nr' => 121
               }
             }
           ],
@@ -2939,8 +2859,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 117,
-            'macro' => ''
+            'line_nr' => 117
           }
         },
         {
@@ -2956,8 +2875,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 123,
-                    'macro' => ''
+                    'line_nr' => 123
                   },
                   'type' => 'command_as_argument'
                 }
@@ -3013,8 +2931,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 125,
-                    'macro' => ''
+                    'line_nr' => 125
                   },
                   'type' => 'index_entry_command'
                 },
@@ -3055,8 +2972,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 127,
-                        'macro' => ''
+                        'line_nr' => 127
                       }
                     }
                   ],
@@ -3093,8 +3009,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 128,
-                'macro' => ''
+                'line_nr' => 128
               }
             }
           ],
@@ -3108,8 +3023,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 123,
-            'macro' => ''
+            'line_nr' => 123
           }
         },
         {
@@ -3125,8 +3039,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 130,
-                    'macro' => ''
+                    'line_nr' => 130
                   },
                   'type' => 'command_as_argument'
                 }
@@ -3177,8 +3090,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 131,
-                    'macro' => ''
+                    'line_nr' => 131
                   },
                   'type' => 'index_entry_command'
                 },
@@ -3219,8 +3131,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 133,
-                        'macro' => ''
+                        'line_nr' => 133
                       }
                     }
                   ],
@@ -3257,8 +3168,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 134,
-                'macro' => ''
+                'line_nr' => 134
               }
             }
           ],
@@ -3272,8 +3182,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 130,
-            'macro' => ''
+            'line_nr' => 130
           }
         },
         {
@@ -3289,8 +3198,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 136,
-                    'macro' => ''
+                    'line_nr' => 136
                   },
                   'type' => 'command_as_argument'
                 }
@@ -3353,8 +3261,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 138,
-                        'macro' => ''
+                        'line_nr' => 138
                       },
                       'type' => 'index_entry_command'
                     },
@@ -3383,8 +3290,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 139,
-                        'macro' => ''
+                        'line_nr' => 139
                       }
                     }
                   ],
@@ -3421,8 +3327,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 140,
-                'macro' => ''
+                'line_nr' => 140
               }
             }
           ],
@@ -3436,8 +3341,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 136,
-            'macro' => ''
+            'line_nr' => 136
           }
         },
         {
@@ -3453,8 +3357,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 142,
-                    'macro' => ''
+                    'line_nr' => 142
                   },
                   'type' => 'command_as_argument'
                 }
@@ -3507,8 +3410,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 143,
-                        'macro' => ''
+                        'line_nr' => 143
                       },
                       'type' => 'index_entry_command'
                     },
@@ -3555,8 +3457,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 145,
-                        'macro' => ''
+                        'line_nr' => 145
                       },
                       'type' => 'index_entry_command'
                     },
@@ -3593,8 +3494,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 146,
-                        'macro' => ''
+                        'line_nr' => 146
                       },
                       'type' => 'index_entry_command'
                     },
@@ -3623,8 +3523,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 147,
-                        'macro' => ''
+                        'line_nr' => 147
                       }
                     }
                   ],
@@ -3661,8 +3560,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 148,
-                'macro' => ''
+                'line_nr' => 148
               }
             }
           ],
@@ -3676,8 +3574,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 142,
-            'macro' => ''
+            'line_nr' => 142
           }
         },
         {
@@ -3696,8 +3593,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
       },
       'source_info' => {
         'file_name' => 'indices_in_begin_tables_lists.texi',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -3730,8 +3626,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
       },
       'source_info' => {
         'file_name' => 'indices_in_begin_tables_lists.texi',
-        'line_nr' => 150,
-        'macro' => ''
+        'line_nr' => 150
       }
     },
     {
@@ -3788,8 +3683,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 153,
-            'macro' => ''
+            'line_nr' => 153
           }
         },
         {
@@ -3827,8 +3721,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 155,
-            'macro' => ''
+            'line_nr' => 155
           }
         },
         {
@@ -3866,8 +3759,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 157,
-            'macro' => ''
+            'line_nr' => 157
           }
         },
         {
@@ -3886,8 +3778,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
       },
       'source_info' => {
         'file_name' => 'indices_in_begin_tables_lists.texi',
-        'line_nr' => 151,
-        'macro' => ''
+        'line_nr' => 151
       }
     },
     {
diff --git a/tp/t/results/converters_tests/inline.pl 
b/tp/t/results/converters_tests/inline.pl
index 9371d87585..6712b30748 100644
--- a/tp/t/results/converters_tests/inline.pl
+++ b/tp/t/results/converters_tests/inline.pl
@@ -47,8 +47,7 @@ $result_trees{'inline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -86,8 +85,7 @@ $result_trees{'inline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -125,8 +123,7 @@ $result_trees{'inline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -164,8 +161,7 @@ $result_trees{'inline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -198,8 +194,7 @@ $result_trees{'inline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -245,8 +240,7 @@ $result_trees{'inline'} = {
                                           ],
                                           'source_info' => {
                                             'file_name' => '',
-                                            'line_nr' => 7,
-                                            'macro' => ''
+                                            'line_nr' => 7
                                           },
                                           'type' => 'balanced_braces'
                                         }
@@ -257,8 +251,7 @@ $result_trees{'inline'} = {
                                   'cmdname' => 'code',
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 7,
-                                    'macro' => ''
+                                    'line_nr' => 7
                                   }
                                 },
                                 {
@@ -267,8 +260,7 @@ $result_trees{'inline'} = {
                               ],
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 7,
-                                'macro' => ''
+                                'line_nr' => 7
                               },
                               'type' => 'balanced_braces'
                             },
@@ -280,8 +272,7 @@ $result_trees{'inline'} = {
                               ],
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 7,
-                                'macro' => ''
+                                'line_nr' => 7
                               },
                               'type' => 'balanced_braces'
                             }
@@ -292,8 +283,7 @@ $result_trees{'inline'} = {
                       'cmdname' => 'math',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     },
                     {
@@ -315,8 +305,7 @@ $result_trees{'inline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -369,8 +358,7 @@ $result_trees{'inline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -408,8 +396,7 @@ $result_trees{'inline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -447,8 +434,7 @@ $result_trees{'inline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -486,8 +472,7 @@ $result_trees{'inline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -520,8 +505,7 @@ $result_trees{'inline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -563,8 +547,7 @@ $result_trees{'inline'} = {
                                   ],
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 15,
-                                    'macro' => ''
+                                    'line_nr' => 15
                                   },
                                   'type' => 'balanced_braces'
                                 }
@@ -575,8 +558,7 @@ $result_trees{'inline'} = {
                           'cmdname' => 'code',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 15,
-                            'macro' => ''
+                            'line_nr' => 15
                           }
                         },
                         {
@@ -585,8 +567,7 @@ $result_trees{'inline'} = {
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       },
                       'type' => 'balanced_braces'
                     },
@@ -598,8 +579,7 @@ $result_trees{'inline'} = {
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       },
                       'type' => 'balanced_braces'
                     },
@@ -622,8 +602,7 @@ $result_trees{'inline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
diff --git a/tp/t/results/converters_tests/inline_expand_tex.pl 
b/tp/t/results/converters_tests/inline_expand_tex.pl
index fbd92f920d..e0f7d99039 100644
--- a/tp/t/results/converters_tests/inline_expand_tex.pl
+++ b/tp/t/results/converters_tests/inline_expand_tex.pl
@@ -42,8 +42,7 @@ $result_trees{'inline_expand_tex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -76,8 +75,7 @@ $result_trees{'inline_expand_tex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -110,8 +108,7 @@ $result_trees{'inline_expand_tex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -144,8 +141,7 @@ $result_trees{'inline_expand_tex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -181,8 +177,7 @@ $result_trees{'inline_expand_tex'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     }
                   ],
@@ -201,8 +196,7 @@ $result_trees{'inline_expand_tex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -235,8 +229,7 @@ $result_trees{'inline_expand_tex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -284,8 +277,7 @@ $result_trees{'inline_expand_tex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -318,8 +310,7 @@ $result_trees{'inline_expand_tex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -352,8 +343,7 @@ $result_trees{'inline_expand_tex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -386,8 +376,7 @@ $result_trees{'inline_expand_tex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -429,8 +418,7 @@ $result_trees{'inline_expand_tex'} = {
                                   ],
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 14,
-                                    'macro' => ''
+                                    'line_nr' => 14
                                   },
                                   'type' => 'balanced_braces'
                                 }
@@ -441,8 +429,7 @@ $result_trees{'inline_expand_tex'} = {
                           'cmdname' => 'code',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 14,
-                            'macro' => ''
+                            'line_nr' => 14
                           }
                         },
                         {
@@ -451,8 +438,7 @@ $result_trees{'inline_expand_tex'} = {
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       },
                       'type' => 'balanced_braces'
                     },
@@ -475,8 +461,7 @@ $result_trees{'inline_expand_tex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -509,8 +494,7 @@ $result_trees{'inline_expand_tex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -568,7 +552,6 @@ $result_errors{'inline_expand_tex'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
   },
@@ -577,7 +560,6 @@ $result_errors{'inline_expand_tex'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
   },
@@ -586,7 +568,6 @@ $result_errors{'inline_expand_tex'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   },
@@ -595,7 +576,6 @@ $result_errors{'inline_expand_tex'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/converters_tests/inlinefmtifelse.pl 
b/tp/t/results/converters_tests/inlinefmtifelse.pl
index d8566c9503..a00f8b8ce1 100644
--- a/tp/t/results/converters_tests/inlinefmtifelse.pl
+++ b/tp/t/results/converters_tests/inlinefmtifelse.pl
@@ -46,8 +46,7 @@ $result_trees{'inlinefmtifelse'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -89,8 +88,7 @@ $result_trees{'inlinefmtifelse'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -134,8 +132,7 @@ $result_trees{'inlinefmtifelse'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -177,8 +174,7 @@ $result_trees{'inlinefmtifelse'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -225,8 +221,7 @@ $result_trees{'inlinefmtifelse'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -291,8 +286,7 @@ $result_trees{'inlinefmtifelse'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -357,8 +351,7 @@ $result_trees{'inlinefmtifelse'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -410,8 +403,7 @@ $result_trees{'inlinefmtifelse'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -463,8 +455,7 @@ $result_trees{'inlinefmtifelse'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -516,8 +507,7 @@ $result_trees{'inlinefmtifelse'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
diff --git a/tp/t/results/converters_tests/inlinefmtifelse_with_commands.pl 
b/tp/t/results/converters_tests/inlinefmtifelse_with_commands.pl
index 3f1820e653..14f315a275 100644
--- a/tp/t/results/converters_tests/inlinefmtifelse_with_commands.pl
+++ b/tp/t/results/converters_tests/inlinefmtifelse_with_commands.pl
@@ -49,8 +49,7 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     }
                   ],
@@ -64,8 +63,7 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -120,8 +118,7 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
                       'cmdname' => 'emph',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -135,8 +132,7 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -191,8 +187,7 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
                       'cmdname' => 'env',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
@@ -211,8 +206,7 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -275,8 +269,7 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
                       'cmdname' => 'strong',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     },
                     {
@@ -298,8 +291,7 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -351,8 +343,7 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
                       'cmdname' => 'var',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -369,8 +360,7 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -422,8 +412,7 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
                       'cmdname' => 'sc',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     },
                     {
@@ -440,8 +429,7 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
diff --git a/tp/t/results/converters_tests/inlinefmtspaces.pl 
b/tp/t/results/converters_tests/inlinefmtspaces.pl
index 9755a509cc..6897b232bf 100644
--- a/tp/t/results/converters_tests/inlinefmtspaces.pl
+++ b/tp/t/results/converters_tests/inlinefmtspaces.pl
@@ -46,8 +46,7 @@ $result_trees{'inlinefmtspaces'} = {
                       'cmdname' => 'lbracechar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     },
                     {
@@ -74,8 +73,7 @@ $result_trees{'inlinefmtspaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -119,8 +117,7 @@ $result_trees{'inlinefmtspaces'} = {
                       'cmdname' => 'acronym',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -142,8 +139,7 @@ $result_trees{'inlinefmtspaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
diff --git a/tp/t/results/converters_tests/inlineifsetifclear.pl 
b/tp/t/results/converters_tests/inlineifsetifclear.pl
index c4021c8109..142e4e3b51 100644
--- a/tp/t/results/converters_tests/inlineifsetifclear.pl
+++ b/tp/t/results/converters_tests/inlineifsetifclear.pl
@@ -42,8 +42,7 @@ $result_trees{'inlineifsetifclear'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -86,8 +85,7 @@ $result_trees{'inlineifsetifclear'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -152,8 +150,7 @@ $result_trees{'inlineifsetifclear'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -201,8 +198,7 @@ $result_trees{'inlineifsetifclear'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
diff --git a/tp/t/results/converters_tests/inlineifsetifclearspaces.pl 
b/tp/t/results/converters_tests/inlineifsetifclearspaces.pl
index 168df7fa5a..ababb2d36b 100644
--- a/tp/t/results/converters_tests/inlineifsetifclearspaces.pl
+++ b/tp/t/results/converters_tests/inlineifsetifclearspaces.pl
@@ -56,8 +56,7 @@ $result_trees{'inlineifsetifclearspaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -114,8 +113,7 @@ $result_trees{'inlineifsetifclearspaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -193,8 +191,7 @@ $result_trees{'inlineifsetifclearspaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -255,8 +252,7 @@ $result_trees{'inlineifsetifclearspaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -303,7 +299,6 @@ $result_errors{'inlineifsetifclearspaces'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'command `@inlineifclear\' must not be followed by new line',
     'type' => 'warning'
   },
@@ -312,7 +307,6 @@ $result_errors{'inlineifsetifclearspaces'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'command `@inlineifset\' must not be followed by new line',
     'type' => 'warning'
   }
diff --git a/tp/t/results/converters_tests/inlinerawspaces.pl 
b/tp/t/results/converters_tests/inlinerawspaces.pl
index fbb96d53b7..5278943d26 100644
--- a/tp/t/results/converters_tests/inlinerawspaces.pl
+++ b/tp/t/results/converters_tests/inlinerawspaces.pl
@@ -46,8 +46,7 @@ $result_trees{'inlinerawspaces'} = {
                       'cmdname' => 'lbracechar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     },
                     {
@@ -69,8 +68,7 @@ $result_trees{'inlinerawspaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -114,8 +112,7 @@ $result_trees{'inlinerawspaces'} = {
                       'cmdname' => 'acronym',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -142,8 +139,7 @@ $result_trees{'inlinerawspaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
diff --git a/tp/t/results/converters_tests/line_breaks.pl 
b/tp/t/results/converters_tests/line_breaks.pl
index fa8f5a06a2..5f444fdbe5 100644
--- a/tp/t/results/converters_tests/line_breaks.pl
+++ b/tp/t/results/converters_tests/line_breaks.pl
@@ -66,15 +66,13 @@ $result_trees{'line_breaks'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -113,8 +111,7 @@ $result_trees{'line_breaks'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -148,8 +145,7 @@ $result_trees{'line_breaks'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -188,8 +184,7 @@ $result_trees{'line_breaks'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -205,8 +200,7 @@ $result_trees{'line_breaks'} = {
                   'cmdname' => 'strong',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   },
                   'type' => 'command_as_argument'
                 }
@@ -257,8 +251,7 @@ $result_trees{'line_breaks'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     },
                     {
@@ -292,8 +285,7 @@ $result_trees{'line_breaks'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     }
                   ],
@@ -344,8 +336,7 @@ $result_trees{'line_breaks'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
@@ -359,8 +350,7 @@ $result_trees{'line_breaks'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -430,8 +420,7 @@ $result_trees{'line_breaks'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             }
           ],
@@ -442,8 +431,7 @@ $result_trees{'line_breaks'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           }
         }
       ],
diff --git a/tp/t/results/converters_tests/link.pl 
b/tp/t/results/converters_tests/link.pl
index bf84a90dd6..8abfda6679 100644
--- a/tp/t/results/converters_tests/link.pl
+++ b/tp/t/results/converters_tests/link.pl
@@ -39,8 +39,7 @@ $result_trees{'link'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -92,8 +91,7 @@ $result_trees{'link'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -156,8 +154,7 @@ $result_trees{'link'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
@@ -192,8 +189,7 @@ $result_trees{'link'} = {
               'cmdname' => 'link',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -245,8 +241,7 @@ $result_trees{'link'} = {
               'cmdname' => 'link',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -297,8 +292,7 @@ $result_trees{'link'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
@@ -333,8 +327,7 @@ $result_trees{'link'} = {
               'cmdname' => 'link',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -386,8 +379,7 @@ $result_trees{'link'} = {
               'cmdname' => 'link',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -450,8 +442,7 @@ $result_trees{'link'} = {
               'cmdname' => 'link',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -505,8 +496,7 @@ $result_trees{'link'} = {
               'cmdname' => 'link',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             },
             {
@@ -528,8 +518,7 @@ $result_trees{'link'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     }
   ],
@@ -659,7 +648,6 @@ $result_errors{'link'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'node `Two\' unreferenced',
     'type' => 'warning'
   }
diff --git a/tp/t/results/converters_tests/non_empty_part.pl 
b/tp/t/results/converters_tests/non_empty_part.pl
index 79b45962fa..7400270d42 100644
--- a/tp/t/results/converters_tests/non_empty_part.pl
+++ b/tp/t/results/converters_tests/non_empty_part.pl
@@ -57,8 +57,7 @@ $result_trees{'non_empty_part'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -90,8 +89,7 @@ $result_trees{'non_empty_part'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -175,8 +173,7 @@ $result_trees{'non_empty_part'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -223,8 +220,7 @@ $result_trees{'non_empty_part'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'menu_entry'
             },
@@ -256,15 +252,13 @@ $result_trees{'non_empty_part'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -283,8 +277,7 @@ $result_trees{'non_empty_part'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -334,8 +327,7 @@ $result_trees{'non_empty_part'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -374,8 +366,7 @@ $result_trees{'non_empty_part'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -425,8 +416,7 @@ $result_trees{'non_empty_part'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 19,
-        'macro' => ''
+        'line_nr' => 19
       }
     },
     {
@@ -458,8 +448,7 @@ $result_trees{'non_empty_part'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 23,
-        'macro' => ''
+        'line_nr' => 23
       }
     },
     {
@@ -509,8 +498,7 @@ $result_trees{'non_empty_part'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     {
@@ -549,8 +537,7 @@ $result_trees{'non_empty_part'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 28,
-        'macro' => ''
+        'line_nr' => 28
       }
     },
     {
@@ -600,8 +587,7 @@ $result_trees{'non_empty_part'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 30,
-        'macro' => ''
+        'line_nr' => 30
       }
     },
     {
@@ -651,8 +637,7 @@ $result_trees{'non_empty_part'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 34,
-        'macro' => ''
+        'line_nr' => 34
       }
     },
     {
@@ -691,8 +676,7 @@ $result_trees{'non_empty_part'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 38,
-        'macro' => ''
+        'line_nr' => 38
       }
     },
     {
@@ -742,8 +726,7 @@ $result_trees{'non_empty_part'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 40,
-        'macro' => ''
+        'line_nr' => 40
       }
     },
     {
@@ -782,8 +765,7 @@ $result_trees{'non_empty_part'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 44,
-        'macro' => ''
+        'line_nr' => 44
       }
     },
     {
@@ -822,8 +804,7 @@ $result_trees{'non_empty_part'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 46,
-        'macro' => ''
+        'line_nr' => 46
       }
     }
   ],
@@ -1254,7 +1235,6 @@ $result_errors{'non_empty_part'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@part should not be associated with @top',
     'type' => 'warning'
   },
@@ -1263,7 +1243,6 @@ $result_errors{'non_empty_part'} = [
 ',
     'file_name' => '',
     'line_nr' => 24,
-    'macro' => '',
     'text' => '@node precedes @part, but parts may not be associated with 
nodes',
     'type' => 'warning'
   },
@@ -1272,7 +1251,6 @@ $result_errors{'non_empty_part'} = [
 ',
     'file_name' => '',
     'line_nr' => 19,
-    'macro' => '',
     'text' => 'no sectioning command associated with @part',
     'type' => 'warning'
   },
@@ -1281,7 +1259,6 @@ $result_errors{'non_empty_part'} = [
 ',
     'file_name' => '',
     'line_nr' => 30,
-    'macro' => '',
     'text' => 'no sectioning command associated with @part',
     'type' => 'warning'
   },
@@ -1290,7 +1267,6 @@ $result_errors{'non_empty_part'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@part not empty',
     'type' => 'warning'
   },
@@ -1299,7 +1275,6 @@ $result_errors{'non_empty_part'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => '@part not empty',
     'type' => 'warning'
   },
@@ -1308,7 +1283,6 @@ $result_errors{'non_empty_part'} = [
 ',
     'file_name' => '',
     'line_nr' => 19,
-    'macro' => '',
     'text' => '@part not empty',
     'type' => 'warning'
   },
@@ -1317,7 +1291,6 @@ $result_errors{'non_empty_part'} = [
 ',
     'file_name' => '',
     'line_nr' => 24,
-    'macro' => '',
     'text' => '@part not empty',
     'type' => 'warning'
   },
@@ -1326,7 +1299,6 @@ $result_errors{'non_empty_part'} = [
 ',
     'file_name' => '',
     'line_nr' => 30,
-    'macro' => '',
     'text' => '@part not empty',
     'type' => 'warning'
   },
@@ -1335,7 +1307,6 @@ $result_errors{'non_empty_part'} = [
 ',
     'file_name' => '',
     'line_nr' => 34,
-    'macro' => '',
     'text' => '@part not empty',
     'type' => 'warning'
   },
@@ -1344,7 +1315,6 @@ $result_errors{'non_empty_part'} = [
 ',
     'file_name' => '',
     'line_nr' => 40,
-    'macro' => '',
     'text' => '@part not empty',
     'type' => 'warning'
   },
@@ -1353,7 +1323,6 @@ $result_errors{'non_empty_part'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@menu reference to nonexistent node `chapter node\'',
     'type' => 'error'
   },
@@ -1362,7 +1331,6 @@ $result_errors{'non_empty_part'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'node `Top\' lacks menu item for `node between part and 
chapter\' despite being its Up target',
     'type' => 'warning'
   },
@@ -1371,7 +1339,6 @@ $result_errors{'non_empty_part'} = [
 ',
     'file_name' => '',
     'line_nr' => 44,
-    'macro' => '',
     'text' => 'node `node between part and chapter\' unreferenced',
     'type' => 'warning'
   }
diff --git a/tp/t/results/converters_tests/non_empty_part_no_top_node_output.pl 
b/tp/t/results/converters_tests/non_empty_part_no_top_node_output.pl
index 8b47d42aa9..e071505de1 100644
--- a/tp/t/results/converters_tests/non_empty_part_no_top_node_output.pl
+++ b/tp/t/results/converters_tests/non_empty_part_no_top_node_output.pl
@@ -57,8 +57,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -90,8 +89,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -175,8 +173,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -223,8 +220,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'menu_entry'
             },
@@ -256,15 +252,13 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -283,8 +277,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -334,8 +327,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -374,8 +366,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -425,8 +416,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 19,
-        'macro' => ''
+        'line_nr' => 19
       }
     },
     {
@@ -458,8 +448,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 23,
-        'macro' => ''
+        'line_nr' => 23
       }
     },
     {
@@ -509,8 +498,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     {
@@ -549,8 +537,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 28,
-        'macro' => ''
+        'line_nr' => 28
       }
     },
     {
@@ -600,8 +587,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 30,
-        'macro' => ''
+        'line_nr' => 30
       }
     },
     {
@@ -651,8 +637,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 34,
-        'macro' => ''
+        'line_nr' => 34
       }
     },
     {
@@ -691,8 +676,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 38,
-        'macro' => ''
+        'line_nr' => 38
       }
     },
     {
@@ -742,8 +726,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 40,
-        'macro' => ''
+        'line_nr' => 40
       }
     },
     {
@@ -782,8 +765,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 44,
-        'macro' => ''
+        'line_nr' => 44
       }
     },
     {
@@ -822,8 +804,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 46,
-        'macro' => ''
+        'line_nr' => 46
       }
     }
   ],
@@ -1254,7 +1235,6 @@ $result_errors{'non_empty_part_no_top_node_output'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@part should not be associated with @top',
     'type' => 'warning'
   },
@@ -1263,7 +1243,6 @@ $result_errors{'non_empty_part_no_top_node_output'} = [
 ',
     'file_name' => '',
     'line_nr' => 24,
-    'macro' => '',
     'text' => '@node precedes @part, but parts may not be associated with 
nodes',
     'type' => 'warning'
   },
@@ -1272,7 +1251,6 @@ $result_errors{'non_empty_part_no_top_node_output'} = [
 ',
     'file_name' => '',
     'line_nr' => 19,
-    'macro' => '',
     'text' => 'no sectioning command associated with @part',
     'type' => 'warning'
   },
@@ -1281,7 +1259,6 @@ $result_errors{'non_empty_part_no_top_node_output'} = [
 ',
     'file_name' => '',
     'line_nr' => 30,
-    'macro' => '',
     'text' => 'no sectioning command associated with @part',
     'type' => 'warning'
   },
@@ -1290,7 +1267,6 @@ $result_errors{'non_empty_part_no_top_node_output'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@part not empty',
     'type' => 'warning'
   },
@@ -1299,7 +1275,6 @@ $result_errors{'non_empty_part_no_top_node_output'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => '@part not empty',
     'type' => 'warning'
   },
@@ -1308,7 +1283,6 @@ $result_errors{'non_empty_part_no_top_node_output'} = [
 ',
     'file_name' => '',
     'line_nr' => 19,
-    'macro' => '',
     'text' => '@part not empty',
     'type' => 'warning'
   },
@@ -1317,7 +1291,6 @@ $result_errors{'non_empty_part_no_top_node_output'} = [
 ',
     'file_name' => '',
     'line_nr' => 24,
-    'macro' => '',
     'text' => '@part not empty',
     'type' => 'warning'
   },
@@ -1326,7 +1299,6 @@ $result_errors{'non_empty_part_no_top_node_output'} = [
 ',
     'file_name' => '',
     'line_nr' => 30,
-    'macro' => '',
     'text' => '@part not empty',
     'type' => 'warning'
   },
@@ -1335,7 +1307,6 @@ $result_errors{'non_empty_part_no_top_node_output'} = [
 ',
     'file_name' => '',
     'line_nr' => 34,
-    'macro' => '',
     'text' => '@part not empty',
     'type' => 'warning'
   },
@@ -1344,7 +1315,6 @@ $result_errors{'non_empty_part_no_top_node_output'} = [
 ',
     'file_name' => '',
     'line_nr' => 40,
-    'macro' => '',
     'text' => '@part not empty',
     'type' => 'warning'
   },
@@ -1353,7 +1323,6 @@ $result_errors{'non_empty_part_no_top_node_output'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@menu reference to nonexistent node `chapter node\'',
     'type' => 'error'
   },
@@ -1362,7 +1331,6 @@ $result_errors{'non_empty_part_no_top_node_output'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'node `Top\' lacks menu item for `node between part and 
chapter\' despite being its Up target',
     'type' => 'warning'
   },
@@ -1371,7 +1339,6 @@ $result_errors{'non_empty_part_no_top_node_output'} = [
 ',
     'file_name' => '',
     'line_nr' => 44,
-    'macro' => '',
     'text' => 'node `node between part and chapter\' unreferenced',
     'type' => 'warning'
   }
diff --git a/tp/t/results/converters_tests/normal_font_in_monospace.pl 
b/tp/t/results/converters_tests/normal_font_in_monospace.pl
index bca0bd651e..13b7890b93 100644
--- a/tp/t/results/converters_tests/normal_font_in_monospace.pl
+++ b/tp/t/results/converters_tests/normal_font_in_monospace.pl
@@ -49,8 +49,7 @@ $result_trees{'normal_font_in_monospace'} = {
                           'cmdname' => 'code',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 2,
-                            'macro' => ''
+                            'line_nr' => 2
                           }
                         }
                       ],
@@ -60,8 +59,7 @@ $result_trees{'normal_font_in_monospace'} = {
                   'cmdname' => 'r',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   }
                 },
                 {
@@ -99,15 +97,13 @@ $result_trees{'normal_font_in_monospace'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -145,8 +141,7 @@ $result_trees{'normal_font_in_monospace'} = {
                               'cmdname' => 'file',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 5,
-                                'macro' => ''
+                                'line_nr' => 5
                               }
                             }
                           ],
@@ -156,8 +151,7 @@ $result_trees{'normal_font_in_monospace'} = {
                       'cmdname' => 'r',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
@@ -167,8 +161,7 @@ $result_trees{'normal_font_in_monospace'} = {
               'cmdname' => 'command',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
diff --git 
a/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl 
b/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
index f97d1dfeb0..93336be84b 100644
--- a/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
+++ b/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
@@ -44,8 +44,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -81,8 +80,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -115,8 +113,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -174,8 +171,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -214,8 +210,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -256,8 +251,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           },
           'type' => 'index_entry_command'
         },
@@ -299,8 +293,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           },
           'type' => 'index_entry_command'
         },
@@ -342,8 +335,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           },
           'type' => 'index_entry_command'
         },
@@ -382,8 +374,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -422,8 +413,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         },
         {
@@ -464,8 +454,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 21,
-            'macro' => ''
+            'line_nr' => 21
           },
           'type' => 'index_entry_command'
         },
@@ -504,8 +493,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           }
         },
         {
@@ -544,8 +532,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           }
         },
         {
@@ -586,8 +573,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 27,
-            'macro' => ''
+            'line_nr' => 27
           },
           'type' => 'index_entry_command'
         },
@@ -626,8 +612,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 29,
-            'macro' => ''
+            'line_nr' => 29
           }
         }
       ],
@@ -641,8 +626,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
diff --git a/tp/t/results/converters_tests/raw_block_commands.pl 
b/tp/t/results/converters_tests/raw_block_commands.pl
index 510962e573..5ed8a36c07 100644
--- a/tp/t/results/converters_tests/raw_block_commands.pl
+++ b/tp/t/results/converters_tests/raw_block_commands.pl
@@ -65,15 +65,13 @@ $result_trees{'raw_block_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -132,15 +130,13 @@ $result_trees{'raw_block_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -199,15 +195,13 @@ $result_trees{'raw_block_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -249,8 +243,7 @@ $result_trees{'raw_block_commands'} = {
                           ],
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 15,
-                            'macro' => ''
+                            'line_nr' => 15
                           },
                           'type' => 'balanced_braces'
                         }
@@ -261,8 +254,7 @@ $result_trees{'raw_block_commands'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 15,
-                    'macro' => ''
+                    'line_nr' => 15
                   }
                 },
                 {
@@ -300,15 +292,13 @@ $result_trees{'raw_block_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           }
         },
         {
@@ -350,8 +340,7 @@ $result_trees{'raw_block_commands'} = {
                           ],
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 19,
-                            'macro' => ''
+                            'line_nr' => 19
                           },
                           'type' => 'balanced_braces'
                         }
@@ -362,8 +351,7 @@ $result_trees{'raw_block_commands'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 19,
-                    'macro' => ''
+                    'line_nr' => 19
                   }
                 },
                 {
@@ -401,15 +389,13 @@ $result_trees{'raw_block_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           }
         }
       ],
diff --git a/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl 
b/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl
index c75fb73136..c18cea7e86 100644
--- a/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl
+++ b/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl
@@ -65,15 +65,13 @@ $result_trees{'raw_block_commands_expand_tex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -132,15 +130,13 @@ $result_trees{'raw_block_commands_expand_tex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -199,15 +195,13 @@ $result_trees{'raw_block_commands_expand_tex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -249,8 +243,7 @@ $result_trees{'raw_block_commands_expand_tex'} = {
                           ],
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 15,
-                            'macro' => ''
+                            'line_nr' => 15
                           },
                           'type' => 'balanced_braces'
                         }
@@ -261,8 +254,7 @@ $result_trees{'raw_block_commands_expand_tex'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 15,
-                    'macro' => ''
+                    'line_nr' => 15
                   }
                 },
                 {
@@ -300,15 +292,13 @@ $result_trees{'raw_block_commands_expand_tex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           }
         },
         {
@@ -350,8 +340,7 @@ $result_trees{'raw_block_commands_expand_tex'} = {
                           ],
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 19,
-                            'macro' => ''
+                            'line_nr' => 19
                           },
                           'type' => 'balanced_braces'
                         }
@@ -362,8 +351,7 @@ $result_trees{'raw_block_commands_expand_tex'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 19,
-                    'macro' => ''
+                    'line_nr' => 19
                   }
                 },
                 {
@@ -401,15 +389,13 @@ $result_trees{'raw_block_commands_expand_tex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           }
         }
       ],
@@ -480,7 +466,6 @@ 
$result_converted_errors{'html_text'}->{'raw_block_commands_expand_tex'} = [
 ',
     'file_name' => '',
     'line_nr' => 14,
-    'macro' => '',
     'text' => 'raw format tex is not converted',
     'type' => 'warning'
   }
diff --git a/tp/t/results/converters_tests/ref_error_formatting.pl 
b/tp/t/results/converters_tests/ref_error_formatting.pl
index d522a738d3..cfe4ad9199 100644
--- a/tp/t/results/converters_tests/ref_error_formatting.pl
+++ b/tp/t/results/converters_tests/ref_error_formatting.pl
@@ -42,8 +42,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -71,8 +70,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -115,8 +113,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -139,8 +136,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -173,8 +169,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -200,8 +195,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -234,8 +228,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -264,8 +257,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -298,8 +290,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -331,8 +322,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -365,8 +355,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -402,8 +391,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -436,8 +424,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -476,8 +463,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -510,8 +496,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -552,8 +537,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -586,8 +570,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -631,8 +614,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -665,8 +647,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -713,8 +694,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -747,8 +727,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -794,8 +773,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -828,8 +806,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -878,8 +855,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -912,8 +888,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -964,8 +939,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -998,8 +972,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -1053,8 +1026,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -1087,8 +1059,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -1157,8 +1128,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -1191,8 +1161,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -1238,8 +1207,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -1272,8 +1240,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -1322,8 +1289,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -1356,8 +1322,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -1421,8 +1386,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -1455,8 +1419,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -1505,8 +1468,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -1539,8 +1501,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -1574,8 +1535,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -1608,8 +1568,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -1643,8 +1602,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -1677,8 +1635,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -1715,8 +1672,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -1749,8 +1705,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               }
             },
             {
@@ -1789,8 +1744,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               }
             },
             {
@@ -1823,8 +1777,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             },
             {
@@ -1866,8 +1819,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             },
             {
@@ -1900,8 +1852,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             },
             {
@@ -1958,8 +1909,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             },
             {
@@ -1992,8 +1942,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             },
             {
@@ -2027,8 +1976,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             },
             {
@@ -2061,8 +2009,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             },
             {
@@ -2099,8 +2046,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             },
             {
@@ -2133,8 +2079,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -2186,8 +2131,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -2220,8 +2164,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               }
             },
             {
@@ -2258,8 +2201,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               }
             },
             {
@@ -2302,8 +2244,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               }
             },
             {
@@ -2331,8 +2272,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'inforef',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               }
             },
             {
@@ -2365,8 +2305,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             },
             {
@@ -2392,8 +2331,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'inforef',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             },
             {
@@ -2426,8 +2364,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             },
             {
@@ -2463,8 +2400,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'inforef',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             },
             {
@@ -2494,8 +2430,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               }
             },
             {
@@ -2510,8 +2445,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'inforef',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               }
             },
             {
@@ -2554,8 +2488,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               }
             },
             {
@@ -2608,8 +2541,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'inforef',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               }
             },
             {
@@ -2642,8 +2574,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 39,
-                'macro' => ''
+                'line_nr' => 39
               }
             },
             {
@@ -2671,8 +2602,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'inforef',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 39,
-                'macro' => ''
+                'line_nr' => 39
               }
             },
             {
@@ -2705,8 +2635,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               }
             },
             {
@@ -2747,8 +2676,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'inforef',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               }
             },
             {
@@ -2781,8 +2709,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 41,
-                'macro' => ''
+                'line_nr' => 41
               }
             },
             {
@@ -2820,8 +2747,7 @@ $result_trees{'ref_error_formatting'} = {
               'cmdname' => 'inforef',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 41,
-                'macro' => ''
+                'line_nr' => 41
               }
             },
             {
@@ -2950,7 +2876,6 @@ $result_errors{'ref_error_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'command @ref missing a node or external manual argument',
     'type' => 'warning'
   },
@@ -2959,7 +2884,6 @@ $result_errors{'ref_error_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'command @ref missing a node or external manual argument',
     'type' => 'warning'
   },
@@ -2968,7 +2892,6 @@ $result_errors{'ref_error_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 22,
-    'macro' => '',
     'text' => 'command @ref missing a node or external manual argument',
     'type' => 'warning'
   },
@@ -2977,7 +2900,6 @@ $result_errors{'ref_error_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 33,
-    'macro' => '',
     'text' => '@inforef is obsolete',
     'type' => 'warning'
   },
@@ -2986,7 +2908,6 @@ $result_errors{'ref_error_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 33,
-    'macro' => '',
     'text' => 'command @inforef missing a node or external manual argument',
     'type' => 'warning'
   },
@@ -2995,7 +2916,6 @@ $result_errors{'ref_error_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 34,
-    'macro' => '',
     'text' => '@inforef is obsolete',
     'type' => 'warning'
   },
@@ -3004,7 +2924,6 @@ $result_errors{'ref_error_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 35,
-    'macro' => '',
     'text' => '@inforef is obsolete',
     'type' => 'warning'
   },
@@ -3013,7 +2932,6 @@ $result_errors{'ref_error_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 36,
-    'macro' => '',
     'text' => '@inforef is obsolete',
     'type' => 'warning'
   },
@@ -3022,7 +2940,6 @@ $result_errors{'ref_error_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 36,
-    'macro' => '',
     'text' => 'command @inforef missing a node or external manual argument',
     'type' => 'warning'
   },
@@ -3031,7 +2948,6 @@ $result_errors{'ref_error_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 38,
-    'macro' => '',
     'text' => '@inforef is obsolete',
     'type' => 'warning'
   },
@@ -3040,7 +2956,6 @@ $result_errors{'ref_error_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 39,
-    'macro' => '',
     'text' => '@inforef is obsolete',
     'type' => 'warning'
   },
@@ -3049,7 +2964,6 @@ $result_errors{'ref_error_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 40,
-    'macro' => '',
     'text' => '@inforef is obsolete',
     'type' => 'warning'
   },
@@ -3058,7 +2972,6 @@ $result_errors{'ref_error_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 41,
-    'macro' => '',
     'text' => '@inforef is obsolete',
     'type' => 'warning'
   },
@@ -3067,7 +2980,6 @@ $result_errors{'ref_error_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@ref reference to nonexistent node `node\'',
     'type' => 'error'
   },
@@ -3076,7 +2988,6 @@ $result_errors{'ref_error_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => '@ref reference to nonexistent node `node\'',
     'type' => 'error'
   },
@@ -3085,7 +2996,6 @@ $result_errors{'ref_error_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@ref reference to nonexistent node `node\'',
     'type' => 'error'
   },
@@ -3094,7 +3004,6 @@ $result_errors{'ref_error_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 12,
-    'macro' => '',
     'text' => '@ref reference to nonexistent node `node\'',
     'type' => 'error'
   },
@@ -3103,7 +3012,6 @@ $result_errors{'ref_error_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 39,
-    'macro' => '',
     'text' => '@inforef reference to nonexistent node `node\'',
     'type' => 'error'
   },
@@ -3112,7 +3020,6 @@ $result_errors{'ref_error_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 40,
-    'macro' => '',
     'text' => '@inforef reference to nonexistent node `node\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/converters_tests/ref_in_sectioning.pl 
b/tp/t/results/converters_tests/ref_in_sectioning.pl
index 17d4771e6c..dc88af611b 100644
--- a/tp/t/results/converters_tests/ref_in_sectioning.pl
+++ b/tp/t/results/converters_tests/ref_in_sectioning.pl
@@ -20,8 +20,7 @@ $result_trees{'ref_in_sectioning'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -61,8 +60,7 @@ $result_trees{'ref_in_sectioning'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -94,8 +92,7 @@ $result_trees{'ref_in_sectioning'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -123,8 +120,7 @@ $result_trees{'ref_in_sectioning'} = {
               'cmdname' => 'pxref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -183,8 +179,7 @@ $result_trees{'ref_in_sectioning'} = {
               'cmdname' => 'pxref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -264,8 +259,7 @@ $result_trees{'ref_in_sectioning'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -312,8 +306,7 @@ $result_trees{'ref_in_sectioning'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               },
               'type' => 'menu_entry'
             },
@@ -345,15 +338,13 @@ $result_trees{'ref_in_sectioning'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -370,8 +361,7 @@ $result_trees{'ref_in_sectioning'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -403,8 +393,7 @@ $result_trees{'ref_in_sectioning'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -469,8 +458,7 @@ $result_trees{'ref_in_sectioning'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -504,8 +492,7 @@ $result_trees{'ref_in_sectioning'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -537,8 +524,7 @@ $result_trees{'ref_in_sectioning'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -567,8 +553,7 @@ $result_trees{'ref_in_sectioning'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -602,8 +587,7 @@ $result_trees{'ref_in_sectioning'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -635,8 +619,7 @@ $result_trees{'ref_in_sectioning'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -664,8 +647,7 @@ $result_trees{'ref_in_sectioning'} = {
               'cmdname' => 'pxref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -724,8 +706,7 @@ $result_trees{'ref_in_sectioning'} = {
               'cmdname' => 'pxref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -759,8 +740,7 @@ $result_trees{'ref_in_sectioning'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -802,8 +782,7 @@ $result_trees{'ref_in_sectioning'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -837,8 +816,7 @@ $result_trees{'ref_in_sectioning'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 19,
-        'macro' => ''
+        'line_nr' => 19
       }
     },
     {
@@ -863,8 +841,7 @@ $result_trees{'ref_in_sectioning'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 21,
-                        'macro' => ''
+                        'line_nr' => 21
                       }
                     }
                   ],
@@ -897,8 +874,7 @@ $result_trees{'ref_in_sectioning'} = {
                       'cmdname' => 'samp',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 21,
-                        'macro' => ''
+                        'line_nr' => 21
                       }
                     }
                   ],
@@ -913,8 +889,7 @@ $result_trees{'ref_in_sectioning'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -948,8 +923,7 @@ $result_trees{'ref_in_sectioning'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 21,
-        'macro' => ''
+        'line_nr' => 21
       }
     },
     {
@@ -974,8 +948,7 @@ $result_trees{'ref_in_sectioning'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 23,
-                        'macro' => ''
+                        'line_nr' => 23
                       }
                     }
                   ],
@@ -1011,8 +984,7 @@ $result_trees{'ref_in_sectioning'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -1046,8 +1018,7 @@ $result_trees{'ref_in_sectioning'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 23,
-        'macro' => ''
+        'line_nr' => 23
       }
     },
     {
@@ -1100,8 +1071,7 @@ $result_trees{'ref_in_sectioning'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               }
             },
             {
@@ -1135,8 +1105,7 @@ $result_trees{'ref_in_sectioning'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
@@ -1189,8 +1158,7 @@ $result_trees{'ref_in_sectioning'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             },
             {
@@ -1224,8 +1192,7 @@ $result_trees{'ref_in_sectioning'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 27,
-        'macro' => ''
+        'line_nr' => 27
       }
     },
     {
@@ -1266,8 +1233,7 @@ $result_trees{'ref_in_sectioning'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             },
             {
@@ -1301,8 +1267,7 @@ $result_trees{'ref_in_sectioning'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 29,
-        'macro' => ''
+        'line_nr' => 29
       }
     },
     {
@@ -1337,8 +1302,7 @@ $result_trees{'ref_in_sectioning'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               }
             },
             {
@@ -1372,8 +1336,7 @@ $result_trees{'ref_in_sectioning'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 31,
-        'macro' => ''
+        'line_nr' => 31
       }
     },
     {
@@ -1427,8 +1390,7 @@ $result_trees{'ref_in_sectioning'} = {
               'cmdname' => 'inforef',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               }
             },
             {
@@ -1462,8 +1424,7 @@ $result_trees{'ref_in_sectioning'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 33,
-        'macro' => ''
+        'line_nr' => 33
       }
     },
     {
@@ -1524,8 +1485,7 @@ $result_trees{'ref_in_sectioning'} = {
               'cmdname' => 'pxref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             },
             {
@@ -1559,8 +1519,7 @@ $result_trees{'ref_in_sectioning'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 35,
-        'macro' => ''
+        'line_nr' => 35
       }
     },
     {
@@ -1601,8 +1560,7 @@ $result_trees{'ref_in_sectioning'} = {
               'cmdname' => 'pxref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 37,
-                'macro' => ''
+                'line_nr' => 37
               }
             },
             {
@@ -1636,8 +1594,7 @@ $result_trees{'ref_in_sectioning'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 37,
-        'macro' => ''
+        'line_nr' => 37
       }
     },
     {
@@ -1679,8 +1636,7 @@ $result_trees{'ref_in_sectioning'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 39,
-                'macro' => ''
+                'line_nr' => 39
               }
             },
             {
@@ -1714,8 +1670,7 @@ $result_trees{'ref_in_sectioning'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 39,
-        'macro' => ''
+        'line_nr' => 39
       }
     },
     {
@@ -1745,8 +1700,7 @@ $result_trees{'ref_in_sectioning'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 41,
-                'macro' => ''
+                'line_nr' => 41
               }
             },
             {
@@ -1780,8 +1734,7 @@ $result_trees{'ref_in_sectioning'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 41,
-        'macro' => ''
+        'line_nr' => 41
       }
     }
   ],
@@ -2241,7 +2194,6 @@ $result_errors{'ref_in_sectioning'} = [
 ',
     'file_name' => '',
     'line_nr' => 33,
-    'macro' => '',
     'text' => '@inforef is obsolete',
     'type' => 'warning'
   },
@@ -2250,7 +2202,6 @@ $result_errors{'ref_in_sectioning'} = [
 ',
     'file_name' => '',
     'line_nr' => 21,
-    'macro' => '',
     'text' => '@ref to `@code{node}\', different from node name `node\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/converters_tests/references_to_top_no_top_output.pl 
b/tp/t/results/converters_tests/references_to_top_no_top_output.pl
index b03aacecb6..0cf4c313c6 100644
--- a/tp/t/results/converters_tests/references_to_top_no_top_output.pl
+++ b/tp/t/results/converters_tests/references_to_top_no_top_output.pl
@@ -54,8 +54,7 @@ $result_trees{'references_to_top_no_top_output'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -104,8 +103,7 @@ $result_trees{'references_to_top_no_top_output'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     },
                     {
@@ -144,15 +142,13 @@ $result_trees{'references_to_top_no_top_output'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -195,8 +191,7 @@ $result_trees{'references_to_top_no_top_output'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -255,8 +250,7 @@ $result_trees{'references_to_top_no_top_output'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           }
         },
         {
@@ -292,8 +286,7 @@ $result_trees{'references_to_top_no_top_output'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -337,8 +330,7 @@ $result_trees{'references_to_top_no_top_output'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 18,
-                            'macro' => ''
+                            'line_nr' => 18
                           }
                         }
                       ],
@@ -351,8 +343,7 @@ $result_trees{'references_to_top_no_top_output'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -378,8 +369,7 @@ $result_trees{'references_to_top_no_top_output'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
@@ -441,8 +431,7 @@ $result_trees{'references_to_top_no_top_output'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 24,
-                    'macro' => ''
+                    'line_nr' => 24
                   }
                 },
                 {
@@ -479,8 +468,7 @@ $result_trees{'references_to_top_no_top_output'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 25,
-                            'macro' => ''
+                            'line_nr' => 25
                           }
                         }
                       ],
@@ -496,8 +484,7 @@ $result_trees{'references_to_top_no_top_output'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               }
             },
             {
@@ -533,8 +520,7 @@ $result_trees{'references_to_top_no_top_output'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             }
           ],
@@ -552,8 +538,7 @@ $result_trees{'references_to_top_no_top_output'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 22,
-            'macro' => ''
+            'line_nr' => 22
           }
         },
         {
@@ -594,8 +579,7 @@ $result_trees{'references_to_top_no_top_output'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 28,
-            'macro' => ''
+            'line_nr' => 28
           },
           'type' => 'index_entry_command'
         },
@@ -627,8 +611,7 @@ $result_trees{'references_to_top_no_top_output'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -661,8 +644,7 @@ $result_trees{'references_to_top_no_top_output'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 32,
-        'macro' => ''
+        'line_nr' => 32
       }
     },
     {
@@ -713,8 +695,7 @@ $result_trees{'references_to_top_no_top_output'} = {
               'cmdname' => 'pxref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             },
             {
@@ -743,8 +724,7 @@ $result_trees{'references_to_top_no_top_output'} = {
               'cmdname' => 'pxref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               }
             },
             {
@@ -773,8 +753,7 @@ $result_trees{'references_to_top_no_top_output'} = {
               'cmdname' => 'pxref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 37,
-                'macro' => ''
+                'line_nr' => 37
               }
             },
             {
@@ -803,8 +782,7 @@ $result_trees{'references_to_top_no_top_output'} = {
               'cmdname' => 'pxref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               }
             },
             {
@@ -833,8 +811,7 @@ $result_trees{'references_to_top_no_top_output'} = {
               'cmdname' => 'pxref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 39,
-                'macro' => ''
+                'line_nr' => 39
               }
             },
             {
@@ -863,8 +840,7 @@ $result_trees{'references_to_top_no_top_output'} = {
               'cmdname' => 'pxref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               }
             },
             {
@@ -912,8 +888,7 @@ $result_trees{'references_to_top_no_top_output'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 42,
-            'macro' => ''
+            'line_nr' => 42
           },
           'type' => 'index_entry_command'
         },
@@ -952,8 +927,7 @@ $result_trees{'references_to_top_no_top_output'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 44,
-            'macro' => ''
+            'line_nr' => 44
           }
         },
         {
@@ -1022,8 +996,7 @@ $result_trees{'references_to_top_no_top_output'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               }
             },
             {
@@ -1059,8 +1032,7 @@ $result_trees{'references_to_top_no_top_output'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             }
           ],
@@ -1078,8 +1050,7 @@ $result_trees{'references_to_top_no_top_output'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 46,
-            'macro' => ''
+            'line_nr' => 46
           }
         },
         {
@@ -1115,8 +1086,7 @@ $result_trees{'references_to_top_no_top_output'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 51,
-            'macro' => ''
+            'line_nr' => 51
           }
         }
       ],
@@ -1130,8 +1100,7 @@ $result_trees{'references_to_top_no_top_output'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 33,
-        'macro' => ''
+        'line_nr' => 33
       }
     }
   ],
diff --git a/tp/t/results/converters_tests/refs_formatting.pl 
b/tp/t/results/converters_tests/refs_formatting.pl
index 3588f3d50b..708275c67e 100644
--- a/tp/t/results/converters_tests/refs_formatting.pl
+++ b/tp/t/results/converters_tests/refs_formatting.pl
@@ -39,8 +39,7 @@ $result_trees{'refs_formatting'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -95,8 +94,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -132,8 +130,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -166,8 +163,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -206,8 +202,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -240,8 +235,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -282,8 +276,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -316,8 +309,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -361,8 +353,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -395,8 +386,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -443,8 +433,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -477,8 +466,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -524,8 +512,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -558,8 +545,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -608,8 +594,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -642,8 +627,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -694,8 +678,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -728,8 +711,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -783,8 +765,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -817,8 +798,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -887,8 +867,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -921,8 +900,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -968,8 +946,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -1002,8 +979,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -1052,8 +1028,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -1086,8 +1061,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -1151,8 +1125,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -1185,8 +1158,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -1235,8 +1207,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -1279,8 +1250,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -1329,8 +1299,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -1363,8 +1332,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -1416,8 +1384,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -1450,8 +1417,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -1506,8 +1472,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -1540,8 +1505,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -1599,8 +1563,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -1633,8 +1596,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -1694,8 +1656,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -1728,8 +1689,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -1789,8 +1749,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -1823,8 +1782,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               }
             },
             {
@@ -1887,8 +1845,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               }
             },
             {
@@ -1921,8 +1878,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             },
             {
@@ -1987,8 +1943,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             },
             {
@@ -2021,8 +1976,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             },
             {
@@ -2090,8 +2044,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             },
             {
@@ -2124,8 +2077,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             },
             {
@@ -2208,8 +2160,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             },
             {
@@ -2242,8 +2193,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             },
             {
@@ -2303,8 +2253,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             },
             {
@@ -2337,8 +2286,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -2401,8 +2349,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -2435,8 +2382,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               }
             },
             {
@@ -2514,8 +2460,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               }
             },
             {
@@ -2548,8 +2493,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               }
             },
             {
@@ -2612,8 +2556,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               }
             },
             {
@@ -2656,8 +2599,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             },
             {
@@ -2710,8 +2652,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'inforef',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             },
             {
@@ -2744,8 +2685,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             },
             {
@@ -2773,8 +2713,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'inforef',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             },
             {
@@ -2807,8 +2746,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               }
             },
             {
@@ -2849,8 +2787,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'inforef',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               }
             },
             {
@@ -2883,8 +2820,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 37,
-                'macro' => ''
+                'line_nr' => 37
               }
             },
             {
@@ -2922,8 +2858,7 @@ $result_trees{'refs_formatting'} = {
               'cmdname' => 'inforef',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 37,
-                'macro' => ''
+                'line_nr' => 37
               }
             },
             {
@@ -2944,8 +2879,7 @@ $result_trees{'refs_formatting'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
@@ -3129,7 +3063,6 @@ $result_errors{'refs_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 34,
-    'macro' => '',
     'text' => '@inforef is obsolete',
     'type' => 'warning'
   },
@@ -3138,7 +3071,6 @@ $result_errors{'refs_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 35,
-    'macro' => '',
     'text' => '@inforef is obsolete',
     'type' => 'warning'
   },
@@ -3147,7 +3079,6 @@ $result_errors{'refs_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 36,
-    'macro' => '',
     'text' => '@inforef is obsolete',
     'type' => 'warning'
   },
@@ -3156,7 +3087,6 @@ $result_errors{'refs_formatting'} = [
 ',
     'file_name' => '',
     'line_nr' => 37,
-    'macro' => '',
     'text' => '@inforef is obsolete',
     'type' => 'warning'
   }
diff --git a/tp/t/results/converters_tests/setfilename_no_extension.pl 
b/tp/t/results/converters_tests/setfilename_no_extension.pl
index 41364667df..b468a8cecd 100644
--- a/tp/t/results/converters_tests/setfilename_no_extension.pl
+++ b/tp/t/results/converters_tests/setfilename_no_extension.pl
@@ -39,8 +39,7 @@ $result_trees{'setfilename_no_extension'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -83,8 +82,7 @@ $result_trees{'setfilename_no_extension'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -120,8 +118,7 @@ $result_trees{'setfilename_no_extension'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -169,8 +166,7 @@ $result_trees{'setfilename_no_extension'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     }
   ],
diff --git a/tp/t/results/converters_tests/simplest_no_node_section.pl 
b/tp/t/results/converters_tests/simplest_no_node_section.pl
index 66ab76fa91..5aa2b18142 100644
--- a/tp/t/results/converters_tests/simplest_no_node_section.pl
+++ b/tp/t/results/converters_tests/simplest_no_node_section.pl
@@ -59,8 +59,7 @@ $result_trees{'simplest_no_node_section'} = {
               },
               'source_info' => {
                 'file_name' => 'simplest_no_node_section.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
diff --git a/tp/t/results/converters_tests/simplest_test_prefix.pl 
b/tp/t/results/converters_tests/simplest_test_prefix.pl
index 98edf84341..04c4ddde5d 100644
--- a/tp/t/results/converters_tests/simplest_test_prefix.pl
+++ b/tp/t/results/converters_tests/simplest_test_prefix.pl
@@ -86,8 +86,7 @@ $result_trees{'simplest_test_prefix'} = {
       },
       'source_info' => {
         'file_name' => 'simplest.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
diff --git a/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl 
b/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
index bfc10aee2e..57ff0f411b 100644
--- a/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
+++ b/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
@@ -46,8 +46,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -120,8 +119,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                               'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 6,
-                                'macro' => ''
+                                'line_nr' => 6
                               }
                             },
                             {
@@ -136,8 +134,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                               'cmdname' => 'aa',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 6,
-                                'macro' => ''
+                                'line_nr' => 6
                               }
                             },
                             {
@@ -152,8 +149,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                               'cmdname' => 'TeX',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 6,
-                                'macro' => ''
+                                'line_nr' => 6
                               }
                             }
                           ],
@@ -163,8 +159,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'cmdname' => 'sc',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     },
                     {
@@ -184,8 +179,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'cmdname' => '"',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     },
                     {
@@ -209,8 +203,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 6,
-                                'macro' => ''
+                                'line_nr' => 6
                               }
                             }
                           ],
@@ -220,8 +213,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'cmdname' => '"',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     },
                     {
@@ -245,8 +237,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                               'cmdname' => '=',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 6,
-                                'macro' => ''
+                                'line_nr' => 6
                               }
                             }
                           ],
@@ -256,8 +247,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'cmdname' => '`',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     },
                     {
@@ -272,8 +262,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'cmdname' => 'l',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     },
                     {
@@ -297,8 +286,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                               'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 6,
-                                'macro' => ''
+                                'line_nr' => 6
                               }
                             }
                           ],
@@ -308,8 +296,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     },
                     {
@@ -324,8 +311,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'cmdname' => 'exclamdown',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     }
                   ],
@@ -373,8 +359,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -406,15 +391,13 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -431,8 +414,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -463,8 +445,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -479,8 +460,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -495,8 +475,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'cmdname' => 'TeX',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     }
                   ],
@@ -506,8 +485,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -527,8 +505,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -552,8 +529,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     }
                   ],
@@ -563,8 +539,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -588,8 +563,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     }
                   ],
@@ -599,8 +573,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -615,8 +588,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -640,8 +612,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     }
                   ],
@@ -651,8 +622,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               'cmdname' => ',',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -667,8 +637,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
@@ -693,8 +662,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -718,8 +686,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -739,8 +706,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -764,8 +730,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     }
                   ],
@@ -775,8 +740,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -800,8 +764,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     }
                   ],
@@ -811,8 +774,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -827,8 +789,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -852,8 +813,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     }
                   ],
@@ -863,8 +823,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               'cmdname' => ',',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -879,8 +838,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
@@ -926,8 +884,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'cmdname' => 'strong',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     },
                     {
@@ -947,8 +904,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'cmdname' => 'sc',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     },
                     {
@@ -960,8 +916,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'cmdname' => 'comma',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     },
                     {
@@ -981,8 +936,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'cmdname' => '"',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     },
                     {
@@ -994,8 +948,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'cmdname' => 'comma',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     },
                     {
@@ -1019,8 +972,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 12,
-                                'macro' => ''
+                                'line_nr' => 12
                               }
                             }
                           ],
@@ -1030,8 +982,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'cmdname' => '"',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     },
                     {
@@ -1055,8 +1006,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                               'cmdname' => '=',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 12,
-                                'macro' => ''
+                                'line_nr' => 12
                               }
                             }
                           ],
@@ -1066,8 +1016,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'cmdname' => '`',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     },
                     {
@@ -1082,8 +1031,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'cmdname' => 'exclamdown',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     }
                   ],
@@ -1127,8 +1075,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -1173,8 +1120,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                               'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 14,
-                                'macro' => ''
+                                'line_nr' => 14
                               }
                             },
                             {
@@ -1189,8 +1135,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                               'cmdname' => 'aa',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 14,
-                                'macro' => ''
+                                'line_nr' => 14
                               }
                             },
                             {
@@ -1205,8 +1150,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                               'cmdname' => 'TeX',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 14,
-                                'macro' => ''
+                                'line_nr' => 14
                               }
                             }
                           ],
@@ -1216,8 +1160,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'cmdname' => 'sc',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     },
                     {
@@ -1237,8 +1180,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'cmdname' => '"',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     },
                     {
@@ -1262,8 +1204,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 14,
-                                'macro' => ''
+                                'line_nr' => 14
                               }
                             }
                           ],
@@ -1273,8 +1214,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'cmdname' => '"',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     },
                     {
@@ -1298,8 +1238,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                               'cmdname' => '=',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 14,
-                                'macro' => ''
+                                'line_nr' => 14
                               }
                             }
                           ],
@@ -1309,8 +1248,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'cmdname' => '`',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     },
                     {
@@ -1325,8 +1263,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'cmdname' => 'l',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     },
                     {
@@ -1350,8 +1287,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                               'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 14,
-                                'macro' => ''
+                                'line_nr' => 14
                               }
                             }
                           ],
@@ -1361,8 +1297,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     },
                     {
@@ -1377,8 +1312,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'cmdname' => 'exclamdown',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     }
                   ],
@@ -1409,8 +1343,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -1431,8 +1364,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     }
   ],
diff --git a/tp/t/results/converters_tests/sp_in_example.pl 
b/tp/t/results/converters_tests/sp_in_example.pl
index f1b29891a7..e201beb599 100644
--- a/tp/t/results/converters_tests/sp_in_example.pl
+++ b/tp/t/results/converters_tests/sp_in_example.pl
@@ -59,8 +59,7 @@ $result_trees{'sp_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 },
                 {
@@ -112,8 +111,7 @@ $result_trees{'sp_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 },
                 {
@@ -151,8 +149,7 @@ $result_trees{'sp_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 },
                 {
@@ -198,8 +195,7 @@ $result_trees{'sp_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 13,
-                    'macro' => ''
+                    'line_nr' => 13
                   }
                 },
                 {
@@ -245,8 +241,7 @@ $result_trees{'sp_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 17,
-                    'macro' => ''
+                    'line_nr' => 17
                   }
                 }
               ],
@@ -280,15 +275,13 @@ $result_trees{'sp_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/converters_tests/spaces_in_empty_node_names.pl 
b/tp/t/results/converters_tests/spaces_in_empty_node_names.pl
index c9342074fe..29516d7a0f 100644
--- a/tp/t/results/converters_tests/spaces_in_empty_node_names.pl
+++ b/tp/t/results/converters_tests/spaces_in_empty_node_names.pl
@@ -95,8 +95,7 @@ $result_trees{'spaces_in_empty_node_names'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -126,8 +125,7 @@ $result_trees{'spaces_in_empty_node_names'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
@@ -162,8 +160,7 @@ $result_trees{'spaces_in_empty_node_names'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -210,8 +207,7 @@ $result_trees{'spaces_in_empty_node_names'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -243,15 +239,13 @@ $result_trees{'spaces_in_empty_node_names'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -271,8 +265,7 @@ $result_trees{'spaces_in_empty_node_names'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -310,8 +303,7 @@ $result_trees{'spaces_in_empty_node_names'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -336,8 +328,7 @@ $result_trees{'spaces_in_empty_node_names'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
@@ -365,8 +356,7 @@ $result_trees{'spaces_in_empty_node_names'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -387,8 +377,7 @@ $result_trees{'spaces_in_empty_node_names'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             }
           ],
@@ -436,8 +425,7 @@ $result_trees{'spaces_in_empty_node_names'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -476,8 +464,7 @@ $result_trees{'spaces_in_empty_node_names'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     }
                   ],
@@ -495,8 +482,7 @@ $result_trees{'spaces_in_empty_node_names'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -531,8 +517,7 @@ $result_trees{'spaces_in_empty_node_names'} = {
                       'cmdname' => 'w',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 19,
-                        'macro' => ''
+                        'line_nr' => 19
                       }
                     }
                   ],
@@ -550,8 +535,7 @@ $result_trees{'spaces_in_empty_node_names'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -569,8 +553,7 @@ $result_trees{'spaces_in_empty_node_names'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     }
   ],
@@ -648,7 +631,6 @@ $result_errors{'spaces_in_empty_node_names'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'empty node name after expansion `@ @ \'',
     'type' => 'error'
   },
@@ -657,7 +639,6 @@ $result_errors{'spaces_in_empty_node_names'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => '@verb should not appear on @node line',
     'type' => 'warning'
   },
@@ -666,7 +647,6 @@ $result_errors{'spaces_in_empty_node_names'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'empty node name after expansion `@verb{:  :}\'',
     'type' => 'error'
   },
@@ -675,7 +655,6 @@ $result_errors{'spaces_in_empty_node_names'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => 'empty node name after expansion `@w{  }\'',
     'type' => 'error'
   },
@@ -684,7 +663,6 @@ $result_errors{'spaces_in_empty_node_names'} = [
 ',
     'file_name' => '',
     'line_nr' => 17,
-    'macro' => '',
     'text' => '@verb should not appear anywhere inside @ref',
     'type' => 'warning'
   },
@@ -693,7 +671,6 @@ $result_errors{'spaces_in_empty_node_names'} = [
 ',
     'file_name' => '',
     'line_nr' => 15,
-    'macro' => '',
     'text' => '@ref reference to nonexistent node `@ @ \'',
     'type' => 'error'
   },
@@ -702,7 +679,6 @@ $result_errors{'spaces_in_empty_node_names'} = [
 ',
     'file_name' => '',
     'line_nr' => 17,
-    'macro' => '',
     'text' => '@ref reference to nonexistent node `@verb{:  :}\'',
     'type' => 'error'
   },
@@ -711,7 +687,6 @@ $result_errors{'spaces_in_empty_node_names'} = [
 ',
     'file_name' => '',
     'line_nr' => 19,
-    'macro' => '',
     'text' => '@ref reference to nonexistent node `@w{  }\'',
     'type' => 'error'
   },
@@ -720,7 +695,6 @@ $result_errors{'spaces_in_empty_node_names'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '@menu reference to nonexistent node `@ @ \'',
     'type' => 'error'
   },
@@ -729,7 +703,6 @@ $result_errors{'spaces_in_empty_node_names'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@menu reference to nonexistent node `@verb{:  :}\'',
     'type' => 'error'
   },
@@ -738,7 +711,6 @@ $result_errors{'spaces_in_empty_node_names'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => '@menu reference to nonexistent node `@ \'',
     'type' => 'error'
   }
diff --git a/tp/t/results/converters_tests/spaces_in_node_names.pl 
b/tp/t/results/converters_tests/spaces_in_node_names.pl
index b312fc7b4c..a68ba879c4 100644
--- a/tp/t/results/converters_tests/spaces_in_node_names.pl
+++ b/tp/t/results/converters_tests/spaces_in_node_names.pl
@@ -99,8 +99,7 @@ $result_trees{'spaces_in_node_names'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -133,8 +132,7 @@ $result_trees{'spaces_in_node_names'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
@@ -170,8 +168,7 @@ $result_trees{'spaces_in_node_names'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -222,8 +219,7 @@ $result_trees{'spaces_in_node_names'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -255,15 +251,13 @@ $result_trees{'spaces_in_node_names'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -283,8 +277,7 @@ $result_trees{'spaces_in_node_names'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -329,8 +322,7 @@ $result_trees{'spaces_in_node_names'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -358,8 +350,7 @@ $result_trees{'spaces_in_node_names'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
@@ -391,8 +382,7 @@ $result_trees{'spaces_in_node_names'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -416,8 +406,7 @@ $result_trees{'spaces_in_node_names'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             }
           ],
@@ -469,8 +458,7 @@ $result_trees{'spaces_in_node_names'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -512,8 +500,7 @@ $result_trees{'spaces_in_node_names'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     }
                   ],
@@ -532,8 +519,7 @@ $result_trees{'spaces_in_node_names'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -571,8 +557,7 @@ $result_trees{'spaces_in_node_names'} = {
                       'cmdname' => 'w',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 19,
-                        'macro' => ''
+                        'line_nr' => 19
                       }
                     }
                   ],
@@ -591,8 +576,7 @@ $result_trees{'spaces_in_node_names'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -614,8 +598,7 @@ $result_trees{'spaces_in_node_names'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     }
   ],
@@ -778,7 +761,6 @@ $result_errors{'spaces_in_node_names'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => '@verb should not appear on @node line',
     'type' => 'warning'
   },
@@ -787,7 +769,6 @@ $result_errors{'spaces_in_node_names'} = [
 ',
     'file_name' => '',
     'line_nr' => 17,
-    'macro' => '',
     'text' => '@verb should not appear anywhere inside @ref',
     'type' => 'warning'
   },
@@ -796,7 +777,6 @@ $result_errors{'spaces_in_node_names'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => '@menu entry node name `c@ \' different from node name `c@w{  
}\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/converters_tests/table_in_display_in_example.pl 
b/tp/t/results/converters_tests/table_in_display_in_example.pl
index 013fddcd5e..5dac9d2cf9 100644
--- a/tp/t/results/converters_tests/table_in_display_in_example.pl
+++ b/tp/t/results/converters_tests/table_in_display_in_example.pl
@@ -45,8 +45,7 @@ $result_trees{'table_in_display_in_example'} = {
                           'cmdname' => 'asis',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 3,
-                            'macro' => ''
+                            'line_nr' => 3
                           },
                           'type' => 'command_as_argument'
                         }
@@ -91,8 +90,7 @@ $result_trees{'table_in_display_in_example'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 4,
-                                'macro' => ''
+                                'line_nr' => 4
                               }
                             }
                           ],
@@ -143,8 +141,7 @@ $result_trees{'table_in_display_in_example'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     }
                   ],
@@ -158,8 +155,7 @@ $result_trees{'table_in_display_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 },
                 {
@@ -190,15 +186,13 @@ $result_trees{'table_in_display_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -229,15 +223,13 @@ $result_trees{'table_in_display_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/converters_tests/table_in_example_in_display.pl 
b/tp/t/results/converters_tests/table_in_example_in_display.pl
index 29a9c651d2..f323ef5898 100644
--- a/tp/t/results/converters_tests/table_in_example_in_display.pl
+++ b/tp/t/results/converters_tests/table_in_example_in_display.pl
@@ -45,8 +45,7 @@ $result_trees{'table_in_example_in_display'} = {
                           'cmdname' => 'asis',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 3,
-                            'macro' => ''
+                            'line_nr' => 3
                           },
                           'type' => 'command_as_argument'
                         }
@@ -91,8 +90,7 @@ $result_trees{'table_in_example_in_display'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 4,
-                                'macro' => ''
+                                'line_nr' => 4
                               }
                             }
                           ],
@@ -143,8 +141,7 @@ $result_trees{'table_in_example_in_display'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     }
                   ],
@@ -158,8 +155,7 @@ $result_trees{'table_in_example_in_display'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 },
                 {
@@ -190,15 +186,13 @@ $result_trees{'table_in_example_in_display'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -229,15 +223,13 @@ $result_trees{'table_in_example_in_display'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/converters_tests/test_deftypefnnewline.pl 
b/tp/t/results/converters_tests/test_deftypefnnewline.pl
index 0626813535..cabfcfa362 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -37,8 +37,7 @@ $result_trees{'test_deftypefnnewline'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -76,8 +75,7 @@ $result_trees{'test_deftypefnnewline'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -117,8 +115,7 @@ $result_trees{'test_deftypefnnewline'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -154,8 +151,7 @@ $result_trees{'test_deftypefnnewline'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -187,8 +183,7 @@ $result_trees{'test_deftypefnnewline'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -294,8 +289,7 @@ $result_trees{'test_deftypefnnewline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'def_line'
             },
@@ -341,8 +335,7 @@ $result_trees{'test_deftypefnnewline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             }
           ],
@@ -353,8 +346,7 @@ $result_trees{'test_deftypefnnewline'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -423,8 +415,7 @@ $result_trees{'test_deftypefnnewline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               },
               'type' => 'def_line'
             },
@@ -470,8 +461,7 @@ $result_trees{'test_deftypefnnewline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             }
           ],
@@ -482,8 +472,7 @@ $result_trees{'test_deftypefnnewline'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         },
         {
@@ -615,8 +604,7 @@ $result_trees{'test_deftypefnnewline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               },
               'type' => 'def_line'
             },
@@ -662,8 +650,7 @@ $result_trees{'test_deftypefnnewline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             }
           ],
@@ -674,8 +661,7 @@ $result_trees{'test_deftypefnnewline'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         },
         {
@@ -794,8 +780,7 @@ $result_trees{'test_deftypefnnewline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               },
               'type' => 'def_line'
             },
@@ -841,8 +826,7 @@ $result_trees{'test_deftypefnnewline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               }
             }
           ],
@@ -853,8 +837,7 @@ $result_trees{'test_deftypefnnewline'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           }
         },
         {
@@ -973,8 +956,7 @@ $result_trees{'test_deftypefnnewline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               },
               'type' => 'def_line'
             },
@@ -1020,8 +1002,7 @@ $result_trees{'test_deftypefnnewline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             }
           ],
@@ -1032,8 +1013,7 @@ $result_trees{'test_deftypefnnewline'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 27,
-            'macro' => ''
+            'line_nr' => 27
           }
         },
         {
@@ -1165,8 +1145,7 @@ $result_trees{'test_deftypefnnewline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               },
               'type' => 'def_line'
             },
@@ -1212,8 +1191,7 @@ $result_trees{'test_deftypefnnewline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               }
             }
           ],
@@ -1224,8 +1202,7 @@ $result_trees{'test_deftypefnnewline'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 31,
-            'macro' => ''
+            'line_nr' => 31
           }
         },
         {
@@ -1281,8 +1258,7 @@ $result_trees{'test_deftypefnnewline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               },
               'type' => 'def_line'
             },
@@ -1328,8 +1304,7 @@ $result_trees{'test_deftypefnnewline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 37,
-                'macro' => ''
+                'line_nr' => 37
               }
             }
           ],
@@ -1340,8 +1315,7 @@ $result_trees{'test_deftypefnnewline'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 35,
-            'macro' => ''
+            'line_nr' => 35
           }
         },
         {
@@ -1379,8 +1353,7 @@ $result_trees{'test_deftypefnnewline'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 39,
-            'macro' => ''
+            'line_nr' => 39
           }
         },
         {
@@ -1467,8 +1440,7 @@ $result_trees{'test_deftypefnnewline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 41,
-                'macro' => ''
+                'line_nr' => 41
               },
               'type' => 'def_line'
             },
@@ -1514,8 +1486,7 @@ $result_trees{'test_deftypefnnewline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               }
             }
           ],
@@ -1526,8 +1497,7 @@ $result_trees{'test_deftypefnnewline'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 41,
-            'macro' => ''
+            'line_nr' => 41
           }
         },
         {
@@ -1596,8 +1566,7 @@ $result_trees{'test_deftypefnnewline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 45,
-                'macro' => ''
+                'line_nr' => 45
               },
               'type' => 'def_line'
             },
@@ -1643,8 +1612,7 @@ $result_trees{'test_deftypefnnewline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               }
             }
           ],
@@ -1655,8 +1623,7 @@ $result_trees{'test_deftypefnnewline'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 45,
-            'macro' => ''
+            'line_nr' => 45
           }
         },
         {
@@ -1788,8 +1755,7 @@ $result_trees{'test_deftypefnnewline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               },
               'type' => 'def_line'
             },
@@ -1835,8 +1801,7 @@ $result_trees{'test_deftypefnnewline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 51,
-                'macro' => ''
+                'line_nr' => 51
               }
             }
           ],
@@ -1847,8 +1812,7 @@ $result_trees{'test_deftypefnnewline'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 49,
-            'macro' => ''
+            'line_nr' => 49
           }
         },
         {
@@ -1967,8 +1931,7 @@ $result_trees{'test_deftypefnnewline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               },
               'type' => 'def_line'
             },
@@ -2014,8 +1977,7 @@ $result_trees{'test_deftypefnnewline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 55,
-                'macro' => ''
+                'line_nr' => 55
               }
             }
           ],
@@ -2026,8 +1988,7 @@ $result_trees{'test_deftypefnnewline'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 53,
-            'macro' => ''
+            'line_nr' => 53
           }
         },
         {
@@ -2146,8 +2107,7 @@ $result_trees{'test_deftypefnnewline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 57,
-                'macro' => ''
+                'line_nr' => 57
               },
               'type' => 'def_line'
             },
@@ -2193,8 +2153,7 @@ $result_trees{'test_deftypefnnewline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             }
           ],
@@ -2205,8 +2164,7 @@ $result_trees{'test_deftypefnnewline'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 57,
-            'macro' => ''
+            'line_nr' => 57
           }
         },
         {
@@ -2338,8 +2296,7 @@ $result_trees{'test_deftypefnnewline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               },
               'type' => 'def_line'
             },
@@ -2385,8 +2342,7 @@ $result_trees{'test_deftypefnnewline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 63,
-                'macro' => ''
+                'line_nr' => 63
               }
             }
           ],
@@ -2397,8 +2353,7 @@ $result_trees{'test_deftypefnnewline'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 61,
-            'macro' => ''
+            'line_nr' => 61
           }
         },
         {
@@ -2454,8 +2409,7 @@ $result_trees{'test_deftypefnnewline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               },
               'type' => 'def_line'
             },
@@ -2501,8 +2455,7 @@ $result_trees{'test_deftypefnnewline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 67,
-                'macro' => ''
+                'line_nr' => 67
               }
             }
           ],
@@ -2513,8 +2466,7 @@ $result_trees{'test_deftypefnnewline'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 65,
-            'macro' => ''
+            'line_nr' => 65
           }
         }
       ],
@@ -2528,8 +2480,7 @@ $result_trees{'test_deftypefnnewline'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     }
   ],
diff --git a/tp/t/results/converters_tests/test_sp.pl 
b/tp/t/results/converters_tests/test_sp.pl
index 6b086a7f81..c86c4ae292 100644
--- a/tp/t/results/converters_tests/test_sp.pl
+++ b/tp/t/results/converters_tests/test_sp.pl
@@ -48,8 +48,7 @@ $result_trees{'test_sp'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -106,8 +105,7 @@ $result_trees{'test_sp'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -145,8 +143,7 @@ $result_trees{'test_sp'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -202,8 +199,7 @@ $result_trees{'test_sp'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           }
         },
         {
@@ -259,8 +255,7 @@ $result_trees{'test_sp'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           }
         }
       ],
diff --git a/tp/t/results/converters_tests/things_before_setfilename.pl 
b/tp/t/results/converters_tests/things_before_setfilename.pl
index fdf7070bdb..d9ff89ec7d 100644
--- a/tp/t/results/converters_tests/things_before_setfilename.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename.pl
@@ -44,8 +44,7 @@ $result_trees{'things_before_setfilename'} = {
               },
               'source_info' => {
                 'file_name' => 'things_before_setfilename.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -86,8 +85,7 @@ $result_trees{'things_before_setfilename'} = {
                   'cmdname' => 'ref',
                   'source_info' => {
                     'file_name' => 'things_before_setfilename.texi',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   }
                 },
                 {
@@ -130,8 +128,7 @@ $result_trees{'things_before_setfilename'} = {
                   'cmdname' => 'ref',
                   'source_info' => {
                     'file_name' => 'things_before_setfilename.texi',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 },
                 {
@@ -184,8 +181,7 @@ $result_trees{'things_before_setfilename'} = {
                           },
                           'source_info' => {
                             'file_name' => 'things_before_setfilename.texi',
-                            'line_nr' => 13,
-                            'macro' => ''
+                            'line_nr' => 13
                           }
                         },
                         {
@@ -226,8 +222,7 @@ $result_trees{'things_before_setfilename'} = {
                               'cmdname' => 'ref',
                               'source_info' => {
                                 'file_name' => 
'things_before_setfilename.texi',
-                                'line_nr' => 16,
-                                'macro' => ''
+                                'line_nr' => 16
                               }
                             },
                             {
@@ -244,8 +239,7 @@ $result_trees{'things_before_setfilename'} = {
                   'cmdname' => 'footnote',
                   'source_info' => {
                     'file_name' => 'things_before_setfilename.texi',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 },
                 {
@@ -322,8 +316,7 @@ $result_trees{'things_before_setfilename'} = {
                   },
                   'source_info' => {
                     'file_name' => 'things_before_setfilename.texi',
-                    'line_nr' => 21,
-                    'macro' => ''
+                    'line_nr' => 21
                   }
                 }
               ],
@@ -339,8 +332,7 @@ $result_trees{'things_before_setfilename'} = {
               },
               'source_info' => {
                 'file_name' => 'things_before_setfilename.texi',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -376,8 +368,7 @@ $result_trees{'things_before_setfilename'} = {
                   'cmdname' => 'ref',
                   'source_info' => {
                     'file_name' => 'things_before_setfilename.texi',
-                    'line_nr' => 24,
-                    'macro' => ''
+                    'line_nr' => 24
                   }
                 },
                 {
@@ -458,8 +449,7 @@ $result_trees{'things_before_setfilename'} = {
                   },
                   'source_info' => {
                     'file_name' => 'things_before_setfilename.texi',
-                    'line_nr' => 29,
-                    'macro' => ''
+                    'line_nr' => 29
                   }
                 },
                 {
@@ -495,8 +485,7 @@ $result_trees{'things_before_setfilename'} = {
                   },
                   'source_info' => {
                     'file_name' => 'things_before_setfilename.texi',
-                    'line_nr' => 30,
-                    'macro' => ''
+                    'line_nr' => 30
                   }
                 }
               ],
@@ -513,8 +502,7 @@ $result_trees{'things_before_setfilename'} = {
               },
               'source_info' => {
                 'file_name' => 'things_before_setfilename.texi',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             },
             {
@@ -533,8 +521,7 @@ $result_trees{'things_before_setfilename'} = {
               'cmdname' => 'contents',
               'source_info' => {
                 'file_name' => 'things_before_setfilename.texi',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               }
             },
             {
@@ -599,8 +586,7 @@ $result_trees{'things_before_setfilename'} = {
                   ],
                   'source_info' => {
                     'file_name' => 'things_before_setfilename.texi',
-                    'line_nr' => 35,
-                    'macro' => ''
+                    'line_nr' => 35
                   },
                   'type' => 'menu_entry'
                 },
@@ -632,15 +618,13 @@ $result_trees{'things_before_setfilename'} = {
                   },
                   'source_info' => {
                     'file_name' => 'things_before_setfilename.texi',
-                    'line_nr' => 36,
-                    'macro' => ''
+                    'line_nr' => 36
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'things_before_setfilename.texi',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             },
             {
@@ -680,8 +664,7 @@ $result_trees{'things_before_setfilename'} = {
               },
               'source_info' => {
                 'file_name' => 'things_before_setfilename.texi',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               },
               'type' => 'index_entry_command'
             },
@@ -720,8 +703,7 @@ $result_trees{'things_before_setfilename'} = {
               },
               'source_info' => {
                 'file_name' => 'things_before_setfilename.texi',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               }
             },
             {
@@ -757,8 +739,7 @@ $result_trees{'things_before_setfilename'} = {
               },
               'source_info' => {
                 'file_name' => 'things_before_setfilename.texi',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               }
             },
             {
@@ -799,8 +780,7 @@ $result_trees{'things_before_setfilename'} = {
               },
               'source_info' => {
                 'file_name' => 'things_before_setfilename.texi',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             },
             {
@@ -843,8 +823,7 @@ $result_trees{'things_before_setfilename'} = {
       },
       'source_info' => {
         'file_name' => 'things_before_setfilename.texi',
-        'line_nr' => 46,
-        'macro' => ''
+        'line_nr' => 46
       }
     },
     {
@@ -880,8 +859,7 @@ $result_trees{'things_before_setfilename'} = {
       },
       'source_info' => {
         'file_name' => 'things_before_setfilename.texi',
-        'line_nr' => 47,
-        'macro' => ''
+        'line_nr' => 47
       }
     },
     {
@@ -913,8 +891,7 @@ $result_trees{'things_before_setfilename'} = {
       },
       'source_info' => {
         'file_name' => 'things_before_setfilename.texi',
-        'line_nr' => 49,
-        'macro' => ''
+        'line_nr' => 49
       }
     },
     {
@@ -969,8 +946,7 @@ $result_trees{'things_before_setfilename'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'things_before_setfilename.texi',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               }
             },
             {
@@ -1013,8 +989,7 @@ $result_trees{'things_before_setfilename'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'things_before_setfilename.texi',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -1040,8 +1015,7 @@ $result_trees{'things_before_setfilename'} = {
       },
       'source_info' => {
         'file_name' => 'things_before_setfilename.texi',
-        'line_nr' => 50,
-        'macro' => ''
+        'line_nr' => 50
       }
     }
   ],
@@ -1259,7 +1233,6 @@ $result_errors{'things_before_setfilename'} = [
 ',
     'file_name' => 'things_before_setfilename.texi',
     'line_nr' => 38,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1268,7 +1241,6 @@ $result_errors{'things_before_setfilename'} = [
 ',
     'file_name' => 'things_before_setfilename.texi',
     'line_nr' => 40,
-    'macro' => '',
     'text' => 'printindex before document beginning: @printindex cp',
     'type' => 'warning'
   }
diff --git 
a/tp/t/results/converters_tests/things_before_setfilename_no_element.pl 
b/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
index 6b5d4378d9..e374aab511 100644
--- a/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
@@ -44,8 +44,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
               },
               'source_info' => {
                 'file_name' => 'things_before_setfilename_no_element.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -86,8 +85,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
                   'cmdname' => 'ref',
                   'source_info' => {
                     'file_name' => 'things_before_setfilename_no_element.texi',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   }
                 },
                 {
@@ -130,8 +128,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
                   'cmdname' => 'ref',
                   'source_info' => {
                     'file_name' => 'things_before_setfilename_no_element.texi',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 },
                 {
@@ -184,8 +181,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
                           },
                           'source_info' => {
                             'file_name' => 
'things_before_setfilename_no_element.texi',
-                            'line_nr' => 13,
-                            'macro' => ''
+                            'line_nr' => 13
                           }
                         },
                         {
@@ -226,8 +222,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
                               'cmdname' => 'ref',
                               'source_info' => {
                                 'file_name' => 
'things_before_setfilename_no_element.texi',
-                                'line_nr' => 16,
-                                'macro' => ''
+                                'line_nr' => 16
                               }
                             },
                             {
@@ -244,8 +239,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
                   'cmdname' => 'footnote',
                   'source_info' => {
                     'file_name' => 'things_before_setfilename_no_element.texi',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 },
                 {
@@ -322,8 +316,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
                   },
                   'source_info' => {
                     'file_name' => 'things_before_setfilename_no_element.texi',
-                    'line_nr' => 21,
-                    'macro' => ''
+                    'line_nr' => 21
                   }
                 }
               ],
@@ -339,8 +332,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
               },
               'source_info' => {
                 'file_name' => 'things_before_setfilename_no_element.texi',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -376,8 +368,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
                   'cmdname' => 'ref',
                   'source_info' => {
                     'file_name' => 'things_before_setfilename_no_element.texi',
-                    'line_nr' => 24,
-                    'macro' => ''
+                    'line_nr' => 24
                   }
                 },
                 {
@@ -458,8 +449,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
                   },
                   'source_info' => {
                     'file_name' => 'things_before_setfilename_no_element.texi',
-                    'line_nr' => 29,
-                    'macro' => ''
+                    'line_nr' => 29
                   }
                 },
                 {
@@ -495,8 +485,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
                   },
                   'source_info' => {
                     'file_name' => 'things_before_setfilename_no_element.texi',
-                    'line_nr' => 30,
-                    'macro' => ''
+                    'line_nr' => 30
                   }
                 }
               ],
@@ -513,8 +502,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
               },
               'source_info' => {
                 'file_name' => 'things_before_setfilename_no_element.texi',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             },
             {
@@ -533,8 +521,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
               'cmdname' => 'contents',
               'source_info' => {
                 'file_name' => 'things_before_setfilename_no_element.texi',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               }
             },
             {
@@ -599,8 +586,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
                   ],
                   'source_info' => {
                     'file_name' => 'things_before_setfilename_no_element.texi',
-                    'line_nr' => 35,
-                    'macro' => ''
+                    'line_nr' => 35
                   },
                   'type' => 'menu_entry'
                 },
@@ -632,15 +618,13 @@ $result_trees{'things_before_setfilename_no_element'} = {
                   },
                   'source_info' => {
                     'file_name' => 'things_before_setfilename_no_element.texi',
-                    'line_nr' => 36,
-                    'macro' => ''
+                    'line_nr' => 36
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'things_before_setfilename_no_element.texi',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             },
             {
@@ -680,8 +664,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
               },
               'source_info' => {
                 'file_name' => 'things_before_setfilename_no_element.texi',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               },
               'type' => 'index_entry_command'
             },
@@ -720,8 +703,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
               },
               'source_info' => {
                 'file_name' => 'things_before_setfilename_no_element.texi',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               }
             },
             {
@@ -757,8 +739,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
               },
               'source_info' => {
                 'file_name' => 'things_before_setfilename_no_element.texi',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               }
             },
             {
@@ -799,8 +780,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
               },
               'source_info' => {
                 'file_name' => 'things_before_setfilename_no_element.texi',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             },
             {
@@ -839,8 +819,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'things_before_setfilename_no_element.texi',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               }
             },
             {
@@ -883,8 +862,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'things_before_setfilename_no_element.texi',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             },
             {
@@ -1009,7 +987,6 @@ $result_errors{'things_before_setfilename_no_element'} = [
 ',
     'file_name' => 'things_before_setfilename_no_element.texi',
     'line_nr' => 38,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1018,7 +995,6 @@ $result_errors{'things_before_setfilename_no_element'} = [
 ',
     'file_name' => 'things_before_setfilename_no_element.texi',
     'line_nr' => 40,
-    'macro' => '',
     'text' => 'printindex before document beginning: @printindex cp',
     'type' => 'warning'
   }
diff --git a/tp/t/results/converters_tests/top_in_ref.pl 
b/tp/t/results/converters_tests/top_in_ref.pl
index b75c296922..cc344ddec7 100644
--- a/tp/t/results/converters_tests/top_in_ref.pl
+++ b/tp/t/results/converters_tests/top_in_ref.pl
@@ -46,8 +46,7 @@ $result_trees{'top_in_ref'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -102,8 +101,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -139,8 +137,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -173,8 +170,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -213,8 +209,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -247,8 +242,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -289,8 +283,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -323,8 +316,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -368,8 +360,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -402,8 +393,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -450,8 +440,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -484,8 +473,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -531,8 +519,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -565,8 +552,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -615,8 +601,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -649,8 +634,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -701,8 +685,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -735,8 +718,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -790,8 +772,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -824,8 +805,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -894,8 +874,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -928,8 +907,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -975,8 +953,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -1009,8 +986,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -1059,8 +1035,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -1093,8 +1068,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -1158,8 +1132,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -1192,8 +1165,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -1242,8 +1214,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -1286,8 +1257,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -1336,8 +1306,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -1370,8 +1339,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -1423,8 +1391,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -1457,8 +1424,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -1513,8 +1479,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -1547,8 +1512,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -1606,8 +1570,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -1640,8 +1603,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -1701,8 +1663,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -1735,8 +1696,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               }
             },
             {
@@ -1796,8 +1756,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               }
             },
             {
@@ -1830,8 +1789,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             },
             {
@@ -1894,8 +1852,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             },
             {
@@ -1928,8 +1885,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             },
             {
@@ -1994,8 +1950,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             },
             {
@@ -2028,8 +1983,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             },
             {
@@ -2097,8 +2051,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             },
             {
@@ -2131,8 +2084,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             },
             {
@@ -2215,8 +2167,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             },
             {
@@ -2249,8 +2200,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -2310,8 +2260,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -2344,8 +2293,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               }
             },
             {
@@ -2408,8 +2356,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               }
             },
             {
@@ -2442,8 +2389,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               }
             },
             {
@@ -2521,8 +2467,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               }
             },
             {
@@ -2555,8 +2500,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               }
             },
             {
@@ -2619,8 +2563,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               }
             },
             {
@@ -2663,8 +2606,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             },
             {
@@ -2717,8 +2659,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'inforef',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             },
             {
@@ -2751,8 +2692,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               }
             },
             {
@@ -2780,8 +2720,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'inforef',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               }
             },
             {
@@ -2814,8 +2753,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 37,
-                'macro' => ''
+                'line_nr' => 37
               }
             },
             {
@@ -2856,8 +2794,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'inforef',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 37,
-                'macro' => ''
+                'line_nr' => 37
               }
             },
             {
@@ -2890,8 +2827,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               }
             },
             {
@@ -2929,8 +2865,7 @@ $result_trees{'top_in_ref'} = {
               'cmdname' => 'inforef',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               }
             },
             {
@@ -2952,8 +2887,7 @@ $result_trees{'top_in_ref'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     }
   ],
@@ -3127,7 +3061,6 @@ $result_errors{'top_in_ref'} = [
 ',
     'file_name' => '',
     'line_nr' => 35,
-    'macro' => '',
     'text' => '@inforef is obsolete',
     'type' => 'warning'
   },
@@ -3136,7 +3069,6 @@ $result_errors{'top_in_ref'} = [
 ',
     'file_name' => '',
     'line_nr' => 36,
-    'macro' => '',
     'text' => '@inforef is obsolete',
     'type' => 'warning'
   },
@@ -3145,7 +3077,6 @@ $result_errors{'top_in_ref'} = [
 ',
     'file_name' => '',
     'line_nr' => 37,
-    'macro' => '',
     'text' => '@inforef is obsolete',
     'type' => 'warning'
   },
@@ -3154,7 +3085,6 @@ $result_errors{'top_in_ref'} = [
 ',
     'file_name' => '',
     'line_nr' => 38,
-    'macro' => '',
     'text' => '@inforef is obsolete',
     'type' => 'warning'
   }
diff --git a/tp/t/results/converters_tests/unknown_value.pl 
b/tp/t/results/converters_tests/unknown_value.pl
index c000829647..25c16eba4a 100644
--- a/tp/t/results/converters_tests/unknown_value.pl
+++ b/tp/t/results/converters_tests/unknown_value.pl
@@ -40,7 +40,6 @@ $result_errors{'unknown_value'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'undefined flag: unknown',
     'type' => 'warning'
   }
diff --git a/tp/t/results/coverage/accent_and_dash.pl 
b/tp/t/results/coverage/accent_and_dash.pl
index b793b16882..75f0365754 100644
--- a/tp/t/results/coverage/accent_and_dash.pl
+++ b/tp/t/results/coverage/accent_and_dash.pl
@@ -25,8 +25,7 @@ $result_trees{'accent_and_dash'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
diff --git a/tp/t/results/coverage/accent_no_closed.pl 
b/tp/t/results/coverage/accent_no_closed.pl
index 8656c786d0..e9041125e2 100644
--- a/tp/t/results/coverage/accent_no_closed.pl
+++ b/tp/t/results/coverage/accent_no_closed.pl
@@ -25,8 +25,7 @@ $result_trees{'accent_no_closed'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -50,7 +49,6 @@ $result_errors{'accent_no_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@~ missing closing brace',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage/accent_no_closed_comment.pl 
b/tp/t/results/coverage/accent_no_closed_comment.pl
index 477b4b0af0..190f1e399c 100644
--- a/tp/t/results/coverage/accent_no_closed_comment.pl
+++ b/tp/t/results/coverage/accent_no_closed_comment.pl
@@ -35,8 +35,7 @@ $result_trees{'accent_no_closed_comment'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -61,7 +60,6 @@ $result_errors{'accent_no_closed_comment'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@~ missing closing brace',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage/accent_no_closed_newline.pl 
b/tp/t/results/coverage/accent_no_closed_newline.pl
index ea07e83b23..b2880cab2e 100644
--- a/tp/t/results/coverage/accent_no_closed_newline.pl
+++ b/tp/t/results/coverage/accent_no_closed_newline.pl
@@ -31,8 +31,7 @@ $result_trees{'accent_no_closed_newline'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -60,7 +59,6 @@ $result_errors{'accent_no_closed_newline'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@~ missing closing brace',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage/accent_no_closed_paragraph.pl 
b/tp/t/results/coverage/accent_no_closed_paragraph.pl
index b6336476b1..83e81d6739 100644
--- a/tp/t/results/coverage/accent_no_closed_paragraph.pl
+++ b/tp/t/results/coverage/accent_no_closed_paragraph.pl
@@ -31,8 +31,7 @@ $result_trees{'accent_no_closed_paragraph'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -71,7 +70,6 @@ $result_errors{'accent_no_closed_paragraph'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@~ missing closing brace',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage/accents_errors.pl 
b/tp/t/results/coverage/accents_errors.pl
index 9e98d9defb..f05cd8202b 100644
--- a/tp/t/results/coverage/accents_errors.pl
+++ b/tp/t/results/coverage/accents_errors.pl
@@ -34,8 +34,7 @@ $result_trees{'accents_errors'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -61,8 +60,7 @@ $result_trees{'accents_errors'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -78,8 +76,7 @@ $result_trees{'accents_errors'} = {
               'cmdname' => 'ringaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -121,8 +118,7 @@ $result_trees{'accents_errors'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -152,8 +148,7 @@ $result_trees{'accents_errors'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -169,8 +164,7 @@ $result_trees{'accents_errors'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -212,7 +206,6 @@ $result_errors{'accents_errors'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'command `@ringaccent\' must not be followed by new line',
     'type' => 'warning'
   },
@@ -221,7 +214,6 @@ $result_errors{'accents_errors'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'command `@ringaccent\' must not be followed by new line',
     'type' => 'warning'
   },
@@ -230,7 +222,6 @@ $result_errors{'accents_errors'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@ringaccent expected braces',
     'type' => 'error'
   },
@@ -239,7 +230,6 @@ $result_errors{'accents_errors'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'command `@~\' must not be followed by new line',
     'type' => 'warning'
   },
@@ -248,7 +238,6 @@ $result_errors{'accents_errors'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '@~ expected braces',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage/arg_in_brace_no_arg_command.pl 
b/tp/t/results/coverage/arg_in_brace_no_arg_command.pl
index 245ca9ebba..5e29a74c01 100644
--- a/tp/t/results/coverage/arg_in_brace_no_arg_command.pl
+++ b/tp/t/results/coverage/arg_in_brace_no_arg_command.pl
@@ -25,8 +25,7 @@ $result_trees{'arg_in_brace_no_arg_command'} = {
               'cmdname' => 'TeX',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -56,7 +55,6 @@ $result_errors{'arg_in_brace_no_arg_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'command @TeX does not accept arguments',
     'type' => 'warning'
   }
diff --git a/tp/t/results/coverage/at_after_accent_command.pl 
b/tp/t/results/coverage/at_after_accent_command.pl
index 9f51f951ae..63aecf7079 100644
--- a/tp/t/results/coverage/at_after_accent_command.pl
+++ b/tp/t/results/coverage/at_after_accent_command.pl
@@ -20,8 +20,7 @@ $result_trees{'at_after_accent_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -34,8 +33,7 @@ $result_trees{'at_after_accent_command'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -68,7 +66,6 @@ $result_errors{'at_after_accent_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@ringaccent expected braces',
     'type' => 'error'
   },
@@ -77,7 +74,6 @@ $result_errors{'at_after_accent_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@^ expected braces',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage/block_commands.pl 
b/tp/t/results/coverage/block_commands.pl
index a2867edd8e..917885b027 100644
--- a/tp/t/results/coverage/block_commands.pl
+++ b/tp/t/results/coverage/block_commands.pl
@@ -65,15 +65,13 @@ $result_trees{'block_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -137,8 +135,7 @@ $result_trees{'block_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
@@ -149,8 +146,7 @@ $result_trees{'block_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -243,8 +239,7 @@ $result_trees{'block_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -280,8 +275,7 @@ $result_trees{'block_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             }
           ],
@@ -298,8 +292,7 @@ $result_trees{'block_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         }
       ],
diff --git a/tp/t/results/coverage/bye_on_end_command_line.pl 
b/tp/t/results/coverage/bye_on_end_command_line.pl
index ecb441cf3f..ac69ddcd69 100644
--- a/tp/t/results/coverage/bye_on_end_command_line.pl
+++ b/tp/t/results/coverage/bye_on_end_command_line.pl
@@ -54,15 +54,13 @@ $result_trees{'bye_on_end_command_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -97,7 +95,6 @@ $result_errors{'bye_on_end_command_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@bye should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -106,7 +103,6 @@ $result_errors{'bye_on_end_command_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@bye should not appear in @end',
     'type' => 'warning'
   }
diff --git a/tp/t/results/coverage/cartouche.pl 
b/tp/t/results/coverage/cartouche.pl
index 665a3145fa..173f94ee82 100644
--- a/tp/t/results/coverage/cartouche.pl
+++ b/tp/t/results/coverage/cartouche.pl
@@ -60,15 +60,13 @@ $result_trees{'cartouche'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -94,8 +92,7 @@ $result_trees{'cartouche'} = {
                   'cmdname' => 'emph',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 }
               ],
@@ -147,8 +144,7 @@ $result_trees{'cartouche'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -159,8 +155,7 @@ $result_trees{'cartouche'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
diff --git a/tp/t/results/coverage/cartouche_in_example.pl 
b/tp/t/results/coverage/cartouche_in_example.pl
index 44362d080e..20d0edc087 100644
--- a/tp/t/results/coverage/cartouche_in_example.pl
+++ b/tp/t/results/coverage/cartouche_in_example.pl
@@ -83,15 +83,13 @@ $result_trees{'cartouche_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -131,15 +129,13 @@ $result_trees{'cartouche_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/coverage/cartouche_in_quotation.pl 
b/tp/t/results/coverage/cartouche_in_quotation.pl
index 3d0a721911..acc4dc7690 100644
--- a/tp/t/results/coverage/cartouche_in_quotation.pl
+++ b/tp/t/results/coverage/cartouche_in_quotation.pl
@@ -83,15 +83,13 @@ $result_trees{'cartouche_in_quotation'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -131,15 +129,13 @@ $result_trees{'cartouche_in_quotation'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/coverage/cartouche_title_and_content.pl 
b/tp/t/results/coverage/cartouche_title_and_content.pl
index 686602991f..b5a817029d 100644
--- a/tp/t/results/coverage/cartouche_title_and_content.pl
+++ b/tp/t/results/coverage/cartouche_title_and_content.pl
@@ -30,8 +30,7 @@ $result_trees{'cartouche_title_and_content'} = {
                   'cmdname' => 'emph',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 }
               ],
@@ -87,8 +86,7 @@ $result_trees{'cartouche_title_and_content'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -99,8 +97,7 @@ $result_trees{'cartouche_title_and_content'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/coverage/center.pl b/tp/t/results/coverage/center.pl
index 4316cb1a54..5b2d908282 100644
--- a/tp/t/results/coverage/center.pl
+++ b/tp/t/results/coverage/center.pl
@@ -35,8 +35,7 @@ $result_trees{'center'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   }
                 }
               ],
@@ -57,8 +56,7 @@ $result_trees{'center'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
diff --git a/tp/t/results/coverage/command_in_end.pl 
b/tp/t/results/coverage/command_in_end.pl
index 7be67737ad..be2e838760 100644
--- a/tp/t/results/coverage/command_in_end.pl
+++ b/tp/t/results/coverage/command_in_end.pl
@@ -47,8 +47,7 @@ $result_trees{'command_in_end'} = {
                           'cmdname' => 'code',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 3,
-                            'macro' => ''
+                            'line_nr' => 3
                           }
                         }
                       ],
@@ -69,8 +68,7 @@ $result_trees{'command_in_end'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 }
               ],
@@ -122,8 +120,7 @@ $result_trees{'command_in_end'} = {
                               'cmdname' => 'code',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 7,
-                                'macro' => ''
+                                'line_nr' => 7
                               }
                             }
                           ],
@@ -147,8 +144,7 @@ $result_trees{'command_in_end'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     }
                   ],
@@ -200,8 +196,7 @@ $result_trees{'command_in_end'} = {
                                   'cmdname' => 'code',
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 11,
-                                    'macro' => ''
+                                    'line_nr' => 11
                                   }
                                 }
                               ],
@@ -225,8 +220,7 @@ $result_trees{'command_in_end'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 11,
-                            'macro' => ''
+                            'line_nr' => 11
                           }
                         }
                       ],
@@ -278,8 +272,7 @@ $result_trees{'command_in_end'} = {
                                       'cmdname' => 'asis',
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 15,
-                                        'macro' => ''
+                                        'line_nr' => 15
                                       }
                                     },
                                     {
@@ -306,8 +299,7 @@ $result_trees{'command_in_end'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 15,
-                                'macro' => ''
+                                'line_nr' => 15
                               }
                             }
                           ],
@@ -357,8 +349,7 @@ $result_trees{'command_in_end'} = {
                                       'cmdname' => 'asis',
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 19,
-                                        'macro' => ''
+                                        'line_nr' => 19
                                       }
                                     },
                                     {
@@ -385,15 +376,13 @@ $result_trees{'command_in_end'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 19,
-                                'macro' => ''
+                                'line_nr' => 19
                               }
                             }
                           ],
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 17,
-                            'macro' => ''
+                            'line_nr' => 17
                           }
                         },
                         {
@@ -440,8 +429,7 @@ $result_trees{'command_in_end'} = {
                                       'cmdname' => 'asis',
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 23,
-                                        'macro' => ''
+                                        'line_nr' => 23
                                       }
                                     },
                                     {
@@ -468,15 +456,13 @@ $result_trees{'command_in_end'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 23,
-                                'macro' => ''
+                                'line_nr' => 23
                               }
                             }
                           ],
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 21,
-                            'macro' => ''
+                            'line_nr' => 21
                           }
                         },
                         {
@@ -523,8 +509,7 @@ $result_trees{'command_in_end'} = {
                                       'cmdname' => 'asis',
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 27,
-                                        'macro' => ''
+                                        'line_nr' => 27
                                       }
                                     },
                                     {
@@ -551,15 +536,13 @@ $result_trees{'command_in_end'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 27,
-                                'macro' => ''
+                                'line_nr' => 27
                               }
                             }
                           ],
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 25,
-                            'macro' => ''
+                            'line_nr' => 25
                           }
                         },
                         {
@@ -594,36 +577,31 @@ $result_trees{'command_in_end'} = {
                           ],
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 29,
-                            'macro' => ''
+                            'line_nr' => 29
                           }
                         }
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     }
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -691,7 +669,6 @@ $result_errors{'command_in_end'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@code should not appear in @end',
     'type' => 'warning'
   },
@@ -700,7 +677,6 @@ $result_errors{'command_in_end'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'bad argument to @end: @code{quotation}',
     'type' => 'error'
   },
@@ -709,7 +685,6 @@ $result_errors{'command_in_end'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '@code should not appear in @end',
     'type' => 'warning'
   },
@@ -718,7 +693,6 @@ $result_errors{'command_in_end'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'unknown @end q',
     'type' => 'warning'
   },
@@ -727,7 +701,6 @@ $result_errors{'command_in_end'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'bad argument to @end: q@code{uotation}',
     'type' => 'error'
   },
@@ -736,7 +709,6 @@ $result_errors{'command_in_end'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => '@code should not appear in @end',
     'type' => 'warning'
   },
@@ -745,7 +717,6 @@ $result_errors{'command_in_end'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'unknown @end qu',
     'type' => 'warning'
   },
@@ -754,7 +725,6 @@ $result_errors{'command_in_end'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'bad argument to @end: qu@code{otation}',
     'type' => 'error'
   },
@@ -763,7 +733,6 @@ $result_errors{'command_in_end'} = [
 ',
     'file_name' => '',
     'line_nr' => 15,
-    'macro' => '',
     'text' => '@asis should not appear in @end',
     'type' => 'warning'
   },
@@ -772,7 +741,6 @@ $result_errors{'command_in_end'} = [
 ',
     'file_name' => '',
     'line_nr' => 15,
-    'macro' => '',
     'text' => 'unknown @end quotn',
     'type' => 'warning'
   },
@@ -781,7 +749,6 @@ $result_errors{'command_in_end'} = [
 ',
     'file_name' => '',
     'line_nr' => 15,
-    'macro' => '',
     'text' => 'bad argument to @end: quot@asis{atio}n',
     'type' => 'error'
   },
@@ -790,7 +757,6 @@ $result_errors{'command_in_end'} = [
 ',
     'file_name' => '',
     'line_nr' => 19,
-    'macro' => '',
     'text' => '@asis should not appear in @end',
     'type' => 'warning'
   },
@@ -799,7 +765,6 @@ $result_errors{'command_in_end'} = [
 ',
     'file_name' => '',
     'line_nr' => 19,
-    'macro' => '',
     'text' => 'bad argument to @end: q@asis{}uotation',
     'type' => 'error'
   },
@@ -808,7 +773,6 @@ $result_errors{'command_in_end'} = [
 ',
     'file_name' => '',
     'line_nr' => 23,
-    'macro' => '',
     'text' => '@asis should not appear in @end',
     'type' => 'warning'
   },
@@ -817,7 +781,6 @@ $result_errors{'command_in_end'} = [
 ',
     'file_name' => '',
     'line_nr' => 23,
-    'macro' => '',
     'text' => 'bad argument to @end: qu@asis{}otation',
     'type' => 'error'
   },
@@ -826,7 +789,6 @@ $result_errors{'command_in_end'} = [
 ',
     'file_name' => '',
     'line_nr' => 27,
-    'macro' => '',
     'text' => '@asis should not appear in @end',
     'type' => 'warning'
   },
@@ -835,7 +797,6 @@ $result_errors{'command_in_end'} = [
 ',
     'file_name' => '',
     'line_nr' => 27,
-    'macro' => '',
     'text' => 'bad argument to @end: quot@asis{}ation',
     'type' => 'error'
   },
@@ -844,7 +805,6 @@ $result_errors{'command_in_end'} = [
 ',
     'file_name' => '',
     'line_nr' => 31,
-    'macro' => '',
     'text' => 'no matching `@end verbatim\'',
     'type' => 'error'
   },
@@ -853,7 +813,6 @@ $result_errors{'command_in_end'} = [
 ',
     'file_name' => '',
     'line_nr' => 31,
-    'macro' => '',
     'text' => 'no matching `@end quotation\'',
     'type' => 'error'
   },
@@ -862,7 +821,6 @@ $result_errors{'command_in_end'} = [
 ',
     'file_name' => '',
     'line_nr' => 31,
-    'macro' => '',
     'text' => 'no matching `@end quotation\'',
     'type' => 'error'
   },
@@ -871,7 +829,6 @@ $result_errors{'command_in_end'} = [
 ',
     'file_name' => '',
     'line_nr' => 31,
-    'macro' => '',
     'text' => 'no matching `@end quotation\'',
     'type' => 'error'
   },
@@ -880,7 +837,6 @@ $result_errors{'command_in_end'} = [
 ',
     'file_name' => '',
     'line_nr' => 31,
-    'macro' => '',
     'text' => 'no matching `@end quotation\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage/command_in_end_expanded_raw_command_after.pl 
b/tp/t/results/coverage/command_in_end_expanded_raw_command_after.pl
index a6eb0d8634..2325f9cdc2 100644
--- a/tp/t/results/coverage/command_in_end_expanded_raw_command_after.pl
+++ b/tp/t/results/coverage/command_in_end_expanded_raw_command_after.pl
@@ -53,8 +53,7 @@ $result_trees{'command_in_end_expanded_raw_command_after'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -78,15 +77,13 @@ $result_trees{'command_in_end_expanded_raw_command_after'} 
= {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -111,7 +108,6 @@ $result_errors{'command_in_end_expanded_raw_command_after'} 
= [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@asis should not appear in @end',
     'type' => 'warning'
   },
@@ -120,7 +116,6 @@ $result_errors{'command_in_end_expanded_raw_command_after'} 
= [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'bad argument to @end: tex@asis{asis}',
     'type' => 'error'
   }
diff --git 
a/tp/t/results/coverage/command_in_end_expanded_raw_command_empty_after.pl 
b/tp/t/results/coverage/command_in_end_expanded_raw_command_empty_after.pl
index 61a0204a29..57f10c3bad 100644
--- a/tp/t/results/coverage/command_in_end_expanded_raw_command_empty_after.pl
+++ b/tp/t/results/coverage/command_in_end_expanded_raw_command_empty_after.pl
@@ -48,8 +48,7 @@ 
$result_trees{'command_in_end_expanded_raw_command_empty_after'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -73,15 +72,13 @@ 
$result_trees{'command_in_end_expanded_raw_command_empty_after'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -106,7 +103,6 @@ 
$result_errors{'command_in_end_expanded_raw_command_empty_after'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@asis should not appear in @end',
     'type' => 'warning'
   },
@@ -115,7 +111,6 @@ 
$result_errors{'command_in_end_expanded_raw_command_empty_after'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'bad argument to @end: tex@asis{}',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage/command_in_end_expanded_raw_in_command.pl 
b/tp/t/results/coverage/command_in_end_expanded_raw_in_command.pl
index 216db5a06e..0093f0b492 100644
--- a/tp/t/results/coverage/command_in_end_expanded_raw_in_command.pl
+++ b/tp/t/results/coverage/command_in_end_expanded_raw_in_command.pl
@@ -47,8 +47,7 @@ $result_trees{'command_in_end_expanded_raw_in_command'} = {
                           'cmdname' => 'code',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 3,
-                            'macro' => ''
+                            'line_nr' => 3
                           }
                         }
                       ],
@@ -69,8 +68,7 @@ $result_trees{'command_in_end_expanded_raw_in_command'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 }
               ],
@@ -79,8 +77,7 @@ $result_trees{'command_in_end_expanded_raw_in_command'} = {
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -105,7 +102,6 @@ $result_errors{'command_in_end_expanded_raw_in_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@code should not appear in @end',
     'type' => 'warning'
   },
@@ -114,7 +110,6 @@ $result_errors{'command_in_end_expanded_raw_in_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'bad argument to @end: @code{tex}',
     'type' => 'error'
   },
@@ -123,7 +118,6 @@ $result_errors{'command_in_end_expanded_raw_in_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'no matching `@end tex\'',
     'type' => 'error'
   }
diff --git 
a/tp/t/results/coverage/command_in_end_expanded_raw_one_char_before_command.pl 
b/tp/t/results/coverage/command_in_end_expanded_raw_one_char_before_command.pl
index a1f5e0c484..f21a8fef9f 100644
--- 
a/tp/t/results/coverage/command_in_end_expanded_raw_one_char_before_command.pl
+++ 
b/tp/t/results/coverage/command_in_end_expanded_raw_one_char_before_command.pl
@@ -48,8 +48,7 @@ 
$result_trees{'command_in_end_expanded_raw_one_char_before_command'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     },
                     {
@@ -76,15 +75,13 @@ 
$result_trees{'command_in_end_expanded_raw_one_char_before_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -109,7 +106,6 @@ 
$result_errors{'command_in_end_expanded_raw_one_char_before_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@asis should not appear in @end',
     'type' => 'warning'
   },
@@ -118,7 +114,6 @@ 
$result_errors{'command_in_end_expanded_raw_one_char_before_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'bad argument to @end: t@asis{}ex',
     'type' => 'error'
   }
diff --git 
a/tp/t/results/coverage/command_in_end_expanded_raw_one_char_not_in_command.pl 
b/tp/t/results/coverage/command_in_end_expanded_raw_one_char_not_in_command.pl
index 72980a351b..c1a249e2a7 100644
--- 
a/tp/t/results/coverage/command_in_end_expanded_raw_one_char_not_in_command.pl
+++ 
b/tp/t/results/coverage/command_in_end_expanded_raw_one_char_not_in_command.pl
@@ -50,8 +50,7 @@ 
$result_trees{'command_in_end_expanded_raw_one_char_not_in_command'} = {
                           'cmdname' => 'asis',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 3,
-                            'macro' => ''
+                            'line_nr' => 3
                           }
                         }
                       ],
@@ -75,8 +74,7 @@ 
$result_trees{'command_in_end_expanded_raw_one_char_not_in_command'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 }
               ],
@@ -85,8 +83,7 @@ 
$result_trees{'command_in_end_expanded_raw_one_char_not_in_command'} = {
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -111,7 +108,6 @@ 
$result_errors{'command_in_end_expanded_raw_one_char_not_in_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@asis should not appear in @end',
     'type' => 'warning'
   },
@@ -120,7 +116,6 @@ 
$result_errors{'command_in_end_expanded_raw_one_char_not_in_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'unknown @end t',
     'type' => 'warning'
   },
@@ -129,7 +124,6 @@ 
$result_errors{'command_in_end_expanded_raw_one_char_not_in_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'bad argument to @end: t@asis{ex}',
     'type' => 'error'
   },
@@ -138,7 +132,6 @@ 
$result_errors{'command_in_end_expanded_raw_one_char_not_in_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'no matching `@end tex\'',
     'type' => 'error'
   }
diff --git 
a/tp/t/results/coverage/command_in_end_expanded_raw_two_char_before_command.pl 
b/tp/t/results/coverage/command_in_end_expanded_raw_two_char_before_command.pl
index 13d59c7929..146607da94 100644
--- 
a/tp/t/results/coverage/command_in_end_expanded_raw_two_char_before_command.pl
+++ 
b/tp/t/results/coverage/command_in_end_expanded_raw_two_char_before_command.pl
@@ -48,8 +48,7 @@ 
$result_trees{'command_in_end_expanded_raw_two_char_before_command'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     },
                     {
@@ -76,15 +75,13 @@ 
$result_trees{'command_in_end_expanded_raw_two_char_before_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -109,7 +106,6 @@ 
$result_errors{'command_in_end_expanded_raw_two_char_before_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@asis should not appear in @end',
     'type' => 'warning'
   },
@@ -118,7 +114,6 @@ 
$result_errors{'command_in_end_expanded_raw_two_char_before_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'bad argument to @end: te@asis{}x',
     'type' => 'error'
   }
diff --git 
a/tp/t/results/coverage/command_in_end_expanded_raw_two_char_not_in_command.pl 
b/tp/t/results/coverage/command_in_end_expanded_raw_two_char_not_in_command.pl
index 816e4c2af5..02e6f7bb70 100644
--- 
a/tp/t/results/coverage/command_in_end_expanded_raw_two_char_not_in_command.pl
+++ 
b/tp/t/results/coverage/command_in_end_expanded_raw_two_char_not_in_command.pl
@@ -50,8 +50,7 @@ 
$result_trees{'command_in_end_expanded_raw_two_char_not_in_command'} = {
                           'cmdname' => 'asis',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 3,
-                            'macro' => ''
+                            'line_nr' => 3
                           }
                         }
                       ],
@@ -75,8 +74,7 @@ 
$result_trees{'command_in_end_expanded_raw_two_char_not_in_command'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 }
               ],
@@ -85,8 +83,7 @@ 
$result_trees{'command_in_end_expanded_raw_two_char_not_in_command'} = {
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -111,7 +108,6 @@ 
$result_errors{'command_in_end_expanded_raw_two_char_not_in_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@asis should not appear in @end',
     'type' => 'warning'
   },
@@ -120,7 +116,6 @@ 
$result_errors{'command_in_end_expanded_raw_two_char_not_in_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'unknown @end te',
     'type' => 'warning'
   },
@@ -129,7 +124,6 @@ 
$result_errors{'command_in_end_expanded_raw_two_char_not_in_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'bad argument to @end: te@asis{x}',
     'type' => 'error'
   },
@@ -138,7 +132,6 @@ 
$result_errors{'command_in_end_expanded_raw_two_char_not_in_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'no matching `@end tex\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage/command_in_end_ignored_raw_command_after.pl 
b/tp/t/results/coverage/command_in_end_ignored_raw_command_after.pl
index 1af4ed528d..d0dbe1a1f8 100644
--- a/tp/t/results/coverage/command_in_end_ignored_raw_command_after.pl
+++ b/tp/t/results/coverage/command_in_end_ignored_raw_command_after.pl
@@ -54,8 +54,7 @@ $result_trees{'command_in_end_ignored_raw_command_after'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -79,15 +78,13 @@ $result_trees{'command_in_end_ignored_raw_command_after'} = 
{
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -111,7 +108,6 @@ $result_errors{'command_in_end_ignored_raw_command_after'} 
= [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@asis should not appear in @end',
     'type' => 'warning'
   },
@@ -120,7 +116,6 @@ $result_errors{'command_in_end_ignored_raw_command_after'} 
= [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'bad argument to @end: html@asis{asis}',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage/command_in_end_ignored_raw_in_command.pl 
b/tp/t/results/coverage/command_in_end_ignored_raw_in_command.pl
index 5dd467391a..3e1d202c1a 100644
--- a/tp/t/results/coverage/command_in_end_ignored_raw_in_command.pl
+++ b/tp/t/results/coverage/command_in_end_ignored_raw_in_command.pl
@@ -41,8 +41,7 @@ $result_trees{'command_in_end_ignored_raw_in_command'} = {
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -66,7 +65,6 @@ $result_errors{'command_in_end_ignored_raw_in_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'no matching `@end html\'',
     'type' => 'error'
   }
diff --git 
a/tp/t/results/coverage/command_in_end_ignored_raw_one_char_before_command.pl 
b/tp/t/results/coverage/command_in_end_ignored_raw_one_char_before_command.pl
index de468d794d..322b64bc4a 100644
--- 
a/tp/t/results/coverage/command_in_end_ignored_raw_one_char_before_command.pl
+++ 
b/tp/t/results/coverage/command_in_end_ignored_raw_one_char_before_command.pl
@@ -41,8 +41,7 @@ 
$result_trees{'command_in_end_ignored_raw_one_char_before_command'} = {
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -66,7 +65,6 @@ 
$result_errors{'command_in_end_ignored_raw_one_char_before_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'no matching `@end html\'',
     'type' => 'error'
   }
diff --git 
a/tp/t/results/coverage/command_in_end_ignored_raw_one_char_not_in_command.pl 
b/tp/t/results/coverage/command_in_end_ignored_raw_one_char_not_in_command.pl
index cac6a086cc..cf99a1a57f 100644
--- 
a/tp/t/results/coverage/command_in_end_ignored_raw_one_char_not_in_command.pl
+++ 
b/tp/t/results/coverage/command_in_end_ignored_raw_one_char_not_in_command.pl
@@ -41,8 +41,7 @@ 
$result_trees{'command_in_end_ignored_raw_one_char_not_in_command'} = {
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -66,7 +65,6 @@ 
$result_errors{'command_in_end_ignored_raw_one_char_not_in_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'no matching `@end html\'',
     'type' => 'error'
   }
diff --git 
a/tp/t/results/coverage/command_in_end_ignored_raw_two_char_before_command.pl 
b/tp/t/results/coverage/command_in_end_ignored_raw_two_char_before_command.pl
index 449a3f5fa9..6fc065ba63 100644
--- 
a/tp/t/results/coverage/command_in_end_ignored_raw_two_char_before_command.pl
+++ 
b/tp/t/results/coverage/command_in_end_ignored_raw_two_char_before_command.pl
@@ -41,8 +41,7 @@ 
$result_trees{'command_in_end_ignored_raw_two_char_before_command'} = {
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -66,7 +65,6 @@ 
$result_errors{'command_in_end_ignored_raw_two_char_before_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'no matching `@end html\'',
     'type' => 'error'
   }
diff --git 
a/tp/t/results/coverage/command_in_end_ignored_raw_two_char_not_in_command.pl 
b/tp/t/results/coverage/command_in_end_ignored_raw_two_char_not_in_command.pl
index af54534925..b1f2de977c 100644
--- 
a/tp/t/results/coverage/command_in_end_ignored_raw_two_char_not_in_command.pl
+++ 
b/tp/t/results/coverage/command_in_end_ignored_raw_two_char_not_in_command.pl
@@ -41,8 +41,7 @@ 
$result_trees{'command_in_end_ignored_raw_two_char_not_in_command'} = {
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -66,7 +65,6 @@ 
$result_errors{'command_in_end_ignored_raw_two_char_not_in_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'no matching `@end html\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage/commands.pl 
b/tp/t/results/coverage/commands.pl
index 850c6b8054..4a97fc10ed 100644
--- a/tp/t/results/coverage/commands.pl
+++ b/tp/t/results/coverage/commands.pl
@@ -26,8 +26,7 @@ $result_trees{'commands'} = {
               'cmdname' => 'TeX',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -51,8 +50,7 @@ $result_trees{'commands'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -76,8 +74,7 @@ $result_trees{'commands'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -87,8 +84,7 @@ $result_trees{'commands'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -108,8 +104,7 @@ $result_trees{'commands'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -134,8 +129,7 @@ $result_trees{'commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -171,8 +165,7 @@ $result_trees{'commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     },
                     {
@@ -185,8 +178,7 @@ $result_trees{'commands'} = {
               'cmdname' => 'clicksequence',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -223,8 +215,7 @@ $result_trees{'commands'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -244,8 +235,7 @@ $result_trees{'commands'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -269,8 +259,7 @@ $result_trees{'commands'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -301,8 +290,7 @@ $result_trees{'commands'} = {
                   'cmdname' => 'LaTeX',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 8,
-                    'macro' => ''
+                    'line_nr' => 8
                   }
                 }
               ],
@@ -330,8 +318,7 @@ $result_trees{'commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           },
           'type' => 'index_entry_command'
         },
@@ -361,8 +348,7 @@ $result_trees{'commands'} = {
                   'cmdname' => 'b',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 }
               ],
@@ -383,8 +369,7 @@ $result_trees{'commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         }
       ],
@@ -424,7 +409,6 @@ $result_errors{'commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/coverage/commands_in_math.pl 
b/tp/t/results/coverage/commands_in_math.pl
index f7f0791d2c..b19ea29760 100644
--- a/tp/t/results/coverage/commands_in_math.pl
+++ b/tp/t/results/coverage/commands_in_math.pl
@@ -42,8 +42,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'strong',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -63,8 +62,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -83,8 +81,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -99,8 +96,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -115,8 +111,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -157,15 +152,13 @@ $result_trees{'commands_in_math'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -201,8 +194,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -222,8 +214,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -243,8 +234,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -264,8 +254,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -285,8 +274,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -306,8 +294,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -327,8 +314,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -348,8 +334,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -369,8 +354,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -390,8 +374,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -415,8 +398,7 @@ $result_trees{'commands_in_math'} = {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     }
                   ],
@@ -426,8 +408,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -443,8 +424,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -468,8 +448,7 @@ $result_trees{'commands_in_math'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     }
                   ],
@@ -479,8 +458,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => ',',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -504,8 +482,7 @@ $result_trees{'commands_in_math'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     }
                   ],
@@ -515,8 +492,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => ',',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -536,8 +512,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => ',',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -557,8 +532,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'H',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -578,8 +552,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -599,8 +572,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'ringaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -620,8 +592,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'tieaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -642,8 +613,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'u',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -663,8 +633,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'ubaraccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -684,8 +653,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -705,8 +673,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'v',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -726,8 +693,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'ogonek',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -747,8 +713,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'sup',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -765,8 +730,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'sub',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -862,8 +826,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'today',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -898,15 +861,13 @@ $result_trees{'commands_in_math'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -940,8 +901,7 @@ $result_trees{'commands_in_math'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -962,8 +922,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'U',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -979,8 +938,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'TeX',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -995,8 +953,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'LaTeX',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -1011,8 +968,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'bullet',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -1027,8 +983,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -1043,8 +998,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -1059,8 +1013,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -1075,8 +1028,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -1092,8 +1044,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -1108,8 +1059,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -1124,8 +1074,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -1140,8 +1089,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'point',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -1156,8 +1104,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'print',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -1172,8 +1119,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'result',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -1189,8 +1135,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -1205,8 +1150,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -1221,8 +1165,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'ae',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -1237,8 +1180,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'oe',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -1253,8 +1195,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'AE',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -1269,8 +1210,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'OE',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -1285,8 +1225,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'o',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -1301,8 +1240,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'O',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -1317,8 +1255,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'ss',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -1333,8 +1270,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -1349,8 +1285,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'L',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -1365,8 +1300,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'DH',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -1382,8 +1316,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'TH',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -1398,8 +1331,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'dh',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -1414,8 +1346,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'th',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -1430,8 +1361,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -1446,8 +1376,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'questiondown',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -1462,8 +1391,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'pounds',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -1479,8 +1407,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -1495,8 +1422,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'ordf',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -1511,8 +1437,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'ordm',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -1527,8 +1452,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -1563,15 +1487,13 @@ $result_trees{'commands_in_math'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           }
         },
         {
@@ -1602,8 +1524,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             },
             {
@@ -1618,8 +1539,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             },
             {
@@ -1635,8 +1555,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'quoteleft',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             },
             {
@@ -1651,8 +1570,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'quoteright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             },
             {
@@ -1667,8 +1585,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'quotedblbase',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             },
             {
@@ -1683,8 +1600,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'quotesinglbase',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             },
             {
@@ -1699,8 +1615,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'guillemetleft',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             },
             {
@@ -1716,8 +1631,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'guillemetright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             },
             {
@@ -1732,8 +1646,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'guillemotleft',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             },
             {
@@ -1748,8 +1661,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'guillemotright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             },
             {
@@ -1764,8 +1676,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'guilsinglleft',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             },
             {
@@ -1781,8 +1692,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'guilsinglright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -1797,8 +1707,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'textdegree',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -1813,8 +1722,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'euro',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -1829,8 +1737,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'arrow',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -1845,8 +1752,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'leq',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -1861,8 +1767,7 @@ $result_trees{'commands_in_math'} = {
               'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -1897,15 +1802,13 @@ $result_trees{'commands_in_math'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         }
       ],
@@ -1981,7 +1884,6 @@ $result_errors{'commands_in_math'} = [
 ',
     'file_name' => '',
     'line_nr' => 12,
-    'macro' => '',
     'text' => '@| should only appear in heading or footing',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage/comment_on_cartouche_line.pl 
b/tp/t/results/coverage/comment_on_cartouche_line.pl
index 952745eebb..f259ae0446 100644
--- a/tp/t/results/coverage/comment_on_cartouche_line.pl
+++ b/tp/t/results/coverage/comment_on_cartouche_line.pl
@@ -66,8 +66,7 @@ $result_trees{'comment_on_cartouche_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -78,8 +77,7 @@ $result_trees{'comment_on_cartouche_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -105,8 +103,7 @@ $result_trees{'comment_on_cartouche_line'} = {
                   'cmdname' => 'emph',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 }
               ],
@@ -167,8 +164,7 @@ $result_trees{'comment_on_cartouche_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -179,8 +175,7 @@ $result_trees{'comment_on_cartouche_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
diff --git a/tp/t/results/coverage/comment_on_group_line.pl 
b/tp/t/results/coverage/comment_on_group_line.pl
index db10f3c7dc..c77f808af6 100644
--- a/tp/t/results/coverage/comment_on_group_line.pl
+++ b/tp/t/results/coverage/comment_on_group_line.pl
@@ -66,8 +66,7 @@ $result_trees{'comment_on_group_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -78,8 +77,7 @@ $result_trees{'comment_on_group_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/coverage/def.pl b/tp/t/results/coverage/def.pl
index 9b907f066d..64ba678a40 100644
--- a/tp/t/results/coverage/def.pl
+++ b/tp/t/results/coverage/def.pl
@@ -32,8 +32,7 @@ $result_trees{'def'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -84,8 +83,7 @@ $result_trees{'def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               },
               'type' => 'def_line'
             },
@@ -131,8 +129,7 @@ $result_trees{'def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -143,8 +140,7 @@ $result_trees{'def'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -297,8 +293,7 @@ $result_trees{'def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'def_line'
             },
@@ -344,8 +339,7 @@ $result_trees{'def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
@@ -356,8 +350,7 @@ $result_trees{'def'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -402,8 +395,7 @@ $result_trees{'def'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     },
                     {
@@ -453,8 +445,7 @@ $result_trees{'def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'def_line'
             },
@@ -473,8 +464,7 @@ $result_trees{'def'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -504,8 +494,7 @@ $result_trees{'def'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -536,8 +525,7 @@ $result_trees{'def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               },
               'type' => 'def_line'
             },
@@ -569,8 +557,7 @@ $result_trees{'def'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -587,8 +574,7 @@ $result_trees{'def'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -619,8 +605,7 @@ $result_trees{'def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               },
               'type' => 'def_line'
             },
@@ -657,8 +642,7 @@ $result_trees{'def'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -675,8 +659,7 @@ $result_trees{'def'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -707,8 +690,7 @@ $result_trees{'def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               },
               'type' => 'def_line'
             },
@@ -745,8 +727,7 @@ $result_trees{'def'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -763,8 +744,7 @@ $result_trees{'def'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -795,8 +775,7 @@ $result_trees{'def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               },
               'type' => 'def_line'
             },
@@ -834,8 +813,7 @@ $result_trees{'def'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -878,8 +856,7 @@ $result_trees{'def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               },
               'type' => 'def_line'
             },
@@ -921,8 +898,7 @@ $result_trees{'def'} = {
                               'cmdname' => 'samp',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 17,
-                                'macro' => ''
+                                'line_nr' => 17
                               }
                             },
                             {
@@ -938,8 +914,7 @@ $result_trees{'def'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -982,8 +957,7 @@ $result_trees{'def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               },
               'type' => 'def_line'
             },
@@ -997,8 +971,7 @@ $result_trees{'def'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -1037,8 +1010,7 @@ $result_trees{'def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               },
               'type' => 'def_line'
             },
@@ -1052,8 +1024,7 @@ $result_trees{'def'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 19,
-                        'macro' => ''
+                        'line_nr' => 19
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -1075,8 +1046,7 @@ $result_trees{'def'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 19,
-                        'macro' => ''
+                        'line_nr' => 19
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -1102,8 +1072,7 @@ $result_trees{'def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               },
               'type' => 'def_line'
             },
@@ -1122,8 +1091,7 @@ $result_trees{'def'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -1162,8 +1130,7 @@ $result_trees{'def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               },
               'type' => 'def_line'
             },
@@ -1182,8 +1149,7 @@ $result_trees{'def'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 21,
-                        'macro' => ''
+                        'line_nr' => 21
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -1266,8 +1232,7 @@ $result_trees{'def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               },
               'type' => 'def_line'
             },
@@ -1301,8 +1266,7 @@ $result_trees{'def'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 23,
-                        'macro' => ''
+                        'line_nr' => 23
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -1385,8 +1349,7 @@ $result_trees{'def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               },
               'type' => 'def_line'
             },
@@ -1420,8 +1383,7 @@ $result_trees{'def'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 25,
-                        'macro' => ''
+                        'line_nr' => 25
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -1504,8 +1466,7 @@ $result_trees{'def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               },
               'type' => 'def_line'
             },
@@ -1551,8 +1512,7 @@ $result_trees{'def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             }
           ],
@@ -1563,8 +1523,7 @@ $result_trees{'def'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         }
       ],
@@ -1648,7 +1607,6 @@ $result_errors{'def'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -1657,7 +1615,6 @@ $result_errors{'def'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -1666,7 +1623,6 @@ $result_errors{'def'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -1675,7 +1631,6 @@ $result_errors{'def'} = [
 ',
     'file_name' => '',
     'line_nr' => 12,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -1684,7 +1639,6 @@ $result_errors{'def'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -1693,7 +1647,6 @@ $result_errors{'def'} = [
 ',
     'file_name' => '',
     'line_nr' => 14,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -1702,7 +1655,6 @@ $result_errors{'def'} = [
 ',
     'file_name' => '',
     'line_nr' => 15,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -1711,7 +1663,6 @@ $result_errors{'def'} = [
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -1720,7 +1671,6 @@ $result_errors{'def'} = [
 ',
     'file_name' => '',
     'line_nr' => 17,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -1729,7 +1679,6 @@ $result_errors{'def'} = [
 ',
     'file_name' => '',
     'line_nr' => 18,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -1738,7 +1687,6 @@ $result_errors{'def'} = [
 ',
     'file_name' => '',
     'line_nr' => 19,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -1747,7 +1695,6 @@ $result_errors{'def'} = [
 ',
     'file_name' => '',
     'line_nr' => 20,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -1756,7 +1703,6 @@ $result_errors{'def'} = [
 ',
     'file_name' => '',
     'line_nr' => 21,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -1765,7 +1711,6 @@ $result_errors{'def'} = [
 ',
     'file_name' => '',
     'line_nr' => 23,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -1774,7 +1719,6 @@ $result_errors{'def'} = [
 ',
     'file_name' => '',
     'line_nr' => 25,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   }
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 a461b1188f..0de39548ee 100644
--- a/tp/t/results/coverage/delcomment_followed_by_cpp_line.pl
+++ b/tp/t/results/coverage/delcomment_followed_by_cpp_line.pl
@@ -220,7 +220,6 @@ $result_errors{'delcomment_followed_by_cpp_line'} = [
 ',
     'file_name' => 'delcomment_followed_by_cpp_line.texi',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'unknown command `unknown\'',
     'type' => 'error'
   },
@@ -229,7 +228,6 @@ $result_errors{'delcomment_followed_by_cpp_line'} = [
 ',
     'file_name' => 'delcomment_followed_by_cpp_line.texi',
     'line_nr' => 14,
-    'macro' => '',
     'text' => 'unknown command `unknown1\'',
     'type' => 'error'
   },
@@ -238,7 +236,6 @@ $result_errors{'delcomment_followed_by_cpp_line'} = [
 ',
     'file_name' => 'delcomment_followed_by_cpp_line.texi',
     'line_nr' => 19,
-    'macro' => '',
     'text' => 'unknown command `unknown2\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage/displaymath.pl 
b/tp/t/results/coverage/displaymath.pl
index c23409abbb..266aea150b 100644
--- a/tp/t/results/coverage/displaymath.pl
+++ b/tp/t/results/coverage/displaymath.pl
@@ -43,8 +43,7 @@ $result_trees{'displaymath'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               },
               'type' => 'balanced_braces'
             },
@@ -59,8 +58,7 @@ $result_trees{'displaymath'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               },
               'type' => 'balanced_braces'
             },
@@ -96,15 +94,13 @@ $result_trees{'displaymath'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -155,8 +151,7 @@ $result_trees{'displaymath'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -176,8 +171,7 @@ $result_trees{'displaymath'} = {
               'cmdname' => 'sub',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -197,8 +191,7 @@ $result_trees{'displaymath'} = {
               'cmdname' => 'sup',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -233,15 +226,13 @@ $result_trees{'displaymath'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -295,8 +286,7 @@ $result_trees{'displaymath'} = {
                           ],
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 13,
-                            'macro' => ''
+                            'line_nr' => 13
                           },
                           'type' => 'balanced_braces'
                         }
@@ -307,8 +297,7 @@ $result_trees{'displaymath'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 13,
-                    'macro' => ''
+                    'line_nr' => 13
                   }
                 },
                 {
@@ -317,8 +306,7 @@ $result_trees{'displaymath'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               },
               'type' => 'balanced_braces'
             },
@@ -339,8 +327,7 @@ $result_trees{'displaymath'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               },
               'type' => 'balanced_braces'
             },
@@ -357,8 +344,7 @@ $result_trees{'displaymath'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 13,
-                    'macro' => ''
+                    'line_nr' => 13
                   },
                   'type' => 'balanced_braces'
                 },
@@ -368,8 +354,7 @@ $result_trees{'displaymath'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               },
               'type' => 'balanced_braces'
             },
@@ -405,15 +390,13 @@ $result_trees{'displaymath'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           }
         },
         {
@@ -486,15 +469,13 @@ $result_trees{'displaymath'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         }
       ],
diff --git a/tp/t/results/coverage/empty_w.pl b/tp/t/results/coverage/empty_w.pl
index 73fc842c96..076ce1d36e 100644
--- a/tp/t/results/coverage/empty_w.pl
+++ b/tp/t/results/coverage/empty_w.pl
@@ -20,8 +20,7 @@ $result_trees{'empty_w'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -41,8 +40,7 @@ $result_trees{'empty_w'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
diff --git a/tp/t/results/coverage/end_bad_end_argument_and_superfluous_arg.pl 
b/tp/t/results/coverage/end_bad_end_argument_and_superfluous_arg.pl
index 69a947bd52..209694bec9 100644
--- a/tp/t/results/coverage/end_bad_end_argument_and_superfluous_arg.pl
+++ b/tp/t/results/coverage/end_bad_end_argument_and_superfluous_arg.pl
@@ -50,8 +50,7 @@ $result_trees{'end_bad_end_argument_and_superfluous_arg'} = {
                           'cmdname' => 'code',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 3,
-                            'macro' => ''
+                            'line_nr' => 3
                           }
                         }
                       ],
@@ -75,8 +74,7 @@ $result_trees{'end_bad_end_argument_and_superfluous_arg'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 }
               ],
@@ -85,8 +83,7 @@ $result_trees{'end_bad_end_argument_and_superfluous_arg'} = {
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -111,7 +108,6 @@ $result_errors{'end_bad_end_argument_and_superfluous_arg'} 
= [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@code should not appear in @end',
     'type' => 'warning'
   },
@@ -120,7 +116,6 @@ $result_errors{'end_bad_end_argument_and_superfluous_arg'} 
= [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'bad argument to @end: : @code{in c}',
     'type' => 'error'
   },
@@ -129,7 +124,6 @@ $result_errors{'end_bad_end_argument_and_superfluous_arg'} 
= [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'no matching `@end quotation\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage/exdent_and_commands.pl 
b/tp/t/results/coverage/exdent_and_commands.pl
index dd94b6b6a1..66ffb561c1 100644
--- a/tp/t/results/coverage/exdent_and_commands.pl
+++ b/tp/t/results/coverage/exdent_and_commands.pl
@@ -55,8 +55,7 @@ $result_trees{'exdent_and_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -105,8 +104,7 @@ $result_trees{'exdent_and_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -146,15 +144,13 @@ $result_trees{'exdent_and_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -208,8 +204,7 @@ $result_trees{'exdent_and_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -258,8 +253,7 @@ $result_trees{'exdent_and_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -299,15 +293,13 @@ $result_trees{'exdent_and_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         }
       ],
diff --git a/tp/t/results/coverage/exdent_and_formats.pl 
b/tp/t/results/coverage/exdent_and_formats.pl
index 6d33d434e2..ce3877e1b2 100644
--- a/tp/t/results/coverage/exdent_and_formats.pl
+++ b/tp/t/results/coverage/exdent_and_formats.pl
@@ -37,8 +37,7 @@ $result_trees{'exdent_and_formats'} = {
                   'cmdname' => 'TeX',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   }
                 },
                 {
@@ -90,8 +89,7 @@ $result_trees{'exdent_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -131,15 +129,13 @@ $result_trees{'exdent_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -191,8 +187,7 @@ $result_trees{'exdent_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -229,8 +224,7 @@ $result_trees{'exdent_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -270,15 +264,13 @@ $result_trees{'exdent_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -355,15 +347,13 @@ $result_trees{'exdent_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           }
         },
         {
@@ -468,15 +458,13 @@ $result_trees{'exdent_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 29,
-            'macro' => ''
+            'line_nr' => 29
           }
         },
         {
@@ -549,15 +537,13 @@ $result_trees{'exdent_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 34,
-            'macro' => ''
+            'line_nr' => 34
           }
         },
         {
@@ -636,8 +622,7 @@ $result_trees{'exdent_and_formats'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 44,
-                    'macro' => ''
+                    'line_nr' => 44
                   }
                 },
                 {
@@ -668,15 +653,13 @@ $result_trees{'exdent_and_formats'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 45,
-                    'macro' => ''
+                    'line_nr' => 45
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               }
             },
             {
@@ -707,15 +690,13 @@ $result_trees{'exdent_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 40,
-            'macro' => ''
+            'line_nr' => 40
           }
         },
         {
@@ -762,8 +743,7 @@ $result_trees{'exdent_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             },
             {
@@ -794,15 +774,13 @@ $result_trees{'exdent_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 48,
-            'macro' => ''
+            'line_nr' => 48
           }
         },
         {
@@ -858,8 +836,7 @@ $result_trees{'exdent_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 54,
-                'macro' => ''
+                'line_nr' => 54
               }
             },
             {
@@ -890,15 +867,13 @@ $result_trees{'exdent_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 55,
-                'macro' => ''
+                'line_nr' => 55
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 52,
-            'macro' => ''
+            'line_nr' => 52
           }
         },
         {
@@ -945,8 +920,7 @@ $result_trees{'exdent_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             },
             {
@@ -986,15 +960,13 @@ $result_trees{'exdent_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 60,
-                'macro' => ''
+                'line_nr' => 60
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 57,
-            'macro' => ''
+            'line_nr' => 57
           }
         },
         {
@@ -1041,8 +1013,7 @@ $result_trees{'exdent_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 63,
-                'macro' => ''
+                'line_nr' => 63
               }
             },
             {
@@ -1070,8 +1041,7 @@ $result_trees{'exdent_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             },
             {
@@ -1102,15 +1072,13 @@ $result_trees{'exdent_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 62,
-            'macro' => ''
+            'line_nr' => 62
           }
         },
         {
@@ -1157,8 +1125,7 @@ $result_trees{'exdent_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 68,
-                'macro' => ''
+                'line_nr' => 68
               }
             },
             {
@@ -1186,8 +1153,7 @@ $result_trees{'exdent_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 69,
-                'macro' => ''
+                'line_nr' => 69
               }
             },
             {
@@ -1218,15 +1184,13 @@ $result_trees{'exdent_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 70,
-                'macro' => ''
+                'line_nr' => 70
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 67,
-            'macro' => ''
+            'line_nr' => 67
           }
         },
         {
@@ -1282,8 +1246,7 @@ $result_trees{'exdent_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 74,
-                'macro' => ''
+                'line_nr' => 74
               }
             },
             {
@@ -1314,15 +1277,13 @@ $result_trees{'exdent_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 75,
-                'macro' => ''
+                'line_nr' => 75
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 72,
-            'macro' => ''
+            'line_nr' => 72
           }
         },
         {
@@ -1369,8 +1330,7 @@ $result_trees{'exdent_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 78,
-                'macro' => ''
+                'line_nr' => 78
               }
             },
             {
@@ -1398,8 +1358,7 @@ $result_trees{'exdent_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 79,
-                'macro' => ''
+                'line_nr' => 79
               }
             },
             {
@@ -1430,15 +1389,13 @@ $result_trees{'exdent_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 80,
-                'macro' => ''
+                'line_nr' => 80
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 77,
-            'macro' => ''
+            'line_nr' => 77
           }
         }
       ],
diff --git a/tp/t/results/coverage/flushleft_flushright.pl 
b/tp/t/results/coverage/flushleft_flushright.pl
index fa41b64002..f012657975 100644
--- a/tp/t/results/coverage/flushleft_flushright.pl
+++ b/tp/t/results/coverage/flushleft_flushright.pl
@@ -87,15 +87,13 @@ $result_trees{'flushleft_flushright'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -176,15 +174,13 @@ $result_trees{'flushleft_flushright'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         }
       ],
diff --git a/tp/t/results/coverage/flushleft_flushright_in_quotation.pl 
b/tp/t/results/coverage/flushleft_flushright_in_quotation.pl
index b97a4dfa15..648cd447af 100644
--- a/tp/t/results/coverage/flushleft_flushright_in_quotation.pl
+++ b/tp/t/results/coverage/flushleft_flushright_in_quotation.pl
@@ -83,15 +83,13 @@ $result_trees{'flushleft_flushright_in_quotation'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -154,15 +152,13 @@ $result_trees{'flushleft_flushright_in_quotation'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -193,15 +189,13 @@ $result_trees{'flushleft_flushright_in_quotation'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
diff --git a/tp/t/results/coverage/flushright_example_nested.pl 
b/tp/t/results/coverage/flushright_example_nested.pl
index 05609b6f2e..b9aead166e 100644
--- a/tp/t/results/coverage/flushright_example_nested.pl
+++ b/tp/t/results/coverage/flushright_example_nested.pl
@@ -79,15 +79,13 @@ $result_trees{'flushright_example_nested'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -118,15 +116,13 @@ $result_trees{'flushright_example_nested'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -208,15 +204,13 @@ $result_trees{'flushright_example_nested'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 13,
-                    'macro' => ''
+                    'line_nr' => 13
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -247,15 +241,13 @@ $result_trees{'flushright_example_nested'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         }
       ],
diff --git a/tp/t/results/coverage/flushright_not_closed.pl 
b/tp/t/results/coverage/flushright_not_closed.pl
index 893c534a02..a9c7624010 100644
--- a/tp/t/results/coverage/flushright_not_closed.pl
+++ b/tp/t/results/coverage/flushright_not_closed.pl
@@ -40,8 +40,7 @@ $result_trees{'flushright_not_closed'} = {
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -67,7 +66,6 @@ $result_errors{'flushright_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'no matching `@end flushright\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage/formats_only_title_comments.pl 
b/tp/t/results/coverage/formats_only_title_comments.pl
index 880d12d602..0cf5fc1038 100644
--- a/tp/t/results/coverage/formats_only_title_comments.pl
+++ b/tp/t/results/coverage/formats_only_title_comments.pl
@@ -81,8 +81,7 @@ $result_trees{'formats_only_title_comments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -91,8 +90,7 @@ $result_trees{'formats_only_title_comments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -172,8 +170,7 @@ $result_trees{'formats_only_title_comments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
@@ -187,8 +184,7 @@ $result_trees{'formats_only_title_comments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -204,8 +200,7 @@ $result_trees{'formats_only_title_comments'} = {
                   'cmdname' => 'emph',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   },
                   'type' => 'command_as_argument'
                 }
@@ -273,8 +268,7 @@ $result_trees{'formats_only_title_comments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
@@ -288,8 +282,7 @@ $result_trees{'formats_only_title_comments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -305,8 +298,7 @@ $result_trees{'formats_only_title_comments'} = {
                   'cmdname' => 'asis',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 16,
-                    'macro' => ''
+                    'line_nr' => 16
                   },
                   'type' => 'command_as_argument'
                 }
@@ -373,8 +365,7 @@ $result_trees{'formats_only_title_comments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             }
           ],
@@ -388,8 +379,7 @@ $result_trees{'formats_only_title_comments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           }
         },
         {
@@ -432,8 +422,7 @@ $result_trees{'formats_only_title_comments'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 20,
-                    'macro' => ''
+                    'line_nr' => 20
                   }
                 }
               ],
@@ -494,8 +483,7 @@ $result_trees{'formats_only_title_comments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             }
           ],
@@ -510,8 +498,7 @@ $result_trees{'formats_only_title_comments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         }
       ],
@@ -568,7 +555,6 @@ $result_errors{'formats_only_title_comments'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@itemize has text but no @item',
     'type' => 'warning'
   },
@@ -577,7 +563,6 @@ $result_errors{'formats_only_title_comments'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => '@enumerate has text but no @item',
     'type' => 'warning'
   },
@@ -586,7 +571,6 @@ $result_errors{'formats_only_title_comments'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => '@table has text but no @item',
     'type' => 'warning'
   },
@@ -595,7 +579,6 @@ $result_errors{'formats_only_title_comments'} = [
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => '@vtable has text but no @item',
     'type' => 'warning'
   },
@@ -604,7 +587,6 @@ $result_errors{'formats_only_title_comments'} = [
 ',
     'file_name' => '',
     'line_nr' => 20,
-    'macro' => '',
     'text' => '@multitable has text but no @item',
     'type' => 'warning'
   }
diff --git a/tp/t/results/coverage/formats_only_titles.pl 
b/tp/t/results/coverage/formats_only_titles.pl
index 3c653b1d83..4702c5b10c 100644
--- a/tp/t/results/coverage/formats_only_titles.pl
+++ b/tp/t/results/coverage/formats_only_titles.pl
@@ -71,8 +71,7 @@ $result_trees{'formats_only_titles'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -81,8 +80,7 @@ $result_trees{'formats_only_titles'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -146,8 +144,7 @@ $result_trees{'formats_only_titles'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -156,8 +153,7 @@ $result_trees{'formats_only_titles'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -173,8 +169,7 @@ $result_trees{'formats_only_titles'} = {
                   'cmdname' => 'emph',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   },
                   'type' => 'command_as_argument'
                 }
@@ -232,8 +227,7 @@ $result_trees{'formats_only_titles'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
@@ -247,8 +241,7 @@ $result_trees{'formats_only_titles'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -264,8 +257,7 @@ $result_trees{'formats_only_titles'} = {
                   'cmdname' => 'asis',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 13,
-                    'macro' => ''
+                    'line_nr' => 13
                   },
                   'type' => 'command_as_argument'
                 }
@@ -323,8 +315,7 @@ $result_trees{'formats_only_titles'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
@@ -338,8 +329,7 @@ $result_trees{'formats_only_titles'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -382,8 +372,7 @@ $result_trees{'formats_only_titles'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 17,
-                    'macro' => ''
+                    'line_nr' => 17
                   }
                 }
               ],
@@ -434,8 +423,7 @@ $result_trees{'formats_only_titles'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             }
           ],
@@ -450,8 +438,7 @@ $result_trees{'formats_only_titles'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         }
       ],
@@ -504,7 +491,6 @@ $result_errors{'formats_only_titles'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@itemize has text but no @item',
     'type' => 'warning'
   },
@@ -513,7 +499,6 @@ $result_errors{'formats_only_titles'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@enumerate has text but no @item',
     'type' => 'warning'
   },
@@ -522,7 +507,6 @@ $result_errors{'formats_only_titles'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@table has text but no @item',
     'type' => 'warning'
   },
@@ -531,7 +515,6 @@ $result_errors{'formats_only_titles'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => '@vtable has text but no @item',
     'type' => 'warning'
   },
@@ -540,7 +523,6 @@ $result_errors{'formats_only_titles'} = [
 ',
     'file_name' => '',
     'line_nr' => 17,
-    'macro' => '',
     'text' => '@multitable has text but no @item',
     'type' => 'warning'
   }
diff --git a/tp/t/results/coverage/formats_titles.pl 
b/tp/t/results/coverage/formats_titles.pl
index 2ebcd78fc1..d6f0f9fc8c 100644
--- a/tp/t/results/coverage/formats_titles.pl
+++ b/tp/t/results/coverage/formats_titles.pl
@@ -65,8 +65,7 @@ $result_trees{'formats_titles'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -97,8 +96,7 @@ $result_trees{'formats_titles'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -107,8 +105,7 @@ $result_trees{'formats_titles'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -166,8 +163,7 @@ $result_trees{'formats_titles'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -198,8 +194,7 @@ $result_trees{'formats_titles'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
@@ -208,8 +203,7 @@ $result_trees{'formats_titles'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -225,8 +219,7 @@ $result_trees{'formats_titles'} = {
                   'cmdname' => 'emph',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   },
                   'type' => 'command_as_argument'
                 }
@@ -285,8 +278,7 @@ $result_trees{'formats_titles'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     }
                   ],
@@ -323,8 +315,7 @@ $result_trees{'formats_titles'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
@@ -338,8 +329,7 @@ $result_trees{'formats_titles'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -355,8 +345,7 @@ $result_trees{'formats_titles'} = {
                   'cmdname' => 'asis',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 16,
-                    'macro' => ''
+                    'line_nr' => 16
                   },
                   'type' => 'command_as_argument'
                 }
@@ -421,8 +410,7 @@ $result_trees{'formats_titles'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       }
                     }
                   ],
@@ -459,8 +447,7 @@ $result_trees{'formats_titles'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             }
           ],
@@ -474,8 +461,7 @@ $result_trees{'formats_titles'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           }
         },
         {
@@ -518,8 +504,7 @@ $result_trees{'formats_titles'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 21,
-                    'macro' => ''
+                    'line_nr' => 21
                   }
                 }
               ],
@@ -567,8 +552,7 @@ $result_trees{'formats_titles'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 23,
-                        'macro' => ''
+                        'line_nr' => 23
                       }
                     },
                     {
@@ -593,8 +577,7 @@ $result_trees{'formats_titles'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 23,
-                        'macro' => ''
+                        'line_nr' => 23
                       }
                     }
                   ],
@@ -634,8 +617,7 @@ $result_trees{'formats_titles'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             }
           ],
@@ -650,8 +632,7 @@ $result_trees{'formats_titles'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 21,
-            'macro' => ''
+            'line_nr' => 21
           }
         }
       ],
@@ -714,7 +695,6 @@ $result_errors{'formats_titles'} = [
 ',
     'file_name' => '',
     'line_nr' => 18,
-    'macro' => '',
     'text' => 'entry for index `vr\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/coverage/group_beginning_and_end_on_line.pl 
b/tp/t/results/coverage/group_beginning_and_end_on_line.pl
index 4d27e74a67..70a4ff7e34 100644
--- a/tp/t/results/coverage/group_beginning_and_end_on_line.pl
+++ b/tp/t/results/coverage/group_beginning_and_end_on_line.pl
@@ -55,8 +55,7 @@ $result_trees{'group_beginning_and_end_on_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -67,8 +66,7 @@ $result_trees{'group_beginning_and_end_on_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -90,7 +88,6 @@ $result_errors{'group_beginning_and_end_on_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@end should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -99,7 +96,6 @@ $result_errors{'group_beginning_and_end_on_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'unexpected argument on @group line: within',
     'type' => 'warning'
   }
diff --git a/tp/t/results/coverage/group_not_closed.pl 
b/tp/t/results/coverage/group_not_closed.pl
index 91996734e4..ba3eb8410a 100644
--- a/tp/t/results/coverage/group_not_closed.pl
+++ b/tp/t/results/coverage/group_not_closed.pl
@@ -40,8 +40,7 @@ $result_trees{'group_not_closed'} = {
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -67,7 +66,6 @@ $result_errors{'group_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'no matching `@end group\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage/hyphenation.pl 
b/tp/t/results/coverage/hyphenation.pl
index 6d204ac4d8..9411bc7726 100644
--- a/tp/t/results/coverage/hyphenation.pl
+++ b/tp/t/results/coverage/hyphenation.pl
@@ -33,8 +33,7 @@ $result_trees{'hyphenation'} = {
           'cmdname' => 'hyphenation',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
diff --git a/tp/t/results/coverage/indentedblock.pl 
b/tp/t/results/coverage/indentedblock.pl
index 8514c445d6..9039b2af43 100644
--- a/tp/t/results/coverage/indentedblock.pl
+++ b/tp/t/results/coverage/indentedblock.pl
@@ -78,15 +78,13 @@ $result_trees{'indentedblock'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/coverage/indicateurl_end_lines.pl 
b/tp/t/results/coverage/indicateurl_end_lines.pl
index 77bc9f0b1c..8d8962802c 100644
--- a/tp/t/results/coverage/indicateurl_end_lines.pl
+++ b/tp/t/results/coverage/indicateurl_end_lines.pl
@@ -29,8 +29,7 @@ $result_trees{'indicateurl_end_lines'} = {
               'cmdname' => 'indicateurl',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -67,8 +66,7 @@ $result_trees{'indicateurl_end_lines'} = {
               'cmdname' => 'indicateurl',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -113,7 +111,6 @@ $result_errors{'indicateurl_end_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '@indicateurl missing closing brace',
     'type' => 'error'
   },
@@ -122,7 +119,6 @@ $result_errors{'indicateurl_end_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage/insertcopying.pl 
b/tp/t/results/coverage/insertcopying.pl
index 95bfd1c000..cf58b4154b 100644
--- a/tp/t/results/coverage/insertcopying.pl
+++ b/tp/t/results/coverage/insertcopying.pl
@@ -88,15 +88,13 @@ $result_trees{'insertcopying'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -127,15 +125,13 @@ $result_trees{'insertcopying'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -168,8 +164,7 @@ $result_trees{'insertcopying'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         }
       ],
diff --git a/tp/t/results/coverage/invalid_U.pl 
b/tp/t/results/coverage/invalid_U.pl
index 8f86748c6b..db14ffef83 100644
--- a/tp/t/results/coverage/invalid_U.pl
+++ b/tp/t/results/coverage/invalid_U.pl
@@ -20,8 +20,7 @@ $result_trees{'invalid_U'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -33,8 +32,7 @@ $result_trees{'invalid_U'} = {
               'cmdname' => 'U',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -54,8 +52,7 @@ $result_trees{'invalid_U'} = {
               'cmdname' => 'U',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -75,8 +72,7 @@ $result_trees{'invalid_U'} = {
               'cmdname' => 'U',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -96,8 +92,7 @@ $result_trees{'invalid_U'} = {
               'cmdname' => 'U',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -117,8 +112,7 @@ $result_trees{'invalid_U'} = {
               'cmdname' => 'U',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -138,8 +132,7 @@ $result_trees{'invalid_U'} = {
               'cmdname' => 'U',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -168,8 +161,7 @@ $result_trees{'invalid_U'} = {
               'cmdname' => 'U',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -189,8 +181,7 @@ $result_trees{'invalid_U'} = {
               'cmdname' => 'U',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -218,8 +209,7 @@ $result_trees{'invalid_U'} = {
               'cmdname' => 'U',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -251,7 +241,6 @@ $result_errors{'invalid_U'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@U expected braces',
     'type' => 'error'
   },
@@ -260,7 +249,6 @@ $result_errors{'invalid_U'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'no argument specified for @U',
     'type' => 'warning'
   },
@@ -269,7 +257,6 @@ $result_errors{'invalid_U'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'non-hex digits in argument for @U: z',
     'type' => 'error'
   },
@@ -278,7 +265,6 @@ $result_errors{'invalid_U'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'fewer than four hex digits in argument for @U: abc',
     'type' => 'warning'
   },
@@ -287,7 +273,6 @@ $result_errors{'invalid_U'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'argument for @U exceeds Unicode maximum 0x10FFFF: 
9999999999999',
     'type' => 'error'
   },
@@ -296,7 +281,6 @@ $result_errors{'invalid_U'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'argument for @U exceeds Unicode maximum 0x10FFFF: 110000',
     'type' => 'error'
   },
@@ -305,7 +289,6 @@ $result_errors{'invalid_U'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'non-hex digits in argument for @U: wxyz',
     'type' => 'error'
   }
@@ -345,7 +328,6 @@ $result_converted_errors{'docbook'}->{'invalid_U'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'no argument specified for @U',
     'type' => 'warning'
   }
diff --git a/tp/t/results/coverage/item_container.pl 
b/tp/t/results/coverage/item_container.pl
index 020f3c0db1..457bb223b5 100644
--- a/tp/t/results/coverage/item_container.pl
+++ b/tp/t/results/coverage/item_container.pl
@@ -55,8 +55,7 @@ $result_trees{'item_container'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -87,8 +86,7 @@ $result_trees{'item_container'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -99,8 +97,7 @@ $result_trees{'item_container'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -116,8 +113,7 @@ $result_trees{'item_container'} = {
                   'cmdname' => 'bullet',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   },
                   'type' => 'command_as_argument'
                 }
@@ -160,8 +156,7 @@ $result_trees{'item_container'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -192,8 +187,7 @@ $result_trees{'item_container'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
@@ -207,8 +201,7 @@ $result_trees{'item_container'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -258,8 +251,7 @@ $result_trees{'item_container'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -290,8 +282,7 @@ $result_trees{'item_container'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             }
           ],
@@ -300,8 +291,7 @@ $result_trees{'item_container'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         }
       ],
diff --git a/tp/t/results/coverage/lettered_accent_and_spaces.pl 
b/tp/t/results/coverage/lettered_accent_and_spaces.pl
index 0f6cf07c88..c7be292ad5 100644
--- a/tp/t/results/coverage/lettered_accent_and_spaces.pl
+++ b/tp/t/results/coverage/lettered_accent_and_spaces.pl
@@ -30,8 +30,7 @@ $result_trees{'lettered_accent_and_spaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -68,8 +67,7 @@ $result_trees{'lettered_accent_and_spaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -106,8 +104,7 @@ $result_trees{'lettered_accent_and_spaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -144,8 +141,7 @@ $result_trees{'lettered_accent_and_spaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -181,8 +177,7 @@ $result_trees{'lettered_accent_and_spaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -219,8 +214,7 @@ $result_trees{'lettered_accent_and_spaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -257,8 +251,7 @@ $result_trees{'lettered_accent_and_spaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -295,8 +288,7 @@ $result_trees{'lettered_accent_and_spaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -368,7 +360,6 @@ $result_errors{'lettered_accent_and_spaces'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'command `@ringaccent\' must not be followed by new line',
     'type' => 'warning'
   },
@@ -377,7 +368,6 @@ $result_errors{'lettered_accent_and_spaces'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'command `@ringaccent\' must not be followed by new line',
     'type' => 'warning'
   },
@@ -386,7 +376,6 @@ $result_errors{'lettered_accent_and_spaces'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'command `@ringaccent\' must not be followed by new line',
     'type' => 'warning'
   },
@@ -395,7 +384,6 @@ $result_errors{'lettered_accent_and_spaces'} = [
 ',
     'file_name' => '',
     'line_nr' => 14,
-    'macro' => '',
     'text' => 'command `@^\' must not be followed by new line',
     'type' => 'warning'
   },
@@ -404,7 +392,6 @@ $result_errors{'lettered_accent_and_spaces'} = [
 ',
     'file_name' => '',
     'line_nr' => 17,
-    'macro' => '',
     'text' => 'command `@^\' must not be followed by new line',
     'type' => 'warning'
   }
diff --git a/tp/t/results/coverage/math.pl b/tp/t/results/coverage/math.pl
index 61a7337c27..db6b9ae8b9 100644
--- a/tp/t/results/coverage/math.pl
+++ b/tp/t/results/coverage/math.pl
@@ -30,8 +30,7 @@ $result_trees{'math'} = {
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       },
                       'type' => 'balanced_braces'
                     },
@@ -46,8 +45,7 @@ $result_trees{'math'} = {
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       },
                       'type' => 'balanced_braces'
                     }
@@ -58,8 +56,7 @@ $result_trees{'math'} = {
               'cmdname' => 'math',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -104,8 +101,7 @@ $result_trees{'math'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -125,8 +121,7 @@ $result_trees{'math'} = {
                       'cmdname' => 'sub',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -146,8 +141,7 @@ $result_trees{'math'} = {
                       'cmdname' => 'sup',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
@@ -157,8 +151,7 @@ $result_trees{'math'} = {
               'cmdname' => 'math',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -206,8 +199,7 @@ $result_trees{'math'} = {
                                   ],
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 8,
-                                    'macro' => ''
+                                    'line_nr' => 8
                                   },
                                   'type' => 'balanced_braces'
                                 }
@@ -218,8 +210,7 @@ $result_trees{'math'} = {
                           'cmdname' => 'code',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 8,
-                            'macro' => ''
+                            'line_nr' => 8
                           }
                         },
                         {
@@ -228,8 +219,7 @@ $result_trees{'math'} = {
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       },
                       'type' => 'balanced_braces'
                     },
@@ -250,8 +240,7 @@ $result_trees{'math'} = {
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       },
                       'type' => 'balanced_braces'
                     },
@@ -268,8 +257,7 @@ $result_trees{'math'} = {
                           ],
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 8,
-                            'macro' => ''
+                            'line_nr' => 8
                           },
                           'type' => 'balanced_braces'
                         },
@@ -279,8 +267,7 @@ $result_trees{'math'} = {
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       },
                       'type' => 'balanced_braces'
                     }
@@ -296,8 +283,7 @@ $result_trees{'math'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -355,8 +341,7 @@ $result_trees{'math'} = {
               'cmdname' => 'sup',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -376,8 +361,7 @@ $result_trees{'math'} = {
               'cmdname' => 'sub',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -438,7 +422,6 @@ $result_errors{'math'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => '@\\ should only appear in math context',
     'type' => 'warning'
   }
diff --git a/tp/t/results/coverage/multitable.pl 
b/tp/t/results/coverage/multitable.pl
index c702f1f48f..2ac43d392d 100644
--- a/tp/t/results/coverage/multitable.pl
+++ b/tp/t/results/coverage/multitable.pl
@@ -49,8 +49,7 @@ $result_trees{'multitable'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   }
                 }
               ],
@@ -84,8 +83,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     },
                     {
@@ -110,8 +108,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -148,8 +145,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     },
                     {
@@ -184,8 +180,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     }
                   ],
@@ -217,8 +212,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     },
                     {
@@ -266,8 +260,7 @@ $result_trees{'multitable'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 7,
-                                'macro' => ''
+                                'line_nr' => 7
                               },
                               'type' => 'index_entry_command'
                             }
@@ -280,8 +273,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     }
                   ],
@@ -314,8 +306,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     }
                   ],
@@ -355,8 +346,7 @@ $result_trees{'multitable'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
@@ -371,8 +361,7 @@ $result_trees{'multitable'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -392,8 +381,7 @@ $result_trees{'multitable'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   },
                   'type' => 'bracketed_arg'
                 },
@@ -408,8 +396,7 @@ $result_trees{'multitable'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   },
                   'type' => 'bracketed_arg'
                 }
@@ -450,8 +437,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     },
                     {
@@ -476,8 +462,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     }
                   ],
@@ -517,8 +502,7 @@ $result_trees{'multitable'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             }
           ],
@@ -532,8 +516,7 @@ $result_trees{'multitable'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         }
       ],
@@ -575,7 +558,6 @@ $result_errors{'multitable'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/coverage/nested_block_commands.pl 
b/tp/t/results/coverage/nested_block_commands.pl
index 42db5b1f3a..4760105024 100644
--- a/tp/t/results/coverage/nested_block_commands.pl
+++ b/tp/t/results/coverage/nested_block_commands.pl
@@ -83,15 +83,13 @@ $result_trees{'nested_block_commands'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -122,15 +120,13 @@ $result_trees{'nested_block_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -203,15 +199,13 @@ $result_trees{'nested_block_commands'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -242,15 +236,13 @@ $result_trees{'nested_block_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -332,15 +324,13 @@ $result_trees{'nested_block_commands'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 18,
-                    'macro' => ''
+                    'line_nr' => 18
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -380,15 +370,13 @@ $result_trees{'nested_block_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           }
         },
         {
@@ -475,15 +463,13 @@ $result_trees{'nested_block_commands'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 27,
-                    'macro' => ''
+                    'line_nr' => 27
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               }
             },
             {
@@ -514,15 +500,13 @@ $result_trees{'nested_block_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 22,
-            'macro' => ''
+            'line_nr' => 22
           }
         },
         {
@@ -614,15 +598,13 @@ $result_trees{'nested_block_commands'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 36,
-                    'macro' => ''
+                    'line_nr' => 36
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             },
             {
@@ -653,15 +635,13 @@ $result_trees{'nested_block_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 37,
-                'macro' => ''
+                'line_nr' => 37
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 30,
-            'macro' => ''
+            'line_nr' => 30
           }
         },
         {
@@ -748,15 +728,13 @@ $result_trees{'nested_block_commands'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 44,
-                    'macro' => ''
+                    'line_nr' => 44
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               }
             },
             {
@@ -787,15 +765,13 @@ $result_trees{'nested_block_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 45,
-                'macro' => ''
+                'line_nr' => 45
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 39,
-            'macro' => ''
+            'line_nr' => 39
           }
         },
         {
@@ -873,15 +849,13 @@ $result_trees{'nested_block_commands'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 51,
-                    'macro' => ''
+                    'line_nr' => 51
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               }
             },
             {
@@ -912,15 +886,13 @@ $result_trees{'nested_block_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 47,
-            'macro' => ''
+            'line_nr' => 47
           }
         },
         {
@@ -1003,15 +975,13 @@ $result_trees{'nested_block_commands'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 59,
-                    'macro' => ''
+                    'line_nr' => 59
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 55,
-                'macro' => ''
+                'line_nr' => 55
               }
             },
             {
@@ -1042,15 +1012,13 @@ $result_trees{'nested_block_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 60,
-                'macro' => ''
+                'line_nr' => 60
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 54,
-            'macro' => ''
+            'line_nr' => 54
           }
         },
         {
@@ -1128,15 +1096,13 @@ $result_trees{'nested_block_commands'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 66,
-                    'macro' => ''
+                    'line_nr' => 66
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 63,
-                'macro' => ''
+                'line_nr' => 63
               }
             },
             {
@@ -1167,15 +1133,13 @@ $result_trees{'nested_block_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 67,
-                'macro' => ''
+                'line_nr' => 67
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 62,
-            'macro' => ''
+            'line_nr' => 62
           }
         },
         {
@@ -1248,15 +1212,13 @@ $result_trees{'nested_block_commands'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 72,
-                    'macro' => ''
+                    'line_nr' => 72
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 70,
-                'macro' => ''
+                'line_nr' => 70
               }
             },
             {
@@ -1301,15 +1263,13 @@ $result_trees{'nested_block_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 75,
-                'macro' => ''
+                'line_nr' => 75
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 69,
-            'macro' => ''
+            'line_nr' => 69
           }
         },
         {
@@ -1382,15 +1342,13 @@ $result_trees{'nested_block_commands'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 80,
-                    'macro' => ''
+                    'line_nr' => 80
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 78,
-                'macro' => ''
+                'line_nr' => 78
               }
             },
             {
@@ -1435,15 +1393,13 @@ $result_trees{'nested_block_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 83,
-                'macro' => ''
+                'line_nr' => 83
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 77,
-            'macro' => ''
+            'line_nr' => 77
           }
         },
         {
@@ -1516,15 +1472,13 @@ $result_trees{'nested_block_commands'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 88,
-                    'macro' => ''
+                    'line_nr' => 88
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 86,
-                'macro' => ''
+                'line_nr' => 86
               }
             },
             {
@@ -1574,15 +1528,13 @@ $result_trees{'nested_block_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 92,
-                'macro' => ''
+                'line_nr' => 92
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 85,
-            'macro' => ''
+            'line_nr' => 85
           }
         }
       ],
diff --git a/tp/t/results/coverage/not_i_j_in_dotless.pl 
b/tp/t/results/coverage/not_i_j_in_dotless.pl
index 487dce836d..c9ddbb7315 100644
--- a/tp/t/results/coverage/not_i_j_in_dotless.pl
+++ b/tp/t/results/coverage/not_i_j_in_dotless.pl
@@ -30,8 +30,7 @@ $result_trees{'not_i_j_in_dotless'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -55,8 +54,7 @@ $result_trees{'not_i_j_in_dotless'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     }
                   ],
@@ -66,8 +64,7 @@ $result_trees{'not_i_j_in_dotless'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -94,7 +91,6 @@ $result_errors{'not_i_j_in_dotless'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@dotless expects `i\' or `j\' as argument, not `a\'',
     'type' => 'error'
   },
@@ -103,7 +99,6 @@ $result_errors{'not_i_j_in_dotless'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@dotless expects `i\' or `j\' as argument, not `q\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage/preformatted.pl 
b/tp/t/results/coverage/preformatted.pl
index 3ce5935653..57e0842474 100644
--- a/tp/t/results/coverage/preformatted.pl
+++ b/tp/t/results/coverage/preformatted.pl
@@ -74,15 +74,13 @@ $result_trees{'preformatted'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -112,8 +110,7 @@ $result_trees{'preformatted'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       },
                       'type' => 'command_as_argument'
                     }
@@ -164,8 +161,7 @@ $result_trees{'preformatted'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 10,
-                            'macro' => ''
+                            'line_nr' => 10
                           }
                         }
                       ],
@@ -221,8 +217,7 @@ $result_trees{'preformatted'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 13,
-                    'macro' => ''
+                    'line_nr' => 13
                   }
                 }
               ],
@@ -236,8 +231,7 @@ $result_trees{'preformatted'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -268,15 +262,13 @@ $result_trees{'preformatted'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         }
       ],
@@ -320,7 +312,6 @@ $result_errors{'preformatted'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => 'entry for index `vr\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/coverage/punctuation_in_line_commands.pl 
b/tp/t/results/coverage/punctuation_in_line_commands.pl
index 72ff7d08f5..e30ab072dd 100644
--- a/tp/t/results/coverage/punctuation_in_line_commands.pl
+++ b/tp/t/results/coverage/punctuation_in_line_commands.pl
@@ -47,8 +47,7 @@ $result_trees{'punctuation_in_line_commands'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -83,8 +82,7 @@ $result_trees{'punctuation_in_line_commands'} = {
                   'cmdname' => 'asis',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   },
                   'type' => 'command_as_argument'
                 }
@@ -129,8 +127,7 @@ $result_trees{'punctuation_in_line_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     }
                   ],
@@ -167,8 +164,7 @@ $result_trees{'punctuation_in_line_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -182,8 +178,7 @@ $result_trees{'punctuation_in_line_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -244,8 +239,7 @@ $result_trees{'punctuation_in_line_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -276,8 +270,7 @@ $result_trees{'punctuation_in_line_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
@@ -288,8 +281,7 @@ $result_trees{'punctuation_in_line_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -358,8 +350,7 @@ $result_trees{'punctuation_in_line_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -395,8 +386,7 @@ $result_trees{'punctuation_in_line_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             }
           ],
@@ -414,8 +404,7 @@ $result_trees{'punctuation_in_line_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           }
         },
         {
@@ -484,8 +473,7 @@ $result_trees{'punctuation_in_line_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -521,8 +509,7 @@ $result_trees{'punctuation_in_line_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           ],
@@ -540,8 +527,7 @@ $result_trees{'punctuation_in_line_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         },
         {
@@ -577,8 +563,7 @@ $result_trees{'punctuation_in_line_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 24,
-            'macro' => ''
+            'line_nr' => 24
           }
         },
         {
@@ -619,8 +604,7 @@ $result_trees{'punctuation_in_line_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           },
           'type' => 'index_entry_command'
         },
@@ -654,8 +638,7 @@ $result_trees{'punctuation_in_line_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 28,
-            'macro' => ''
+            'line_nr' => 28
           }
         },
         {
@@ -677,8 +660,7 @@ $result_trees{'punctuation_in_line_commands'} = {
           'cmdname' => 'titlefont',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 30,
-            'macro' => ''
+            'line_nr' => 30
           }
         },
         {
@@ -715,8 +697,7 @@ $result_trees{'punctuation_in_line_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 32,
-            'macro' => ''
+            'line_nr' => 32
           }
         },
         {
@@ -754,8 +735,7 @@ $result_trees{'punctuation_in_line_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 34,
-            'macro' => ''
+            'line_nr' => 34
           }
         },
         {
@@ -774,8 +754,7 @@ $result_trees{'punctuation_in_line_commands'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 36,
-            'macro' => ''
+            'line_nr' => 36
           }
         },
         {
@@ -792,8 +771,7 @@ $result_trees{'punctuation_in_line_commands'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     }
   ],
diff --git a/tp/t/results/coverage/quotation_author.pl 
b/tp/t/results/coverage/quotation_author.pl
index 036e79417b..c72cc35641 100644
--- a/tp/t/results/coverage/quotation_author.pl
+++ b/tp/t/results/coverage/quotation_author.pl
@@ -56,8 +56,7 @@ $result_trees{'quotation_author'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -87,8 +86,7 @@ $result_trees{'quotation_author'} = {
                           'cmdname' => '~',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 5,
-                            'macro' => ''
+                            'line_nr' => 5
                           }
                         },
                         {
@@ -115,8 +113,7 @@ $result_trees{'quotation_author'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 },
                 {
@@ -159,8 +156,7 @@ $result_trees{'quotation_author'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
@@ -172,8 +168,7 @@ $result_trees{'quotation_author'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/coverage/raggedright.pl 
b/tp/t/results/coverage/raggedright.pl
index 3f75595e4b..ee4a12a3d5 100644
--- a/tp/t/results/coverage/raggedright.pl
+++ b/tp/t/results/coverage/raggedright.pl
@@ -65,15 +65,13 @@ $result_trees{'raggedright'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
diff --git a/tp/t/results/coverage/setfilename_in_paragraph.pl 
b/tp/t/results/coverage/setfilename_in_paragraph.pl
index 3a3b7e9b96..cdf72bdd40 100644
--- a/tp/t/results/coverage/setfilename_in_paragraph.pl
+++ b/tp/t/results/coverage/setfilename_in_paragraph.pl
@@ -46,8 +46,7 @@ $result_trees{'setfilename_in_paragraph'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
diff --git a/tp/t/results/coverage/spaces_after_braced_command.pl 
b/tp/t/results/coverage/spaces_after_braced_command.pl
index 6a5de9ad98..f69c99945f 100644
--- a/tp/t/results/coverage/spaces_after_braced_command.pl
+++ b/tp/t/results/coverage/spaces_after_braced_command.pl
@@ -30,8 +30,7 @@ $result_trees{'spaces_after_braced_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -68,8 +67,7 @@ $result_trees{'spaces_after_braced_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -101,8 +99,7 @@ $result_trees{'spaces_after_braced_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -156,8 +153,7 @@ $result_trees{'spaces_after_braced_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -184,8 +180,7 @@ $result_trees{'spaces_after_braced_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -244,7 +239,6 @@ $result_errors{'spaces_after_braced_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'command `@samp\' must not be followed by new line',
     'type' => 'warning'
   },
@@ -253,7 +247,6 @@ $result_errors{'spaces_after_braced_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'command `@AA\' must not be followed by new line',
     'type' => 'warning'
   },
@@ -262,7 +255,6 @@ $result_errors{'spaces_after_braced_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'command `@email\' must not be followed by new line',
     'type' => 'warning'
   },
@@ -271,7 +263,6 @@ $result_errors{'spaces_after_braced_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => 'command `@TeX\' must not be followed by new line',
     'type' => 'warning'
   },
@@ -280,7 +271,6 @@ $result_errors{'spaces_after_braced_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 14,
-    'macro' => '',
     'text' => 'command `@TeX\' must not be followed by new line',
     'type' => 'warning'
   },
@@ -289,7 +279,6 @@ $result_errors{'spaces_after_braced_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 14,
-    'macro' => '',
     'text' => '@TeX expected braces',
     'type' => 'error'
   },
@@ -298,7 +287,6 @@ $result_errors{'spaces_after_braced_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 15,
-    'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
   },
@@ -307,7 +295,6 @@ $result_errors{'spaces_after_braced_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 15,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage/spaces_no_brace_after_braced_command.pl 
b/tp/t/results/coverage/spaces_no_brace_after_braced_command.pl
index ca6944898f..786854001b 100644
--- a/tp/t/results/coverage/spaces_no_brace_after_braced_command.pl
+++ b/tp/t/results/coverage/spaces_no_brace_after_braced_command.pl
@@ -20,8 +20,7 @@ $result_trees{'spaces_no_brace_after_braced_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -51,7 +50,6 @@ $result_errors{'spaces_no_brace_after_braced_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@code expected braces',
     'type' => 'error'
   }
diff --git 
a/tp/t/results/coverage/spaces_unknown_command_after_braced_command.pl 
b/tp/t/results/coverage/spaces_unknown_command_after_braced_command.pl
index 1eed4c9ca6..a8267f8663 100644
--- a/tp/t/results/coverage/spaces_unknown_command_after_braced_command.pl
+++ b/tp/t/results/coverage/spaces_unknown_command_after_braced_command.pl
@@ -20,8 +20,7 @@ $result_trees{'spaces_unknown_command_after_braced_command'} 
= {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -47,8 +46,7 @@ $result_trees{'spaces_unknown_command_after_braced_command'} 
= {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -88,7 +86,6 @@ $result_errors{'spaces_unknown_command_after_braced_command'} 
= [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@code expected braces',
     'type' => 'error'
   },
@@ -97,7 +94,6 @@ $result_errors{'spaces_unknown_command_after_braced_command'} 
= [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'unknown command `unknown\'',
     'type' => 'error'
   },
@@ -106,7 +102,6 @@ 
$result_errors{'spaces_unknown_command_after_braced_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@~ expected braces',
     'type' => 'error'
   },
@@ -115,7 +110,6 @@ 
$result_errors{'spaces_unknown_command_after_braced_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'unknown command `notexisting\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage/symbol_after_block.pl 
b/tp/t/results/coverage/symbol_after_block.pl
index fce82bb96f..739234c229 100644
--- a/tp/t/results/coverage/symbol_after_block.pl
+++ b/tp/t/results/coverage/symbol_after_block.pl
@@ -60,15 +60,13 @@ $result_trees{'symbol_after_block'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -133,15 +131,13 @@ $result_trees{'symbol_after_block'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -210,15 +206,13 @@ $result_trees{'symbol_after_block'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -276,15 +270,13 @@ $result_trees{'symbol_after_block'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         },
         {
@@ -314,8 +306,7 @@ $result_trees{'symbol_after_block'} = {
                   'cmdname' => 'emph',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 21,
-                    'macro' => ''
+                    'line_nr' => 21
                   },
                   'type' => 'command_as_argument'
                 }
@@ -360,8 +351,7 @@ $result_trees{'symbol_after_block'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -412,8 +402,7 @@ $result_trees{'symbol_after_block'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             }
           ],
@@ -427,8 +416,7 @@ $result_trees{'symbol_after_block'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 21,
-            'macro' => ''
+            'line_nr' => 21
           }
         },
         {
@@ -444,8 +432,7 @@ $result_trees{'symbol_after_block'} = {
                   'cmdname' => 'emph',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 26,
-                    'macro' => ''
+                    'line_nr' => 26
                   },
                   'type' => 'command_as_argument'
                 }
@@ -490,8 +477,7 @@ $result_trees{'symbol_after_block'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 27,
-                        'macro' => ''
+                        'line_nr' => 27
                       }
                     }
                   ],
@@ -545,8 +531,7 @@ $result_trees{'symbol_after_block'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             }
           ],
@@ -560,8 +545,7 @@ $result_trees{'symbol_after_block'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         },
         {
@@ -591,8 +575,7 @@ $result_trees{'symbol_after_block'} = {
                   'cmdname' => 'bullet',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 33,
-                    'macro' => ''
+                    'line_nr' => 33
                   },
                   'type' => 'command_as_argument'
                 }
@@ -630,8 +613,7 @@ $result_trees{'symbol_after_block'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             },
             {
@@ -662,8 +644,7 @@ $result_trees{'symbol_after_block'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             }
           ],
@@ -677,8 +658,7 @@ $result_trees{'symbol_after_block'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 33,
-            'macro' => ''
+            'line_nr' => 33
           }
         },
         {
@@ -694,8 +674,7 @@ $result_trees{'symbol_after_block'} = {
                   'cmdname' => 'bullet',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 37,
-                    'macro' => ''
+                    'line_nr' => 37
                   },
                   'type' => 'command_as_argument'
                 }
@@ -733,8 +712,7 @@ $result_trees{'symbol_after_block'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               }
             },
             {
@@ -768,8 +746,7 @@ $result_trees{'symbol_after_block'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 39,
-                'macro' => ''
+                'line_nr' => 39
               }
             }
           ],
@@ -783,8 +760,7 @@ $result_trees{'symbol_after_block'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 37,
-            'macro' => ''
+            'line_nr' => 37
           }
         },
         {
@@ -841,8 +817,7 @@ $result_trees{'symbol_after_block'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 43,
-                    'macro' => ''
+                    'line_nr' => 43
                   }
                 }
               ],
@@ -876,8 +851,7 @@ $result_trees{'symbol_after_block'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 44,
-                        'macro' => ''
+                        'line_nr' => 44
                       }
                     },
                     {
@@ -902,8 +876,7 @@ $result_trees{'symbol_after_block'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 44,
-                        'macro' => ''
+                        'line_nr' => 44
                       }
                     }
                   ],
@@ -940,8 +913,7 @@ $result_trees{'symbol_after_block'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 45,
-                        'macro' => ''
+                        'line_nr' => 45
                       }
                     },
                     {
@@ -966,8 +938,7 @@ $result_trees{'symbol_after_block'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 45,
-                        'macro' => ''
+                        'line_nr' => 45
                       }
                     }
                   ],
@@ -1007,8 +978,7 @@ $result_trees{'symbol_after_block'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             }
           ],
@@ -1023,8 +993,7 @@ $result_trees{'symbol_after_block'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 43,
-            'macro' => ''
+            'line_nr' => 43
           }
         },
         {
@@ -1067,8 +1036,7 @@ $result_trees{'symbol_after_block'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 48,
-                    'macro' => ''
+                    'line_nr' => 48
                   }
                 }
               ],
@@ -1102,8 +1070,7 @@ $result_trees{'symbol_after_block'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 49,
-                        'macro' => ''
+                        'line_nr' => 49
                       }
                     },
                     {
@@ -1128,8 +1095,7 @@ $result_trees{'symbol_after_block'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 49,
-                        'macro' => ''
+                        'line_nr' => 49
                       }
                     }
                   ],
@@ -1166,8 +1132,7 @@ $result_trees{'symbol_after_block'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 50,
-                        'macro' => ''
+                        'line_nr' => 50
                       }
                     },
                     {
@@ -1192,8 +1157,7 @@ $result_trees{'symbol_after_block'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 50,
-                        'macro' => ''
+                        'line_nr' => 50
                       }
                     }
                   ],
@@ -1236,8 +1200,7 @@ $result_trees{'symbol_after_block'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 51,
-                'macro' => ''
+                'line_nr' => 51
               }
             }
           ],
@@ -1252,8 +1215,7 @@ $result_trees{'symbol_after_block'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 48,
-            'macro' => ''
+            'line_nr' => 48
           }
         },
         {
@@ -1326,15 +1288,13 @@ $result_trees{'symbol_after_block'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 57,
-                'macro' => ''
+                'line_nr' => 57
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 55,
-            'macro' => ''
+            'line_nr' => 55
           }
         },
         {
@@ -1396,15 +1356,13 @@ $result_trees{'symbol_after_block'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 59,
-            'macro' => ''
+            'line_nr' => 59
           }
         },
         {
@@ -1477,15 +1435,13 @@ $result_trees{'symbol_after_block'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 67,
-                'macro' => ''
+                'line_nr' => 67
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 65,
-            'macro' => ''
+            'line_nr' => 65
           }
         },
         {
@@ -1547,15 +1503,13 @@ $result_trees{'symbol_after_block'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 69,
-            'macro' => ''
+            'line_nr' => 69
           }
         }
       ],
@@ -1694,7 +1648,6 @@ $result_errors{'symbol_after_block'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'bad argument to @end: html. On the line.',
     'type' => 'error'
   },
@@ -1703,7 +1656,6 @@ $result_errors{'symbol_after_block'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'bad argument to @end: html@@ On the line.',
     'type' => 'error'
   },
@@ -1712,7 +1664,6 @@ $result_errors{'symbol_after_block'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => 'bad argument to @end: verbatim;',
     'type' => 'error'
   },
@@ -1721,7 +1672,6 @@ $result_errors{'symbol_after_block'} = [
 ',
     'file_name' => '',
     'line_nr' => 17,
-    'macro' => '',
     'text' => 'bad argument to @end: verbatim@@',
     'type' => 'error'
   },
@@ -1730,7 +1680,6 @@ $result_errors{'symbol_after_block'} = [
 ',
     'file_name' => '',
     'line_nr' => 24,
-    'macro' => '',
     'text' => 'bad argument to @end: table+',
     'type' => 'error'
   },
@@ -1739,7 +1688,6 @@ $result_errors{'symbol_after_block'} = [
 ',
     'file_name' => '',
     'line_nr' => 29,
-    'macro' => '',
     'text' => 'bad argument to @end: table@@',
     'type' => 'error'
   },
@@ -1748,7 +1696,6 @@ $result_errors{'symbol_after_block'} = [
 ',
     'file_name' => '',
     'line_nr' => 35,
-    'macro' => '',
     'text' => 'bad argument to @end: itemize\'\'',
     'type' => 'error'
   },
@@ -1757,7 +1704,6 @@ $result_errors{'symbol_after_block'} = [
 ',
     'file_name' => '',
     'line_nr' => 39,
-    'macro' => '',
     'text' => 'bad argument to @end: itemize@@',
     'type' => 'error'
   },
@@ -1766,7 +1712,6 @@ $result_errors{'symbol_after_block'} = [
 ',
     'file_name' => '',
     'line_nr' => 46,
-    'macro' => '',
     'text' => 'bad argument to @end: multitable^',
     'type' => 'error'
   },
@@ -1775,7 +1720,6 @@ $result_errors{'symbol_after_block'} = [
 ',
     'file_name' => '',
     'line_nr' => 51,
-    'macro' => '',
     'text' => 'bad argument to @end: multitable@{',
     'type' => 'error'
   },
@@ -1784,7 +1728,6 @@ $result_errors{'symbol_after_block'} = [
 ',
     'file_name' => '',
     'line_nr' => 57,
-    'macro' => '',
     'text' => 'bad argument to @end: flushleft!',
     'type' => 'error'
   },
@@ -1793,7 +1736,6 @@ $result_errors{'symbol_after_block'} = [
 ',
     'file_name' => '',
     'line_nr' => 61,
-    'macro' => '',
     'text' => 'bad argument to @end: flushleft@@',
     'type' => 'error'
   },
@@ -1802,7 +1744,6 @@ $result_errors{'symbol_after_block'} = [
 ',
     'file_name' => '',
     'line_nr' => 67,
-    'macro' => '',
     'text' => 'bad argument to @end: copying*',
     'type' => 'error'
   },
@@ -1811,7 +1752,6 @@ $result_errors{'symbol_after_block'} = [
 ',
     'file_name' => '',
     'line_nr' => 69,
-    'macro' => '',
     'text' => 'multiple @copying',
     'type' => 'warning'
   },
@@ -1820,7 +1760,6 @@ $result_errors{'symbol_after_block'} = [
 ',
     'file_name' => '',
     'line_nr' => 71,
-    'macro' => '',
     'text' => 'bad argument to @end: copying@@',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage/symbol_after_command.pl 
b/tp/t/results/coverage/symbol_after_command.pl
index 0af497b726..8e14f4ea76 100644
--- a/tp/t/results/coverage/symbol_after_command.pl
+++ b/tp/t/results/coverage/symbol_after_command.pl
@@ -17,8 +17,7 @@ $result_trees{'symbol_after_command'} = {
                   'cmdname' => 'asis',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'command_as_argument'
                 }
@@ -58,8 +57,7 @@ $result_trees{'symbol_after_command'} = {
                       'cmdname' => 'item',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -92,8 +90,7 @@ $result_trees{'symbol_after_command'} = {
                       'cmdname' => 'item',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -132,8 +129,7 @@ $result_trees{'symbol_after_command'} = {
                       'cmdname' => 'item',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     }
                   ],
@@ -172,8 +168,7 @@ $result_trees{'symbol_after_command'} = {
                       'cmdname' => 'item',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
@@ -206,8 +201,7 @@ $result_trees{'symbol_after_command'} = {
                       'cmdname' => 'item',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     }
                   ],
@@ -240,8 +234,7 @@ $result_trees{'symbol_after_command'} = {
                       'cmdname' => 'item',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     }
                   ],
@@ -274,8 +267,7 @@ $result_trees{'symbol_after_command'} = {
                       'cmdname' => 'item',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     }
                   ],
@@ -312,8 +304,7 @@ $result_trees{'symbol_after_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
@@ -327,8 +318,7 @@ $result_trees{'symbol_after_command'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/coverage/table.pl b/tp/t/results/coverage/table.pl
index 231debcc73..50e44efe84 100644
--- a/tp/t/results/coverage/table.pl
+++ b/tp/t/results/coverage/table.pl
@@ -22,8 +22,7 @@ $result_trees{'table'} = {
                   'cmdname' => 'asis',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   },
                   'type' => 'command_as_argument'
                 }
@@ -68,8 +67,7 @@ $result_trees{'table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     },
                     {
@@ -97,8 +95,7 @@ $result_trees{'table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     }
                   ],
@@ -154,8 +151,7 @@ $result_trees{'table'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -169,8 +165,7 @@ $result_trees{'table'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -186,8 +181,7 @@ $result_trees{'table'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   },
                   'type' => 'command_as_argument'
                 }
@@ -253,8 +247,7 @@ $result_trees{'table'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   },
                   'type' => 'index_entry_command'
                 },
@@ -301,8 +294,7 @@ $result_trees{'table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     },
                     {
@@ -352,8 +344,7 @@ $result_trees{'table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       },
                       'type' => 'index_entry_command'
                     },
@@ -397,8 +388,7 @@ $result_trees{'table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     }
                   ],
@@ -445,8 +435,7 @@ $result_trees{'table'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             }
           ],
@@ -460,8 +449,7 @@ $result_trees{'table'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -477,8 +465,7 @@ $result_trees{'table'} = {
                   'cmdname' => 'strong',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 20,
-                    'macro' => ''
+                    'line_nr' => 20
                   },
                   'type' => 'command_as_argument'
                 }
@@ -523,8 +510,7 @@ $result_trees{'table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 21,
-                        'macro' => ''
+                        'line_nr' => 21
                       }
                     }
                   ],
@@ -561,8 +547,7 @@ $result_trees{'table'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           ],
@@ -576,8 +561,7 @@ $result_trees{'table'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         }
       ],
@@ -635,7 +619,6 @@ $result_errors{'table'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -644,7 +627,6 @@ $result_errors{'table'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => 'entry for index `vr\' outside of any node',
     'type' => 'warning'
   },
@@ -653,7 +635,6 @@ $result_errors{'table'} = [
 ',
     'file_name' => '',
     'line_nr' => 15,
-    'macro' => '',
     'text' => 'entry for index `ky\' outside of any node',
     'type' => 'warning'
   },
@@ -662,7 +643,6 @@ $result_errors{'table'} = [
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => 'entry for index `vr\' outside of any node',
     'type' => 'warning'
   },
@@ -671,7 +651,6 @@ $result_errors{'table'} = [
 ',
     'file_name' => '',
     'line_nr' => 20,
-    'macro' => '',
     'text' => 'unknown command `unknown\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage/table_command_comment.pl 
b/tp/t/results/coverage/table_command_comment.pl
index 11b48e6e34..36a3e796a7 100644
--- a/tp/t/results/coverage/table_command_comment.pl
+++ b/tp/t/results/coverage/table_command_comment.pl
@@ -17,8 +17,7 @@ $result_trees{'table_command_comment'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'command_as_argument'
                 }
@@ -69,8 +68,7 @@ $result_trees{'table_command_comment'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -101,8 +99,7 @@ $result_trees{'table_command_comment'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -116,8 +113,7 @@ $result_trees{'table_command_comment'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/coverage/test_errormsg.pl 
b/tp/t/results/coverage/test_errormsg.pl
index c4ff1c5cc9..40af4ae113 100644
--- a/tp/t/results/coverage/test_errormsg.pl
+++ b/tp/t/results/coverage/test_errormsg.pl
@@ -36,8 +36,7 @@ $result_trees{'test_errormsg'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -57,8 +56,7 @@ $result_trees{'test_errormsg'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -68,8 +66,7 @@ $result_trees{'test_errormsg'} = {
               'cmdname' => 'errormsg',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -98,8 +95,7 @@ $result_trees{'test_errormsg'} = {
               'cmdname' => 'errormsg',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -133,7 +129,6 @@ $result_errors{'test_errormsg'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'Text ',
     'type' => 'error'
   },
@@ -142,7 +137,6 @@ $result_errors{'test_errormsg'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'with surrounding spaces',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage/test_tie.pl 
b/tp/t/results/coverage/test_tie.pl
index 896b90a51a..1b6bf68308 100644
--- a/tp/t/results/coverage/test_tie.pl
+++ b/tp/t/results/coverage/test_tie.pl
@@ -23,8 +23,7 @@ $result_trees{'test_tie'} = {
               'cmdname' => 'tie',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
diff --git a/tp/t/results/coverage/test_today.pl 
b/tp/t/results/coverage/test_today.pl
index dd44c4902f..81cf738394 100644
--- a/tp/t/results/coverage/test_today.pl
+++ b/tp/t/results/coverage/test_today.pl
@@ -20,8 +20,7 @@ $result_trees{'test_today'} = {
               'cmdname' => 'today',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
diff --git a/tp/t/results/coverage/titlefont_in_center.pl 
b/tp/t/results/coverage/titlefont_in_center.pl
index d360d6e09c..9f09dbbbb8 100644
--- a/tp/t/results/coverage/titlefont_in_center.pl
+++ b/tp/t/results/coverage/titlefont_in_center.pl
@@ -32,8 +32,7 @@ $result_trees{'titlefont_in_center'} = {
                   'cmdname' => 'titlefont',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   }
                 }
               ],
@@ -54,8 +53,7 @@ $result_trees{'titlefont_in_center'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
diff --git a/tp/t/results/coverage/unknown_accents.pl 
b/tp/t/results/coverage/unknown_accents.pl
index 1976e32d6f..71f34f278a 100644
--- a/tp/t/results/coverage/unknown_accents.pl
+++ b/tp/t/results/coverage/unknown_accents.pl
@@ -25,8 +25,7 @@ $result_trees{'unknown_accents'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -46,8 +45,7 @@ $result_trees{'unknown_accents'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -67,8 +65,7 @@ $result_trees{'unknown_accents'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -88,8 +85,7 @@ $result_trees{'unknown_accents'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -120,8 +116,7 @@ $result_trees{'unknown_accents'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -141,8 +136,7 @@ $result_trees{'unknown_accents'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -162,8 +156,7 @@ $result_trees{'unknown_accents'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -184,8 +177,7 @@ $result_trees{'unknown_accents'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -205,8 +197,7 @@ $result_trees{'unknown_accents'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -226,8 +217,7 @@ $result_trees{'unknown_accents'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -258,8 +248,7 @@ $result_trees{'unknown_accents'} = {
               'cmdname' => ',',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -279,8 +268,7 @@ $result_trees{'unknown_accents'} = {
               'cmdname' => ',',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -311,8 +299,7 @@ $result_trees{'unknown_accents'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -332,8 +319,7 @@ $result_trees{'unknown_accents'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -353,8 +339,7 @@ $result_trees{'unknown_accents'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -374,8 +359,7 @@ $result_trees{'unknown_accents'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -396,8 +380,7 @@ $result_trees{'unknown_accents'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -417,8 +400,7 @@ $result_trees{'unknown_accents'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -438,8 +420,7 @@ $result_trees{'unknown_accents'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -459,8 +440,7 @@ $result_trees{'unknown_accents'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -491,8 +471,7 @@ $result_trees{'unknown_accents'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -512,8 +491,7 @@ $result_trees{'unknown_accents'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -533,8 +511,7 @@ $result_trees{'unknown_accents'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -565,8 +542,7 @@ $result_trees{'unknown_accents'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -586,8 +562,7 @@ $result_trees{'unknown_accents'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
diff --git a/tp/t/results/coverage/unknown_commands.pl 
b/tp/t/results/coverage/unknown_commands.pl
index 2883104873..a2e587c661 100644
--- a/tp/t/results/coverage/unknown_commands.pl
+++ b/tp/t/results/coverage/unknown_commands.pl
@@ -45,7 +45,6 @@ $result_errors{'unknown_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'unknown command `unknwon\'',
     'type' => 'error'
   },
@@ -54,7 +53,6 @@ $result_errors{'unknown_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'unexpected @',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage/verbatiminclude.pl 
b/tp/t/results/coverage/verbatiminclude.pl
index 1312c44aa1..657baf7289 100644
--- a/tp/t/results/coverage/verbatiminclude.pl
+++ b/tp/t/results/coverage/verbatiminclude.pl
@@ -43,8 +43,7 @@ $result_trees{'verbatiminclude'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
diff --git a/tp/t/results/coverage_braces/abbr_acronym.pl 
b/tp/t/results/coverage_braces/abbr_acronym.pl
index 5d79344cbf..725b635923 100644
--- a/tp/t/results/coverage_braces/abbr_acronym.pl
+++ b/tp/t/results/coverage_braces/abbr_acronym.pl
@@ -33,8 +33,7 @@ $result_trees{'abbr_acronym'} = {
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -55,8 +54,7 @@ $result_trees{'abbr_acronym'} = {
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -87,8 +85,7 @@ $result_trees{'abbr_acronym'} = {
                       'cmdname' => 'comma',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     },
                     {
@@ -103,8 +100,7 @@ $result_trees{'abbr_acronym'} = {
                       'cmdname' => 'enddots',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -114,8 +110,7 @@ $result_trees{'abbr_acronym'} = {
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -150,8 +145,7 @@ $result_trees{'abbr_acronym'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -166,8 +160,7 @@ $result_trees{'abbr_acronym'} = {
                       'cmdname' => 'comma',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -192,8 +185,7 @@ $result_trees{'abbr_acronym'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -208,8 +200,7 @@ $result_trees{'abbr_acronym'} = {
                       'cmdname' => 'comma',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -229,8 +220,7 @@ $result_trees{'abbr_acronym'} = {
                       'cmdname' => 'b',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
@@ -248,8 +238,7 @@ $result_trees{'abbr_acronym'} = {
               'cmdname' => 'abbr',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -274,8 +263,7 @@ $result_trees{'abbr_acronym'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     },
                     {
@@ -290,8 +278,7 @@ $result_trees{'abbr_acronym'} = {
                       'cmdname' => 'comma',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     },
                     {
@@ -304,8 +291,7 @@ $result_trees{'abbr_acronym'} = {
               'cmdname' => 'abbr',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
diff --git a/tp/t/results/coverage_braces/anchor_not_closed.pl 
b/tp/t/results/coverage_braces/anchor_not_closed.pl
index 5a7af1fed2..ec18f8a568 100644
--- a/tp/t/results/coverage_braces/anchor_not_closed.pl
+++ b/tp/t/results/coverage_braces/anchor_not_closed.pl
@@ -29,8 +29,7 @@ $result_trees{'anchor_not_closed'} = {
           'cmdname' => 'anchor',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -53,7 +52,6 @@ $result_errors{'anchor_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@anchor missing closing brace',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage_braces/brace_opened_no_command.pl 
b/tp/t/results/coverage_braces/brace_opened_no_command.pl
index d0ea23ffda..338829022a 100644
--- a/tp/t/results/coverage_braces/brace_opened_no_command.pl
+++ b/tp/t/results/coverage_braces/brace_opened_no_command.pl
@@ -38,8 +38,7 @@ $result_trees{'brace_opened_no_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -78,7 +77,6 @@ $result_errors{'brace_opened_no_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage_braces/caption_not_closed.pl 
b/tp/t/results/coverage_braces/caption_not_closed.pl
index 9c28129eeb..a60d687c13 100644
--- a/tp/t/results/coverage_braces/caption_not_closed.pl
+++ b/tp/t/results/coverage_braces/caption_not_closed.pl
@@ -91,8 +91,7 @@ $result_trees{'caption_not_closed'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -123,8 +122,7 @@ $result_trees{'caption_not_closed'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
@@ -139,8 +137,7 @@ $result_trees{'caption_not_closed'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -191,7 +188,6 @@ $result_errors{'caption_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@end float seen before @caption closing brace',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage_braces/code_not_closed.pl 
b/tp/t/results/coverage_braces/code_not_closed.pl
index 30bf8eef4c..75d5b7f181 100644
--- a/tp/t/results/coverage_braces/code_not_closed.pl
+++ b/tp/t/results/coverage_braces/code_not_closed.pl
@@ -25,8 +25,7 @@ $result_trees{'code_not_closed'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -50,7 +49,6 @@ $result_errors{'code_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@code missing closing brace',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage_braces/contain_plain_text_nestings.pl 
b/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
index 6d849eb2b5..b209173783 100644
--- a/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
+++ b/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
@@ -39,8 +39,7 @@ $result_trees{'contain_plain_text_nestings'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -76,8 +75,7 @@ $result_trees{'contain_plain_text_nestings'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -110,8 +108,7 @@ $result_trees{'contain_plain_text_nestings'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -161,8 +158,7 @@ $result_trees{'contain_plain_text_nestings'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     },
                     {
@@ -175,8 +171,7 @@ $result_trees{'contain_plain_text_nestings'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -201,8 +196,7 @@ $result_trees{'contain_plain_text_nestings'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     },
                     {
@@ -215,8 +209,7 @@ $result_trees{'contain_plain_text_nestings'} = {
               'cmdname' => 'hyphenation',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -242,8 +235,7 @@ $result_trees{'contain_plain_text_nestings'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -256,8 +248,7 @@ $result_trees{'contain_plain_text_nestings'} = {
               'cmdname' => 'key',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -293,8 +284,7 @@ $result_trees{'contain_plain_text_nestings'} = {
                               'cmdname' => 'code',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 10,
-                                'macro' => ''
+                                'line_nr' => 10
                               }
                             },
                             {
@@ -307,8 +297,7 @@ $result_trees{'contain_plain_text_nestings'} = {
                       'cmdname' => 'sortas',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     }
                   ],
@@ -338,8 +327,7 @@ $result_trees{'contain_plain_text_nestings'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'index_entry_command'
             }
@@ -405,8 +393,7 @@ $result_trees{'contain_plain_text_nestings'} = {
                       'cmdname' => 'ref',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     },
                     {
@@ -419,8 +406,7 @@ $result_trees{'contain_plain_text_nestings'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -466,8 +452,7 @@ $result_trees{'contain_plain_text_nestings'} = {
                       'cmdname' => 'ref',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     },
                     {
@@ -480,8 +465,7 @@ $result_trees{'contain_plain_text_nestings'} = {
               'cmdname' => 'hyphenation',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -528,8 +512,7 @@ $result_trees{'contain_plain_text_nestings'} = {
                       'cmdname' => 'ref',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     },
                     {
@@ -542,8 +525,7 @@ $result_trees{'contain_plain_text_nestings'} = {
               'cmdname' => 'key',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -600,8 +582,7 @@ $result_trees{'contain_plain_text_nestings'} = {
                               'cmdname' => 'ref',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 16,
-                                'macro' => ''
+                                'line_nr' => 16
                               }
                             },
                             {
@@ -614,8 +595,7 @@ $result_trees{'contain_plain_text_nestings'} = {
                       'cmdname' => 'sortas',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     }
                   ],
@@ -645,8 +625,7 @@ $result_trees{'contain_plain_text_nestings'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               },
               'type' => 'index_entry_command'
             }
@@ -688,8 +667,7 @@ $result_trees{'contain_plain_text_nestings'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           }
         }
       ],
@@ -703,8 +681,7 @@ $result_trees{'contain_plain_text_nestings'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
@@ -856,7 +833,6 @@ $result_errors{'contain_plain_text_nestings'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => '@code should not appear in @hyphenation',
     'type' => 'warning'
   },
@@ -865,7 +841,6 @@ $result_errors{'contain_plain_text_nestings'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@code should not appear in @key',
     'type' => 'warning'
   },
@@ -874,7 +849,6 @@ $result_errors{'contain_plain_text_nestings'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => '@code should not appear in @sortas',
     'type' => 'warning'
   },
@@ -883,7 +857,6 @@ $result_errors{'contain_plain_text_nestings'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => '@ref should not appear anywhere inside @w',
     'type' => 'warning'
   },
@@ -892,7 +865,6 @@ $result_errors{'contain_plain_text_nestings'} = [
 ',
     'file_name' => '',
     'line_nr' => 14,
-    'macro' => '',
     'text' => '@ref should not appear in @hyphenation',
     'type' => 'warning'
   },
@@ -901,7 +873,6 @@ $result_errors{'contain_plain_text_nestings'} = [
 ',
     'file_name' => '',
     'line_nr' => 15,
-    'macro' => '',
     'text' => '@ref should not appear in @key',
     'type' => 'warning'
   },
@@ -910,7 +881,6 @@ $result_errors{'contain_plain_text_nestings'} = [
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => '@ref should not appear in @sortas',
     'type' => 'warning'
   },
@@ -919,7 +889,6 @@ $result_errors{'contain_plain_text_nestings'} = [
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => '@ref should not appear on @cindex line',
     'type' => 'warning'
   }
diff --git a/tp/t/results/coverage_braces/email_possibilities.pl 
b/tp/t/results/coverage_braces/email_possibilities.pl
index 4cecd1b027..78069b620d 100644
--- a/tp/t/results/coverage_braces/email_possibilities.pl
+++ b/tp/t/results/coverage_braces/email_possibilities.pl
@@ -33,8 +33,7 @@ $result_trees{'email_possibilities'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -58,8 +57,7 @@ $result_trees{'email_possibilities'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -80,8 +78,7 @@ $result_trees{'email_possibilities'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
diff --git a/tp/t/results/coverage_braces/empty_commands.pl 
b/tp/t/results/coverage_braces/empty_commands.pl
index 78f5a38ded..475c17b78e 100644
--- a/tp/t/results/coverage_braces/empty_commands.pl
+++ b/tp/t/results/coverage_braces/empty_commands.pl
@@ -18,8 +18,7 @@ $result_trees{'empty_commands'} = {
           'cmdname' => 'titlefont',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -42,8 +41,7 @@ $result_trees{'empty_commands'} = {
               'cmdname' => 'uref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -58,8 +56,7 @@ $result_trees{'empty_commands'} = {
               'cmdname' => 'abbr',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -74,8 +71,7 @@ $result_trees{'empty_commands'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -90,8 +86,7 @@ $result_trees{'empty_commands'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -103,8 +98,7 @@ $result_trees{'empty_commands'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -119,8 +113,7 @@ $result_trees{'empty_commands'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -135,8 +128,7 @@ $result_trees{'empty_commands'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -154,8 +146,7 @@ $result_trees{'empty_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -189,7 +180,6 @@ $result_errors{'empty_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@abbr missing first argument',
     'type' => 'warning'
   }
diff --git a/tp/t/results/coverage_braces/empty_images.pl 
b/tp/t/results/coverage_braces/empty_images.pl
index 63b8e3396c..9f6a8b935f 100644
--- a/tp/t/results/coverage_braces/empty_images.pl
+++ b/tp/t/results/coverage_braces/empty_images.pl
@@ -21,8 +21,7 @@ $result_trees{'empty_images'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -88,8 +87,7 @@ $result_trees{'empty_images'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -127,8 +125,7 @@ $result_trees{'empty_images'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -161,8 +158,7 @@ $result_trees{'empty_images'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -199,7 +195,6 @@ $result_errors{'empty_images'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@image missing filename argument',
     'type' => 'error'
   },
@@ -208,7 +203,6 @@ $result_errors{'empty_images'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@image missing filename argument',
     'type' => 'error'
   },
@@ -217,7 +211,6 @@ $result_errors{'empty_images'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@image missing filename argument',
     'type' => 'error'
   },
@@ -226,7 +219,6 @@ $result_errors{'empty_images'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => '@image missing filename argument',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage_braces/empty_line_in_anchor.pl 
b/tp/t/results/coverage_braces/empty_line_in_anchor.pl
index ac591aab39..6d66960c97 100644
--- a/tp/t/results/coverage_braces/empty_line_in_anchor.pl
+++ b/tp/t/results/coverage_braces/empty_line_in_anchor.pl
@@ -29,8 +29,7 @@ $result_trees{'empty_line_in_anchor'} = {
           'cmdname' => 'anchor',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -64,7 +63,6 @@ $result_errors{'empty_line_in_anchor'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@anchor missing closing brace',
     'type' => 'error'
   },
@@ -73,7 +71,6 @@ $result_errors{'empty_line_in_anchor'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage_braces/empty_line_in_braces_in_math.pl 
b/tp/t/results/coverage_braces/empty_line_in_braces_in_math.pl
index 6bba6e14c3..4dac0a8621 100644
--- a/tp/t/results/coverage_braces/empty_line_in_braces_in_math.pl
+++ b/tp/t/results/coverage_braces/empty_line_in_braces_in_math.pl
@@ -35,8 +35,7 @@ $result_trees{'empty_line_in_braces_in_math'} = {
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       },
                       'type' => 'balanced_braces'
                     },
@@ -50,8 +49,7 @@ $result_trees{'empty_line_in_braces_in_math'} = {
               'cmdname' => 'math',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
diff --git 
a/tp/t/results/coverage_braces/empty_line_in_braces_in_math_at_begin_line.pl 
b/tp/t/results/coverage_braces/empty_line_in_braces_in_math_at_begin_line.pl
index 68eadd9209..dbdaecb889 100644
--- a/tp/t/results/coverage_braces/empty_line_in_braces_in_math_at_begin_line.pl
+++ b/tp/t/results/coverage_braces/empty_line_in_braces_in_math_at_begin_line.pl
@@ -41,8 +41,7 @@ $result_trees{'empty_line_in_braces_in_math_at_begin_line'} = 
{
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       },
                       'type' => 'balanced_braces'
                     },
@@ -57,8 +56,7 @@ $result_trees{'empty_line_in_braces_in_math_at_begin_line'} = 
{
               'cmdname' => 'math',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
diff --git a/tp/t/results/coverage_braces/empty_line_in_email.pl 
b/tp/t/results/coverage_braces/empty_line_in_email.pl
index 3210ece128..a956b9e9fb 100644
--- a/tp/t/results/coverage_braces/empty_line_in_email.pl
+++ b/tp/t/results/coverage_braces/empty_line_in_email.pl
@@ -33,8 +33,7 @@ $result_trees{'empty_line_in_email'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -90,7 +89,6 @@ $result_errors{'empty_line_in_email'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@email missing closing brace',
     'type' => 'error'
   },
@@ -99,7 +97,6 @@ $result_errors{'empty_line_in_email'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage_braces/empty_line_in_math.pl 
b/tp/t/results/coverage_braces/empty_line_in_math.pl
index fccafe52dc..dc5a721d8e 100644
--- a/tp/t/results/coverage_braces/empty_line_in_math.pl
+++ b/tp/t/results/coverage_braces/empty_line_in_math.pl
@@ -34,8 +34,7 @@ $result_trees{'empty_line_in_math'} = {
               'cmdname' => 'math',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
diff --git a/tp/t/results/coverage_braces/empty_ref.pl 
b/tp/t/results/coverage_braces/empty_ref.pl
index e5cc0a2145..14ff5d6a9c 100644
--- a/tp/t/results/coverage_braces/empty_ref.pl
+++ b/tp/t/results/coverage_braces/empty_ref.pl
@@ -25,8 +25,7 @@ $result_trees{'empty_ref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -52,8 +51,7 @@ $result_trees{'empty_ref'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -73,8 +71,7 @@ $result_trees{'empty_ref'} = {
               'cmdname' => 'inforef',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -111,8 +108,7 @@ $result_trees{'empty_ref'} = {
               'cmdname' => 'inforef',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -146,7 +142,6 @@ $result_errors{'empty_ref'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'command @ref missing a node or external manual argument',
     'type' => 'warning'
   },
@@ -155,7 +150,6 @@ $result_errors{'empty_ref'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'command @xref missing a node or external manual argument',
     'type' => 'warning'
   },
@@ -164,7 +158,6 @@ $result_errors{'empty_ref'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@inforef is obsolete',
     'type' => 'warning'
   },
@@ -173,7 +166,6 @@ $result_errors{'empty_ref'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'command @inforef missing a node or external manual argument',
     'type' => 'warning'
   },
@@ -182,7 +174,6 @@ $result_errors{'empty_ref'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@inforef is obsolete',
     'type' => 'warning'
   },
@@ -191,7 +182,6 @@ $result_errors{'empty_ref'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'command @inforef missing a node or external manual argument',
     'type' => 'warning'
   }
diff --git a/tp/t/results/coverage_braces/empty_second_email_argument.pl 
b/tp/t/results/coverage_braces/empty_second_email_argument.pl
index 98d2edec83..516e063dd6 100644
--- a/tp/t/results/coverage_braces/empty_second_email_argument.pl
+++ b/tp/t/results/coverage_braces/empty_second_email_argument.pl
@@ -44,8 +44,7 @@ $result_trees{'empty_second_email_argument'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
diff --git a/tp/t/results/coverage_braces/end_line_in_anchor.pl 
b/tp/t/results/coverage_braces/end_line_in_anchor.pl
index 642e3e2fd7..dd9dbf1022 100644
--- a/tp/t/results/coverage_braces/end_line_in_anchor.pl
+++ b/tp/t/results/coverage_braces/end_line_in_anchor.pl
@@ -31,8 +31,7 @@ $result_trees{'end_line_in_anchor'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
diff --git a/tp/t/results/coverage_braces/footnote.pl 
b/tp/t/results/coverage_braces/footnote.pl
index 8f4d102282..df3e45b738 100644
--- a/tp/t/results/coverage_braces/footnote.pl
+++ b/tp/t/results/coverage_braces/footnote.pl
@@ -48,8 +48,7 @@ $result_trees{'footnote'} = {
                           'cmdname' => 'r',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 3,
-                            'macro' => ''
+                            'line_nr' => 3
                           }
                         },
                         {
@@ -65,8 +64,7 @@ $result_trees{'footnote'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
diff --git a/tp/t/results/coverage_braces/footnote_ending_on_empty_line.pl 
b/tp/t/results/coverage_braces/footnote_ending_on_empty_line.pl
index 1f9b3792bb..26e6eab61b 100644
--- a/tp/t/results/coverage_braces/footnote_ending_on_empty_line.pl
+++ b/tp/t/results/coverage_braces/footnote_ending_on_empty_line.pl
@@ -44,8 +44,7 @@ $result_trees{'footnote_ending_on_empty_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
diff --git a/tp/t/results/coverage_braces/footnote_in_command_not_closed.pl 
b/tp/t/results/coverage_braces/footnote_in_command_not_closed.pl
index 2c522333d9..a949602b8c 100644
--- a/tp/t/results/coverage_braces/footnote_in_command_not_closed.pl
+++ b/tp/t/results/coverage_braces/footnote_in_command_not_closed.pl
@@ -40,8 +40,7 @@ $result_trees{'footnote_in_command_not_closed'} = {
                       'cmdname' => 'footnote',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     }
                   ],
@@ -51,8 +50,7 @@ $result_trees{'footnote_in_command_not_closed'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -76,7 +74,6 @@ $result_errors{'footnote_in_command_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@footnote missing closing brace',
     'type' => 'error'
   },
@@ -85,7 +82,6 @@ $result_errors{'footnote_in_command_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@code missing closing brace',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage_braces/footnote_no_node.pl 
b/tp/t/results/coverage_braces/footnote_no_node.pl
index e3962876b7..a62b77df03 100644
--- a/tp/t/results/coverage_braces/footnote_no_node.pl
+++ b/tp/t/results/coverage_braces/footnote_no_node.pl
@@ -58,8 +58,7 @@ $result_trees{'footnote_no_node'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -78,8 +77,7 @@ $result_trees{'footnote_no_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
diff --git a/tp/t/results/coverage_braces/footnote_not_closed.pl 
b/tp/t/results/coverage_braces/footnote_not_closed.pl
index 7acb16396a..6419ff984f 100644
--- a/tp/t/results/coverage_braces/footnote_not_closed.pl
+++ b/tp/t/results/coverage_braces/footnote_not_closed.pl
@@ -53,8 +53,7 @@ $result_trees{'footnote_not_closed'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -81,7 +80,6 @@ $result_errors{'footnote_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@footnote missing closing brace',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl 
b/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl
index 94277e793d..4a45728a89 100644
--- a/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl
+++ b/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl
@@ -25,8 +25,7 @@ $result_trees{'form_feed_in_brace_commands'} = {
               'cmdname' => 'option',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -50,8 +49,7 @@ $result_trees{'form_feed_in_brace_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -102,8 +100,7 @@ $result_trees{'form_feed_in_brace_commands'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -139,8 +136,7 @@ $result_trees{'form_feed_in_brace_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -182,8 +178,7 @@ $result_trees{'form_feed_in_brace_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
diff --git a/tp/t/results/coverage_braces/format_on_first_footnote_line.pl 
b/tp/t/results/coverage_braces/format_on_first_footnote_line.pl
index da08f58f10..eba83cac05 100644
--- a/tp/t/results/coverage_braces/format_on_first_footnote_line.pl
+++ b/tp/t/results/coverage_braces/format_on_first_footnote_line.pl
@@ -69,15 +69,13 @@ $result_trees{'format_on_first_footnote_line'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 3,
-                            'macro' => ''
+                            'line_nr' => 3
                           }
                         }
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     }
                   ],
@@ -87,8 +85,7 @@ $result_trees{'format_on_first_footnote_line'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -163,15 +160,13 @@ $result_trees{'format_on_first_footnote_line'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 8,
-                            'macro' => ''
+                            'line_nr' => 8
                           }
                         }
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     },
                     {
@@ -186,8 +181,7 @@ $result_trees{'format_on_first_footnote_line'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
diff --git a/tp/t/results/coverage_braces/heading_in_footnote.pl 
b/tp/t/results/coverage_braces/heading_in_footnote.pl
index 6a222985e5..615cb8164c 100644
--- a/tp/t/results/coverage_braces/heading_in_footnote.pl
+++ b/tp/t/results/coverage_braces/heading_in_footnote.pl
@@ -52,8 +52,7 @@ $result_trees{'heading_in_footnote'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     },
                     {
@@ -88,8 +87,7 @@ $result_trees{'heading_in_footnote'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       },
                       'type' => 'index_entry_command'
                     },
@@ -115,8 +113,7 @@ $result_trees{'heading_in_footnote'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -151,7 +148,6 @@ $result_errors{'heading_in_footnote'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/coverage_braces/inforef_too_much_args.pl 
b/tp/t/results/coverage_braces/inforef_too_much_args.pl
index d344c1c117..66a00d0b56 100644
--- a/tp/t/results/coverage_braces/inforef_too_much_args.pl
+++ b/tp/t/results/coverage_braces/inforef_too_much_args.pl
@@ -83,8 +83,7 @@ $result_trees{'inforef_too_much_args'} = {
               'cmdname' => 'inforef',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -106,8 +105,7 @@ $result_trees{'inforef_too_much_args'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
@@ -148,7 +146,6 @@ $result_errors{'inforef_too_much_args'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@inforef is obsolete',
     'type' => 'warning'
   }
diff --git a/tp/t/results/coverage_braces/kbd.pl 
b/tp/t/results/coverage_braces/kbd.pl
index 6b046eb412..c3437d46a8 100644
--- a/tp/t/results/coverage_braces/kbd.pl
+++ b/tp/t/results/coverage_braces/kbd.pl
@@ -28,8 +28,7 @@ $result_trees{'kbd'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -70,8 +69,7 @@ $result_trees{'kbd'} = {
                       'cmdname' => 'kbd',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -81,8 +79,7 @@ $result_trees{'kbd'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -123,8 +120,7 @@ $result_trees{'kbd'} = {
                       'cmdname' => 'kbd',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
@@ -134,8 +130,7 @@ $result_trees{'kbd'} = {
               'cmdname' => 'kbd',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -204,8 +199,7 @@ $result_trees{'kbd'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 },
                 {
@@ -243,15 +237,13 @@ $result_trees{'kbd'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -313,8 +305,7 @@ $result_trees{'kbd'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 18,
-                    'macro' => ''
+                    'line_nr' => 18
                   }
                 },
                 {
@@ -352,15 +343,13 @@ $result_trees{'kbd'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           }
         }
       ],
diff --git a/tp/t/results/coverage_braces/math_bracketed_inside_not_closed.pl 
b/tp/t/results/coverage_braces/math_bracketed_inside_not_closed.pl
index 892cb9434b..133f404641 100644
--- a/tp/t/results/coverage_braces/math_bracketed_inside_not_closed.pl
+++ b/tp/t/results/coverage_braces/math_bracketed_inside_not_closed.pl
@@ -23,8 +23,7 @@ $result_trees{'math_bracketed_inside_not_closed'} = {
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       },
                       'type' => 'balanced_braces'
                     },
@@ -39,8 +38,7 @@ $result_trees{'math_bracketed_inside_not_closed'} = {
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       },
                       'type' => 'balanced_braces'
                     }
@@ -51,8 +49,7 @@ $result_trees{'math_bracketed_inside_not_closed'} = {
               'cmdname' => 'math',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -76,7 +73,6 @@ $result_errors{'math_bracketed_inside_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@math missing closing brace',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage_braces/math_bracketed_not_closed.pl 
b/tp/t/results/coverage_braces/math_bracketed_not_closed.pl
index 4ea20db681..b616357b35 100644
--- a/tp/t/results/coverage_braces/math_bracketed_not_closed.pl
+++ b/tp/t/results/coverage_braces/math_bracketed_not_closed.pl
@@ -23,8 +23,7 @@ $result_trees{'math_bracketed_not_closed'} = {
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       },
                       'type' => 'balanced_braces'
                     },
@@ -42,8 +41,7 @@ $result_trees{'math_bracketed_not_closed'} = {
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       },
                       'type' => 'balanced_braces'
                     }
@@ -54,8 +52,7 @@ $result_trees{'math_bracketed_not_closed'} = {
               'cmdname' => 'math',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -79,7 +76,6 @@ $result_errors{'math_bracketed_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
   },
@@ -88,7 +84,6 @@ $result_errors{'math_bracketed_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@math missing closing brace',
     'type' => 'error'
   }
diff --git 
a/tp/t/results/coverage_braces/math_bracketed_not_closed_next_line.pl 
b/tp/t/results/coverage_braces/math_bracketed_not_closed_next_line.pl
index 18e7a06c5b..2f3f89e4c0 100644
--- a/tp/t/results/coverage_braces/math_bracketed_not_closed_next_line.pl
+++ b/tp/t/results/coverage_braces/math_bracketed_not_closed_next_line.pl
@@ -35,8 +35,7 @@ $result_trees{'math_bracketed_not_closed_next_line'} = {
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       },
                       'type' => 'balanced_braces'
                     }
@@ -47,8 +46,7 @@ $result_trees{'math_bracketed_not_closed_next_line'} = {
               'cmdname' => 'math',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -76,7 +74,6 @@ $result_errors{'math_bracketed_not_closed_next_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
   },
@@ -85,7 +82,6 @@ $result_errors{'math_bracketed_not_closed_next_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@math missing closing brace',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage_braces/math_leading_trailing_spaces.pl 
b/tp/t/results/coverage_braces/math_leading_trailing_spaces.pl
index b719a981c2..eec401764b 100644
--- a/tp/t/results/coverage_braces/math_leading_trailing_spaces.pl
+++ b/tp/t/results/coverage_braces/math_leading_trailing_spaces.pl
@@ -30,8 +30,7 @@ $result_trees{'math_leading_trailing_spaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
diff --git a/tp/t/results/coverage_braces/math_not_closed.pl 
b/tp/t/results/coverage_braces/math_not_closed.pl
index 1c9a479e6b..e3f021e5fa 100644
--- a/tp/t/results/coverage_braces/math_not_closed.pl
+++ b/tp/t/results/coverage_braces/math_not_closed.pl
@@ -25,8 +25,7 @@ $result_trees{'math_not_closed'} = {
               'cmdname' => 'math',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -50,7 +49,6 @@ $result_errors{'math_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@math missing closing brace',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage_braces/nested.pl 
b/tp/t/results/coverage_braces/nested.pl
index f896505e07..5f4d2cee0d 100644
--- a/tp/t/results/coverage_braces/nested.pl
+++ b/tp/t/results/coverage_braces/nested.pl
@@ -35,8 +35,7 @@ $result_trees{'nested'} = {
                       'cmdname' => 'key',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     }
                   ],
@@ -46,8 +45,7 @@ $result_trees{'nested'} = {
               'cmdname' => 'kbd',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
diff --git a/tp/t/results/coverage_braces/nested_args.pl 
b/tp/t/results/coverage_braces/nested_args.pl
index 8c7ab86dd4..0a9a6205d2 100644
--- a/tp/t/results/coverage_braces/nested_args.pl
+++ b/tp/t/results/coverage_braces/nested_args.pl
@@ -35,8 +35,7 @@ $result_trees{'nested_args'} = {
                       'cmdname' => 'samp',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     }
                   ],
@@ -70,8 +69,7 @@ $result_trees{'nested_args'} = {
                       'cmdname' => 'b',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     }
                   ],
@@ -101,8 +99,7 @@ $result_trees{'nested_args'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     },
                     {
@@ -132,8 +129,7 @@ $result_trees{'nested_args'} = {
                       'cmdname' => 'cite',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -149,8 +145,7 @@ $result_trees{'nested_args'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
diff --git a/tp/t/results/coverage_braces/nested_in_sc.pl 
b/tp/t/results/coverage_braces/nested_in_sc.pl
index 6c73ea150b..c9580ca5a6 100644
--- a/tp/t/results/coverage_braces/nested_in_sc.pl
+++ b/tp/t/results/coverage_braces/nested_in_sc.pl
@@ -36,8 +36,7 @@ $result_trees{'nested_in_sc'} = {
                               'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 1,
-                                'macro' => ''
+                                'line_nr' => 1
                               }
                             },
                             {
@@ -52,8 +51,7 @@ $result_trees{'nested_in_sc'} = {
                               'cmdname' => 'aa',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 1,
-                                'macro' => ''
+                                'line_nr' => 1
                               }
                             },
                             {
@@ -68,8 +66,7 @@ $result_trees{'nested_in_sc'} = {
                               'cmdname' => 'TeX',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 1,
-                                'macro' => ''
+                                'line_nr' => 1
                               }
                             },
                             {
@@ -88,8 +85,7 @@ $result_trees{'nested_in_sc'} = {
                                       'cmdname' => 'aa',
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 1,
-                                        'macro' => ''
+                                        'line_nr' => 1
                                       }
                                     }
                                   ],
@@ -99,8 +95,7 @@ $result_trees{'nested_in_sc'} = {
                               'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 1,
-                                'macro' => ''
+                                'line_nr' => 1
                               }
                             },
                             {
@@ -125,8 +120,7 @@ $result_trees{'nested_in_sc'} = {
                               'cmdname' => 'footnote',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 1,
-                                'macro' => ''
+                                'line_nr' => 1
                               }
                             },
                             {
@@ -159,8 +153,7 @@ $result_trees{'nested_in_sc'} = {
                               'cmdname' => 'abbr',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 1,
-                                'macro' => ''
+                                'line_nr' => 1
                               }
                             },
                             {
@@ -185,8 +178,7 @@ $result_trees{'nested_in_sc'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 2,
-                                'macro' => ''
+                                'line_nr' => 2
                               }
                             }
                           ],
@@ -196,8 +188,7 @@ $result_trees{'nested_in_sc'} = {
                       'cmdname' => 'sc',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     }
                   ],
@@ -207,8 +198,7 @@ $result_trees{'nested_in_sc'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
diff --git a/tp/t/results/coverage_braces/no_brace.pl 
b/tp/t/results/coverage_braces/no_brace.pl
index c93c7c488f..48883a9c3c 100644
--- a/tp/t/results/coverage_braces/no_brace.pl
+++ b/tp/t/results/coverage_braces/no_brace.pl
@@ -20,8 +20,7 @@ $result_trees{'no_brace'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -36,8 +35,7 @@ $result_trees{'no_brace'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -52,8 +50,7 @@ $result_trees{'no_brace'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -80,7 +77,6 @@ $result_errors{'no_brace'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@TeX expected braces',
     'type' => 'error'
   },
@@ -89,7 +85,6 @@ $result_errors{'no_brace'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@code expected braces',
     'type' => 'error'
   },
@@ -98,7 +93,6 @@ $result_errors{'no_brace'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@footnote expected braces',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage_braces/no_brace_space_end_line.pl 
b/tp/t/results/coverage_braces/no_brace_space_end_line.pl
index 5da6777562..e2be287cb5 100644
--- a/tp/t/results/coverage_braces/no_brace_space_end_line.pl
+++ b/tp/t/results/coverage_braces/no_brace_space_end_line.pl
@@ -30,8 +30,7 @@ $result_trees{'no_brace_space_end_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -58,8 +57,7 @@ $result_trees{'no_brace_space_end_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -76,8 +74,7 @@ $result_trees{'no_brace_space_end_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -112,7 +109,6 @@ $result_errors{'no_brace_space_end_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'command `@TeX\' must not be followed by new line',
     'type' => 'warning'
   },
@@ -121,7 +117,6 @@ $result_errors{'no_brace_space_end_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '@TeX expected braces',
     'type' => 'error'
   },
@@ -130,7 +125,6 @@ $result_errors{'no_brace_space_end_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'command `@code\' must not be followed by new line',
     'type' => 'warning'
   },
@@ -139,7 +133,6 @@ $result_errors{'no_brace_space_end_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => '@code expected braces',
     'type' => 'error'
   }
diff --git 
a/tp/t/results/coverage_braces/one_argument_leading_trailing_spaces.pl 
b/tp/t/results/coverage_braces/one_argument_leading_trailing_spaces.pl
index e12c850628..f0f88f4cb5 100644
--- a/tp/t/results/coverage_braces/one_argument_leading_trailing_spaces.pl
+++ b/tp/t/results/coverage_braces/one_argument_leading_trailing_spaces.pl
@@ -25,8 +25,7 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -46,8 +45,7 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
               'cmdname' => 'slanted',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -67,8 +65,7 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -88,8 +85,7 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
               'cmdname' => 'sub',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -118,8 +114,7 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
               'cmdname' => 'hyphenation',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -141,8 +136,7 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
               'cmdname' => 'indicateurl',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -170,8 +164,7 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
               'cmdname' => 'U',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -191,8 +184,7 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -216,8 +208,7 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
diff --git a/tp/t/results/coverage_braces/recursive_acronym.pl 
b/tp/t/results/coverage_braces/recursive_acronym.pl
index 25a9800c65..b1d0108159 100644
--- a/tp/t/results/coverage_braces/recursive_acronym.pl
+++ b/tp/t/results/coverage_braces/recursive_acronym.pl
@@ -37,8 +37,7 @@ $result_trees{'recursive_acronym'} = {
                       'cmdname' => 'acronym',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     },
                     {
@@ -56,8 +55,7 @@ $result_trees{'recursive_acronym'} = {
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
diff --git a/tp/t/results/coverage_braces/recursive_acronym_definition.pl 
b/tp/t/results/coverage_braces/recursive_acronym_definition.pl
index 732253d9cf..42fc3d7512 100644
--- a/tp/t/results/coverage_braces/recursive_acronym_definition.pl
+++ b/tp/t/results/coverage_braces/recursive_acronym_definition.pl
@@ -62,8 +62,7 @@ $result_trees{'recursive_acronym_definition'} = {
                               'cmdname' => 'acronym',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 1,
-                                'macro' => ''
+                                'line_nr' => 1
                               }
                             },
                             {
@@ -81,8 +80,7 @@ $result_trees{'recursive_acronym_definition'} = {
                       'cmdname' => 'acronym',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     },
                     {
@@ -100,8 +98,7 @@ $result_trees{'recursive_acronym_definition'} = {
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
diff --git a/tp/t/results/coverage_braces/ref_empty_node.pl 
b/tp/t/results/coverage_braces/ref_empty_node.pl
index 1438084a2c..9e075facde 100644
--- a/tp/t/results/coverage_braces/ref_empty_node.pl
+++ b/tp/t/results/coverage_braces/ref_empty_node.pl
@@ -39,8 +39,7 @@ $result_trees{'ref_empty_node'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -82,8 +81,7 @@ $result_trees{'ref_empty_node'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -109,8 +107,7 @@ $result_trees{'ref_empty_node'} = {
               'cmdname' => 'inforef',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -183,8 +180,7 @@ $result_trees{'ref_empty_node'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -218,7 +214,6 @@ $result_errors{'ref_empty_node'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@inforef is obsolete',
     'type' => 'warning'
   }
diff --git a/tp/t/results/coverage_braces/ref_in_style_command.pl 
b/tp/t/results/coverage_braces/ref_in_style_command.pl
index ae43e86de8..41751ffe84 100644
--- a/tp/t/results/coverage_braces/ref_in_style_command.pl
+++ b/tp/t/results/coverage_braces/ref_in_style_command.pl
@@ -50,8 +50,7 @@ $result_trees{'ref_in_style_command'} = {
                       'cmdname' => 'ref',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     }
                   ],
@@ -61,8 +60,7 @@ $result_trees{'ref_in_style_command'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
diff --git a/tp/t/results/coverage_braces/simple.pl 
b/tp/t/results/coverage_braces/simple.pl
index e979a361d7..43616979a4 100644
--- a/tp/t/results/coverage_braces/simple.pl
+++ b/tp/t/results/coverage_braces/simple.pl
@@ -25,8 +25,7 @@ $result_trees{'simple'} = {
               'cmdname' => 'b',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
diff --git a/tp/t/results/coverage_braces/space_command_in_image.pl 
b/tp/t/results/coverage_braces/space_command_in_image.pl
index 1de7eb42fd..041869a73d 100644
--- a/tp/t/results/coverage_braces/space_command_in_image.pl
+++ b/tp/t/results/coverage_braces/space_command_in_image.pl
@@ -40,8 +40,7 @@ $result_trees{'space_command_in_image'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -78,8 +77,7 @@ $result_trees{'space_command_in_image'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/coverage_braces/space_in_anchor.pl 
b/tp/t/results/coverage_braces/space_in_anchor.pl
index e1609a1738..77638456c8 100644
--- a/tp/t/results/coverage_braces/space_in_anchor.pl
+++ b/tp/t/results/coverage_braces/space_in_anchor.pl
@@ -35,8 +35,7 @@ $result_trees{'space_in_anchor'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/coverage_braces/space_in_footnote.pl 
b/tp/t/results/coverage_braces/space_in_footnote.pl
index 28e31d12cb..7dfe910564 100644
--- a/tp/t/results/coverage_braces/space_in_footnote.pl
+++ b/tp/t/results/coverage_braces/space_in_footnote.pl
@@ -38,8 +38,7 @@ $result_trees{'space_in_footnote'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
diff --git a/tp/t/results/coverage_braces/space_in_image.pl 
b/tp/t/results/coverage_braces/space_in_image.pl
index 923a46f7d8..7f8dd5c8e2 100644
--- a/tp/t/results/coverage_braces/space_in_image.pl
+++ b/tp/t/results/coverage_braces/space_in_image.pl
@@ -81,8 +81,7 @@ $result_trees{'space_in_image'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -115,8 +114,7 @@ $result_trees{'space_in_image'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -156,7 +154,6 @@ $result_converted_errors{'html_text'}->{'space_in_image'} = 
[
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@image file `a\' (for HTML) not found, using `a.e\'',
     'type' => 'warning'
   },
@@ -165,7 +162,6 @@ $result_converted_errors{'html_text'}->{'space_in_image'} = 
[
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@image file `f\' (for HTML) not found, using `f.jpg\'',
     'type' => 'warning'
   }
@@ -181,7 +177,6 @@ $result_converted_errors{'latex_text'}->{'space_in_image'} 
= [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@image file `a\' (for LaTeX) not found',
     'type' => 'warning'
   },
@@ -190,7 +185,6 @@ $result_converted_errors{'latex_text'}->{'space_in_image'} 
= [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@image file `f\' (for LaTeX) not found',
     'type' => 'warning'
   }
diff --git a/tp/t/results/coverage_braces/test_image.pl 
b/tp/t/results/coverage_braces/test_image.pl
index d4944a6ddd..78fb8c9660 100644
--- a/tp/t/results/coverage_braces/test_image.pl
+++ b/tp/t/results/coverage_braces/test_image.pl
@@ -61,8 +61,7 @@ $result_trees{'test_image'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -72,8 +71,7 @@ $result_trees{'test_image'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -584,15 +582,13 @@ $result_trees{'test_image'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -632,8 +628,7 @@ $result_trees{'test_image'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -1137,8 +1132,7 @@ $result_trees{'test_image'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           }
         },
         {
@@ -1642,15 +1636,13 @@ $result_trees{'test_image'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
@@ -2614,8 +2606,7 @@ $result_trees{'test_image'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             },
             {
@@ -2651,8 +2642,7 @@ $result_trees{'test_image'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             }
           ],
@@ -2669,8 +2659,7 @@ $result_trees{'test_image'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 24,
-            'macro' => ''
+            'line_nr' => 24
           }
         },
         {
@@ -2706,8 +2695,7 @@ $result_trees{'test_image'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 30,
-            'macro' => ''
+            'line_nr' => 30
           }
         },
         {
@@ -2727,8 +2715,7 @@ $result_trees{'test_image'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     }
   ],
diff --git a/tp/t/results/coverage_braces/test_w.pl 
b/tp/t/results/coverage_braces/test_w.pl
index 357e143e2e..ac5c9e6f4b 100644
--- a/tp/t/results/coverage_braces/test_w.pl
+++ b/tp/t/results/coverage_braces/test_w.pl
@@ -29,8 +29,7 @@ $result_trees{'test_w'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -64,8 +63,7 @@ $result_trees{'test_w'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -96,8 +94,7 @@ $result_trees{'test_w'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -132,8 +129,7 @@ $result_trees{'test_w'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -162,8 +158,7 @@ $result_trees{'test_w'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -197,8 +192,7 @@ $result_trees{'test_w'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -232,8 +226,7 @@ $result_trees{'test_w'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -267,8 +260,7 @@ $result_trees{'test_w'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -307,8 +299,7 @@ $result_trees{'test_w'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -347,8 +338,7 @@ $result_trees{'test_w'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -377,8 +367,7 @@ $result_trees{'test_w'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             },
             {
@@ -407,8 +396,7 @@ $result_trees{'test_w'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             },
             {
@@ -437,8 +425,7 @@ $result_trees{'test_w'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -472,8 +459,7 @@ $result_trees{'test_w'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               }
             },
             {
@@ -513,8 +499,7 @@ $result_trees{'test_w'} = {
                               'cmdname' => 'w',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 34,
-                                'macro' => ''
+                                'line_nr' => 34
                               }
                             },
                             {
@@ -529,8 +514,7 @@ $result_trees{'test_w'} = {
                               'cmdname' => 'dots',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 34,
-                                'macro' => ''
+                                'line_nr' => 34
                               }
                             },
                             {
@@ -545,8 +529,7 @@ $result_trees{'test_w'} = {
                               'cmdname' => 'w',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 34,
-                                'macro' => ''
+                                'line_nr' => 34
                               }
                             },
                             {
@@ -559,8 +542,7 @@ $result_trees{'test_w'} = {
                       'cmdname' => 't',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 34,
-                        'macro' => ''
+                        'line_nr' => 34
                       }
                     }
                   ],
@@ -570,8 +552,7 @@ $result_trees{'test_w'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             },
             {
diff --git a/tp/t/results/coverage_braces/too_much_args.pl 
b/tp/t/results/coverage_braces/too_much_args.pl
index 7f6ed0d500..c296ab67d4 100644
--- a/tp/t/results/coverage_braces/too_much_args.pl
+++ b/tp/t/results/coverage_braces/too_much_args.pl
@@ -38,8 +38,7 @@ $result_trees{'too_much_args'} = {
               'cmdname' => 'abbr',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
diff --git a/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl 
b/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
index b4874d2990..2f5ae80e6f 100644
--- a/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
+++ b/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
@@ -44,8 +44,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -110,8 +109,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -164,8 +162,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -237,8 +234,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               },
               'type' => 'menu_entry'
             },
@@ -270,15 +266,13 @@ $result_trees{'two_footnotes_in_nodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           }
         },
         {
@@ -295,8 +289,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -328,8 +321,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 16,
-        'macro' => ''
+        'line_nr' => 16
       }
     },
     {
@@ -394,8 +386,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -448,8 +439,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -475,8 +465,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     }
   ],
diff --git a/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl 
b/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl
index 3f47d25697..02978e99f2 100644
--- a/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl
+++ b/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl
@@ -41,8 +41,7 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -80,8 +79,7 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -146,8 +144,7 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -200,8 +197,7 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -273,8 +269,7 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               },
               'type' => 'menu_entry'
             },
@@ -306,15 +301,13 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -331,8 +324,7 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -364,8 +356,7 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -430,8 +421,7 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -484,8 +474,7 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -511,8 +500,7 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     }
   ],
diff --git 
a/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate_no_header.pl 
b/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate_no_header.pl
index 243348e5b6..6ec4dc7fcf 100644
--- a/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate_no_header.pl
+++ b/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate_no_header.pl
@@ -41,8 +41,7 @@ $result_trees{'two_footnotes_in_nodes_separate_no_header'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -80,8 +79,7 @@ $result_trees{'two_footnotes_in_nodes_separate_no_header'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -146,8 +144,7 @@ $result_trees{'two_footnotes_in_nodes_separate_no_header'} 
= {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -200,8 +197,7 @@ $result_trees{'two_footnotes_in_nodes_separate_no_header'} 
= {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -273,8 +269,7 @@ $result_trees{'two_footnotes_in_nodes_separate_no_header'} 
= {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               },
               'type' => 'menu_entry'
             },
@@ -306,15 +301,13 @@ 
$result_trees{'two_footnotes_in_nodes_separate_no_header'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -331,8 +324,7 @@ $result_trees{'two_footnotes_in_nodes_separate_no_header'} 
= {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -364,8 +356,7 @@ $result_trees{'two_footnotes_in_nodes_separate_no_header'} 
= {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -430,8 +421,7 @@ $result_trees{'two_footnotes_in_nodes_separate_no_header'} 
= {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -484,8 +474,7 @@ $result_trees{'two_footnotes_in_nodes_separate_no_header'} 
= {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -511,8 +500,7 @@ $result_trees{'two_footnotes_in_nodes_separate_no_header'} 
= {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     }
   ],
diff --git a/tp/t/results/coverage_braces/unknown_command_with_braces.pl 
b/tp/t/results/coverage_braces/unknown_command_with_braces.pl
index 51a152f313..dcc9800e5b 100644
--- a/tp/t/results/coverage_braces/unknown_command_with_braces.pl
+++ b/tp/t/results/coverage_braces/unknown_command_with_braces.pl
@@ -132,7 +132,6 @@ $result_errors{'unknown_command_with_braces'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'unknown command `thing\'',
     'type' => 'error'
   },
@@ -141,7 +140,6 @@ $result_errors{'unknown_command_with_braces'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
   },
@@ -150,7 +148,6 @@ $result_errors{'unknown_command_with_braces'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   },
@@ -159,7 +156,6 @@ $result_errors{'unknown_command_with_braces'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'unknown command `unknown\'',
     'type' => 'error'
   },
@@ -168,7 +164,6 @@ $result_errors{'unknown_command_with_braces'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
   },
@@ -177,7 +172,6 @@ $result_errors{'unknown_command_with_braces'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   },
@@ -186,7 +180,6 @@ $result_errors{'unknown_command_with_braces'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'unknown command `unknown2\'',
     'type' => 'error'
   },
@@ -195,7 +188,6 @@ $result_errors{'unknown_command_with_braces'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
   },
@@ -204,7 +196,6 @@ $result_errors{'unknown_command_with_braces'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage_braces/unmatched_brace.pl 
b/tp/t/results/coverage_braces/unmatched_brace.pl
index ad71c061dc..d718aff778 100644
--- a/tp/t/results/coverage_braces/unmatched_brace.pl
+++ b/tp/t/results/coverage_braces/unmatched_brace.pl
@@ -25,8 +25,7 @@ $result_trees{'unmatched_brace'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -52,8 +51,7 @@ $result_trees{'unmatched_brace'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -80,7 +78,6 @@ $result_errors{'unmatched_brace'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/coverage_braces/uref_in_ref.pl 
b/tp/t/results/coverage_braces/uref_in_ref.pl
index e1f1133922..4729b97530 100644
--- a/tp/t/results/coverage_braces/uref_in_ref.pl
+++ b/tp/t/results/coverage_braces/uref_in_ref.pl
@@ -69,8 +69,7 @@ $result_trees{'uref_in_ref'} = {
                       'cmdname' => 'uref',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     }
                   ],
@@ -108,8 +107,7 @@ $result_trees{'uref_in_ref'} = {
                       'cmdname' => 'uref',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     }
                   ],
@@ -147,8 +145,7 @@ $result_trees{'uref_in_ref'} = {
                       'cmdname' => 'uref',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     }
                   ],
@@ -186,8 +183,7 @@ $result_trees{'uref_in_ref'} = {
                       'cmdname' => 'uref',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     }
                   ],
@@ -202,8 +198,7 @@ $result_trees{'uref_in_ref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -247,7 +242,6 @@ $result_converted_errors{'plaintext'}->{'uref_in_ref'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@ref cross-reference name should not contain `:\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/coverage_braces/uref_url.pl 
b/tp/t/results/coverage_braces/uref_url.pl
index 4b9b7f3c72..0a0e5a992f 100644
--- a/tp/t/results/coverage_braces/uref_url.pl
+++ b/tp/t/results/coverage_braces/uref_url.pl
@@ -33,8 +33,7 @@ $result_trees{'uref_url'} = {
               'cmdname' => 'uref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -55,8 +54,7 @@ $result_trees{'uref_url'} = {
               'cmdname' => 'uref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -80,8 +78,7 @@ $result_trees{'uref_url'} = {
               'cmdname' => 'uref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -118,8 +115,7 @@ $result_trees{'uref_url'} = {
               'cmdname' => 'uref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -151,8 +147,7 @@ $result_trees{'uref_url'} = {
               'cmdname' => 'uref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -184,8 +179,7 @@ $result_trees{'uref_url'} = {
               'cmdname' => 'uref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -212,8 +206,7 @@ $result_trees{'uref_url'} = {
               'cmdname' => 'uref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -242,8 +235,7 @@ $result_trees{'uref_url'} = {
               'cmdname' => 'url',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -280,8 +272,7 @@ $result_trees{'uref_url'} = {
               'cmdname' => 'url',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
diff --git a/tp/t/results/coverage_braces/uref_with_commands_characters.pl 
b/tp/t/results/coverage_braces/uref_with_commands_characters.pl
index dd3b142b58..8408a3dce6 100644
--- a/tp/t/results/coverage_braces/uref_with_commands_characters.pl
+++ b/tp/t/results/coverage_braces/uref_with_commands_characters.pl
@@ -32,8 +32,7 @@ $result_trees{'uref_with_commands_characters'} = {
                       'cmdname' => 'strong',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     },
                     {
@@ -78,8 +77,7 @@ $result_trees{'uref_with_commands_characters'} = {
                               'cmdname' => 'LaTeX',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 1,
-                                'macro' => ''
+                                'line_nr' => 1
                               }
                             }
                           ],
@@ -89,8 +87,7 @@ $result_trees{'uref_with_commands_characters'} = {
                       'cmdname' => 'strong',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     }
                   ],
@@ -105,8 +102,7 @@ $result_trees{'uref_with_commands_characters'} = {
               'cmdname' => 'uref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
diff --git a/tp/t/results/coverage_braces/verb_in_xref.pl 
b/tp/t/results/coverage_braces/verb_in_xref.pl
index c786b7e616..dea74efd28 100644
--- a/tp/t/results/coverage_braces/verb_in_xref.pl
+++ b/tp/t/results/coverage_braces/verb_in_xref.pl
@@ -27,8 +27,7 @@ $result_trees{'verb_in_xref'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -96,8 +95,7 @@ $result_trees{'verb_in_xref'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -112,8 +110,7 @@ $result_trees{'verb_in_xref'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -150,7 +147,6 @@ $result_errors{'verb_in_xref'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@verb should not appear anywhere inside @xref',
     'type' => 'warning'
   }
diff --git a/tp/t/results/coverage_braces/w_end_sentence.pl 
b/tp/t/results/coverage_braces/w_end_sentence.pl
index ad3fa3d2f5..844644282d 100644
--- a/tp/t/results/coverage_braces/w_end_sentence.pl
+++ b/tp/t/results/coverage_braces/w_end_sentence.pl
@@ -28,8 +28,7 @@ $result_trees{'w_end_sentence'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
diff --git a/tp/t/results/def/adjacent_defline.pl 
b/tp/t/results/def/adjacent_defline.pl
index de035b0cb3..588dbbc39b 100644
--- a/tp/t/results/def/adjacent_defline.pl
+++ b/tp/t/results/def/adjacent_defline.pl
@@ -96,8 +96,7 @@ $result_trees{'adjacent_defline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               },
               'type' => 'def_line'
             },
@@ -194,8 +193,7 @@ $result_trees{'adjacent_defline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               },
               'type' => 'def_line'
             },
@@ -241,15 +239,13 @@ $result_trees{'adjacent_defline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/def/all_commands.pl b/tp/t/results/def/all_commands.pl
index 4c21ec8d19..e7ae321804 100644
--- a/tp/t/results/def/all_commands.pl
+++ b/tp/t/results/def/all_commands.pl
@@ -56,8 +56,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               },
               'type' => 'def_line'
             },
@@ -103,8 +102,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -115,8 +113,7 @@ $result_trees{'all_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -184,8 +181,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'def_line'
             },
@@ -231,8 +227,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -243,8 +238,7 @@ $result_trees{'all_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -299,8 +293,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'def_line'
             },
@@ -346,8 +339,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
@@ -358,8 +350,7 @@ $result_trees{'all_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -440,8 +431,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               },
               'type' => 'def_line'
             },
@@ -487,8 +477,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
@@ -499,8 +488,7 @@ $result_trees{'all_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -568,8 +556,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               },
               'type' => 'def_line'
             },
@@ -615,8 +602,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             }
           ],
@@ -627,8 +613,7 @@ $result_trees{'all_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -759,8 +744,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               },
               'type' => 'def_line'
             },
@@ -806,8 +790,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             }
           ],
@@ -818,8 +801,7 @@ $result_trees{'all_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 21,
-            'macro' => ''
+            'line_nr' => 21
           }
         },
         {
@@ -937,8 +919,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               },
               'type' => 'def_line'
             },
@@ -984,8 +965,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             }
           ],
@@ -996,8 +976,7 @@ $result_trees{'all_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           }
         },
         {
@@ -1065,8 +1044,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               },
               'type' => 'def_line'
             },
@@ -1112,8 +1090,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               }
             }
           ],
@@ -1124,8 +1101,7 @@ $result_trees{'all_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 29,
-            'macro' => ''
+            'line_nr' => 29
           }
         },
         {
@@ -1193,8 +1169,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               },
               'type' => 'def_line'
             },
@@ -1240,8 +1215,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             }
           ],
@@ -1252,8 +1226,7 @@ $result_trees{'all_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 33,
-            'macro' => ''
+            'line_nr' => 33
           }
         },
         {
@@ -1334,8 +1307,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 37,
-                'macro' => ''
+                'line_nr' => 37
               },
               'type' => 'def_line'
             },
@@ -1381,8 +1353,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 39,
-                'macro' => ''
+                'line_nr' => 39
               }
             }
           ],
@@ -1393,8 +1364,7 @@ $result_trees{'all_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 37,
-            'macro' => ''
+            'line_nr' => 37
           }
         },
         {
@@ -1512,8 +1482,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 41,
-                'macro' => ''
+                'line_nr' => 41
               },
               'type' => 'def_line'
             },
@@ -1559,8 +1528,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               }
             }
           ],
@@ -1571,8 +1539,7 @@ $result_trees{'all_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 41,
-            'macro' => ''
+            'line_nr' => 41
           }
         },
         {
@@ -1703,8 +1670,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 45,
-                'macro' => ''
+                'line_nr' => 45
               },
               'type' => 'def_line'
             },
@@ -1750,8 +1716,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               }
             }
           ],
@@ -1762,8 +1727,7 @@ $result_trees{'all_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 45,
-            'macro' => ''
+            'line_nr' => 45
           }
         },
         {
@@ -1881,8 +1845,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               },
               'type' => 'def_line'
             },
@@ -1928,8 +1891,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 51,
-                'macro' => ''
+                'line_nr' => 51
               }
             }
           ],
@@ -1940,8 +1902,7 @@ $result_trees{'all_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 49,
-            'macro' => ''
+            'line_nr' => 49
           }
         },
         {
@@ -2046,8 +2007,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               },
               'type' => 'def_line'
             },
@@ -2093,8 +2053,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 55,
-                'macro' => ''
+                'line_nr' => 55
               }
             }
           ],
@@ -2105,8 +2064,7 @@ $result_trees{'all_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 53,
-            'macro' => ''
+            'line_nr' => 53
           }
         },
         {
@@ -2174,8 +2132,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 57,
-                'macro' => ''
+                'line_nr' => 57
               },
               'type' => 'def_line'
             },
@@ -2221,8 +2178,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             }
           ],
@@ -2233,8 +2189,7 @@ $result_trees{'all_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 57,
-            'macro' => ''
+            'line_nr' => 57
           }
         },
         {
@@ -2307,8 +2262,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               },
               'type' => 'def_line'
             },
@@ -2354,8 +2308,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 63,
-                'macro' => ''
+                'line_nr' => 63
               }
             }
           ],
@@ -2366,8 +2319,7 @@ $result_trees{'all_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 61,
-            'macro' => ''
+            'line_nr' => 61
           }
         },
         {
@@ -2440,8 +2392,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               },
               'type' => 'def_line'
             },
@@ -2487,8 +2438,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 67,
-                'macro' => ''
+                'line_nr' => 67
               }
             }
           ],
@@ -2499,8 +2449,7 @@ $result_trees{'all_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 65,
-            'macro' => ''
+            'line_nr' => 65
           }
         },
         {
@@ -2573,8 +2522,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 69,
-                'macro' => ''
+                'line_nr' => 69
               },
               'type' => 'def_line'
             },
@@ -2620,8 +2568,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             }
           ],
@@ -2632,8 +2579,7 @@ $result_trees{'all_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 69,
-            'macro' => ''
+            'line_nr' => 69
           }
         },
         {
@@ -2693,8 +2639,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 73,
-                'macro' => ''
+                'line_nr' => 73
               },
               'type' => 'def_line'
             },
@@ -2740,8 +2685,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 75,
-                'macro' => ''
+                'line_nr' => 75
               }
             }
           ],
@@ -2752,8 +2696,7 @@ $result_trees{'all_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 73,
-            'macro' => ''
+            'line_nr' => 73
           }
         },
         {
@@ -2839,8 +2782,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 77,
-                'macro' => ''
+                'line_nr' => 77
               },
               'type' => 'def_line'
             },
@@ -2886,8 +2828,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 79,
-                'macro' => ''
+                'line_nr' => 79
               }
             }
           ],
@@ -2898,8 +2839,7 @@ $result_trees{'all_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 77,
-            'macro' => ''
+            'line_nr' => 77
           }
         },
         {
@@ -2959,8 +2899,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 81,
-                'macro' => ''
+                'line_nr' => 81
               },
               'type' => 'def_line'
             },
@@ -3006,8 +2945,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 83,
-                'macro' => ''
+                'line_nr' => 83
               }
             }
           ],
@@ -3018,8 +2956,7 @@ $result_trees{'all_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 81,
-            'macro' => ''
+            'line_nr' => 81
           }
         },
         {
@@ -3105,8 +3042,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 85,
-                'macro' => ''
+                'line_nr' => 85
               },
               'type' => 'def_line'
             },
@@ -3152,8 +3088,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 87,
-                'macro' => ''
+                'line_nr' => 87
               }
             }
           ],
@@ -3164,8 +3099,7 @@ $result_trees{'all_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 85,
-            'macro' => ''
+            'line_nr' => 85
           }
         },
         {
@@ -3238,8 +3172,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 89,
-                'macro' => ''
+                'line_nr' => 89
               },
               'type' => 'def_line'
             },
@@ -3285,8 +3218,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 91,
-                'macro' => ''
+                'line_nr' => 91
               }
             }
           ],
@@ -3297,8 +3229,7 @@ $result_trees{'all_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 89,
-            'macro' => ''
+            'line_nr' => 89
           }
         },
         {
@@ -3408,8 +3339,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 93,
-                'macro' => ''
+                'line_nr' => 93
               },
               'type' => 'def_line'
             },
@@ -3455,8 +3385,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 95,
-                'macro' => ''
+                'line_nr' => 95
               }
             }
           ],
@@ -3467,8 +3396,7 @@ $result_trees{'all_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 93,
-            'macro' => ''
+            'line_nr' => 93
           }
         },
         {
@@ -3591,8 +3519,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 97,
-                'macro' => ''
+                'line_nr' => 97
               },
               'type' => 'def_line'
             },
@@ -3638,8 +3565,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 99,
-                'macro' => ''
+                'line_nr' => 99
               }
             }
           ],
@@ -3650,8 +3576,7 @@ $result_trees{'all_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 97,
-            'macro' => ''
+            'line_nr' => 97
           }
         },
         {
@@ -3774,8 +3699,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 101,
-                'macro' => ''
+                'line_nr' => 101
               },
               'type' => 'def_line'
             },
@@ -3821,8 +3745,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 103,
-                'macro' => ''
+                'line_nr' => 103
               }
             }
           ],
@@ -3833,8 +3756,7 @@ $result_trees{'all_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 101,
-            'macro' => ''
+            'line_nr' => 101
           }
         },
         {
@@ -3970,8 +3892,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 105,
-                'macro' => ''
+                'line_nr' => 105
               },
               'type' => 'def_line'
             },
@@ -4017,8 +3938,7 @@ $result_trees{'all_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 107,
-                'macro' => ''
+                'line_nr' => 107
               }
             }
           ],
@@ -4029,8 +3949,7 @@ $result_trees{'all_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 105,
-            'macro' => ''
+            'line_nr' => 105
           }
         }
       ],
@@ -4255,7 +4174,6 @@ $result_errors{'all_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'entry for index `vr\' outside of any node',
     'type' => 'warning'
   },
@@ -4264,7 +4182,6 @@ $result_errors{'all_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -4273,7 +4190,6 @@ $result_errors{'all_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -4282,7 +4198,6 @@ $result_errors{'all_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -4291,7 +4206,6 @@ $result_errors{'all_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 17,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -4300,7 +4214,6 @@ $result_errors{'all_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 21,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -4309,7 +4222,6 @@ $result_errors{'all_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 25,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -4318,7 +4230,6 @@ $result_errors{'all_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 29,
-    'macro' => '',
     'text' => 'entry for index `vr\' outside of any node',
     'type' => 'warning'
   },
@@ -4327,7 +4238,6 @@ $result_errors{'all_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 33,
-    'macro' => '',
     'text' => 'entry for index `vr\' outside of any node',
     'type' => 'warning'
   },
@@ -4336,7 +4246,6 @@ $result_errors{'all_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 37,
-    'macro' => '',
     'text' => 'entry for index `vr\' outside of any node',
     'type' => 'warning'
   },
@@ -4345,7 +4254,6 @@ $result_errors{'all_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 41,
-    'macro' => '',
     'text' => 'entry for index `vr\' outside of any node',
     'type' => 'warning'
   },
@@ -4354,7 +4262,6 @@ $result_errors{'all_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 45,
-    'macro' => '',
     'text' => 'entry for index `vr\' outside of any node',
     'type' => 'warning'
   },
@@ -4363,7 +4270,6 @@ $result_errors{'all_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 49,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -4372,7 +4278,6 @@ $result_errors{'all_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 53,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -4381,7 +4286,6 @@ $result_errors{'all_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 57,
-    'macro' => '',
     'text' => 'entry for index `tp\' outside of any node',
     'type' => 'warning'
   },
@@ -4390,7 +4294,6 @@ $result_errors{'all_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 61,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -4399,7 +4302,6 @@ $result_errors{'all_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 65,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -4408,7 +4310,6 @@ $result_errors{'all_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 69,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -4417,7 +4318,6 @@ $result_errors{'all_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 73,
-    'macro' => '',
     'text' => 'entry for index `vr\' outside of any node',
     'type' => 'warning'
   },
@@ -4426,7 +4326,6 @@ $result_errors{'all_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 77,
-    'macro' => '',
     'text' => 'entry for index `vr\' outside of any node',
     'type' => 'warning'
   },
@@ -4435,7 +4334,6 @@ $result_errors{'all_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 81,
-    'macro' => '',
     'text' => 'entry for index `vr\' outside of any node',
     'type' => 'warning'
   },
@@ -4444,7 +4342,6 @@ $result_errors{'all_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 85,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -4453,7 +4350,6 @@ $result_errors{'all_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 89,
-    'macro' => '',
     'text' => 'entry for index `vr\' outside of any node',
     'type' => 'warning'
   },
@@ -4462,7 +4358,6 @@ $result_errors{'all_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 93,
-    'macro' => '',
     'text' => 'entry for index `vr\' outside of any node',
     'type' => 'warning'
   },
@@ -4471,7 +4366,6 @@ $result_errors{'all_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 97,
-    'macro' => '',
     'text' => 'entry for index `vr\' outside of any node',
     'type' => 'warning'
   },
@@ -4480,7 +4374,6 @@ $result_errors{'all_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 101,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -4489,7 +4382,6 @@ $result_errors{'all_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 105,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/def/all_commands_delimiters.pl 
b/tp/t/results/def/all_commands_delimiters.pl
index c31192abfa..471c31e117 100644
--- a/tp/t/results/def/all_commands_delimiters.pl
+++ b/tp/t/results/def/all_commands_delimiters.pl
@@ -46,8 +46,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     },
                     {
@@ -74,8 +73,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     },
                     {
@@ -96,8 +94,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -119,8 +116,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -228,8 +224,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -263,8 +258,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -285,8 +279,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -320,8 +313,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -385,8 +377,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               },
               'type' => 'def_line'
             },
@@ -418,8 +409,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -430,8 +420,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -483,8 +472,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -506,8 +494,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -615,8 +602,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     },
                     {
@@ -650,8 +636,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     },
                     {
@@ -672,8 +657,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -707,8 +691,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     },
                     {
@@ -772,8 +755,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'def_line'
             },
@@ -805,8 +787,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -817,8 +798,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -844,8 +824,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -919,8 +898,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -967,8 +945,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -999,8 +976,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'def_line'
             },
@@ -1032,8 +1008,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
@@ -1044,8 +1019,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -1071,8 +1045,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -1146,8 +1119,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     },
                     {
@@ -1194,8 +1166,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     },
                     {
@@ -1283,8 +1254,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -1312,8 +1282,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     },
                     {
@@ -1347,8 +1316,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     },
                     {
@@ -1369,8 +1337,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -1404,8 +1371,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     },
                     {
@@ -1494,8 +1460,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               },
               'type' => 'def_line'
             },
@@ -1527,8 +1492,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
@@ -1539,8 +1503,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           }
         },
         {
@@ -1566,8 +1529,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -1615,8 +1577,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -1641,8 +1602,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               },
               'type' => 'def_line'
             },
@@ -1674,8 +1634,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             }
           ],
@@ -1686,8 +1645,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           }
         },
         {
@@ -1765,8 +1723,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 19,
-                        'macro' => ''
+                        'line_nr' => 19
                       }
                     },
                     {
@@ -1832,8 +1789,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     },
                     {
@@ -1948,8 +1904,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               },
               'type' => 'def_line'
             },
@@ -1981,8 +1936,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             }
           ],
@@ -1993,8 +1947,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         },
         {
@@ -2020,8 +1973,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 23,
-                        'macro' => ''
+                        'line_nr' => 23
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -2155,8 +2107,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -2190,8 +2141,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -2212,8 +2162,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -2247,8 +2196,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -2312,8 +2260,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               },
               'type' => 'def_line'
             },
@@ -2345,8 +2292,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               }
             }
           ],
@@ -2357,8 +2303,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           }
         },
         {
@@ -2384,8 +2329,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 27,
-                        'macro' => ''
+                        'line_nr' => 27
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -2532,8 +2476,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       }
                     },
                     {
@@ -2567,8 +2510,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       }
                     },
                     {
@@ -2589,8 +2531,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -2624,8 +2565,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       }
                     },
                     {
@@ -2689,8 +2629,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               },
               'type' => 'def_line'
             },
@@ -2722,8 +2661,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             }
           ],
@@ -2734,8 +2672,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 27,
-            'macro' => ''
+            'line_nr' => 27
           }
         },
         {
@@ -2761,8 +2698,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 31,
-                        'macro' => ''
+                        'line_nr' => 31
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -2896,8 +2832,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 32,
-                        'macro' => ''
+                        'line_nr' => 32
                       }
                     },
                     {
@@ -2931,8 +2866,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 32,
-                        'macro' => ''
+                        'line_nr' => 32
                       }
                     },
                     {
@@ -2953,8 +2887,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 32,
-                        'macro' => ''
+                        'line_nr' => 32
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -2988,8 +2921,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 32,
-                        'macro' => ''
+                        'line_nr' => 32
                       }
                     },
                     {
@@ -3053,8 +2985,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               },
               'type' => 'def_line'
             },
@@ -3086,8 +3017,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               }
             }
           ],
@@ -3098,8 +3028,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 31,
-            'macro' => ''
+            'line_nr' => 31
           }
         },
         {
@@ -3125,8 +3054,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 35,
-                        'macro' => ''
+                        'line_nr' => 35
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -3167,8 +3095,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 35,
-                        'macro' => ''
+                        'line_nr' => 35
                       }
                     },
                     {
@@ -3288,8 +3215,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 36,
-                        'macro' => ''
+                        'line_nr' => 36
                       }
                     },
                     {
@@ -3323,8 +3249,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 36,
-                        'macro' => ''
+                        'line_nr' => 36
                       }
                     },
                     {
@@ -3345,8 +3270,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 36,
-                        'macro' => ''
+                        'line_nr' => 36
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -3380,8 +3304,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 36,
-                        'macro' => ''
+                        'line_nr' => 36
                       }
                     },
                     {
@@ -3482,8 +3405,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               },
               'type' => 'def_line'
             },
@@ -3515,8 +3437,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 37,
-                'macro' => ''
+                'line_nr' => 37
               }
             }
           ],
@@ -3527,8 +3448,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 35,
-            'macro' => ''
+            'line_nr' => 35
           }
         },
         {
@@ -3679,8 +3599,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 40,
-                        'macro' => ''
+                        'line_nr' => 40
                       }
                     },
                     {
@@ -3714,8 +3633,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 40,
-                        'macro' => ''
+                        'line_nr' => 40
                       }
                     },
                     {
@@ -3736,8 +3654,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 40,
-                        'macro' => ''
+                        'line_nr' => 40
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -3771,8 +3688,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 40,
-                        'macro' => ''
+                        'line_nr' => 40
                       }
                     },
                     {
@@ -3873,8 +3789,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 39,
-                'macro' => ''
+                'line_nr' => 39
               },
               'type' => 'def_line'
             },
@@ -3906,8 +3821,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 41,
-                'macro' => ''
+                'line_nr' => 41
               }
             }
           ],
@@ -3918,8 +3832,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 39,
-            'macro' => ''
+            'line_nr' => 39
           }
         },
         {
@@ -3977,8 +3890,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 43,
-                        'macro' => ''
+                        'line_nr' => 43
                       }
                     },
                     {
@@ -4098,8 +4010,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 44,
-                        'macro' => ''
+                        'line_nr' => 44
                       }
                     },
                     {
@@ -4133,8 +4044,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 44,
-                        'macro' => ''
+                        'line_nr' => 44
                       }
                     },
                     {
@@ -4155,8 +4065,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 44,
-                        'macro' => ''
+                        'line_nr' => 44
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -4190,8 +4099,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 44,
-                        'macro' => ''
+                        'line_nr' => 44
                       }
                     },
                     {
@@ -4292,8 +4200,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               },
               'type' => 'def_line'
             },
@@ -4325,8 +4232,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 45,
-                'macro' => ''
+                'line_nr' => 45
               }
             }
           ],
@@ -4337,8 +4243,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 43,
-            'macro' => ''
+            'line_nr' => 43
           }
         },
         {
@@ -4396,8 +4301,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 47,
-                        'macro' => ''
+                        'line_nr' => 47
                       }
                     },
                     {
@@ -4497,8 +4401,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               },
               'type' => 'def_line'
             },
@@ -4530,8 +4433,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               }
             }
           ],
@@ -4542,8 +4444,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 47,
-            'macro' => ''
+            'line_nr' => 47
           }
         },
         {
@@ -4582,8 +4483,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 50,
-                        'macro' => ''
+                        'line_nr' => 50
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -4611,8 +4511,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 50,
-                        'macro' => ''
+                        'line_nr' => 50
                       }
                     },
                     {
@@ -4633,8 +4532,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 50,
-                        'macro' => ''
+                        'line_nr' => 50
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -4742,8 +4640,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               },
               'type' => 'def_line'
             },
@@ -4775,8 +4672,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 51,
-                'macro' => ''
+                'line_nr' => 51
               }
             }
           ],
@@ -4787,8 +4683,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 50,
-            'macro' => ''
+            'line_nr' => 50
           }
         },
         {
@@ -4827,8 +4722,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 53,
-                        'macro' => ''
+                        'line_nr' => 53
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -4856,8 +4750,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 53,
-                        'macro' => ''
+                        'line_nr' => 53
                       }
                     },
                     {
@@ -4878,8 +4771,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 53,
-                        'macro' => ''
+                        'line_nr' => 53
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -4987,8 +4879,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               },
               'type' => 'def_line'
             },
@@ -5020,8 +4911,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 54,
-                'macro' => ''
+                'line_nr' => 54
               }
             }
           ],
@@ -5032,8 +4922,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 53,
-            'macro' => ''
+            'line_nr' => 53
           }
         },
         {
@@ -5091,8 +4980,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 56,
-                        'macro' => ''
+                        'line_nr' => 56
                       }
                     },
                     {
@@ -5192,8 +5080,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               },
               'type' => 'def_line'
             },
@@ -5225,8 +5112,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 57,
-                'macro' => ''
+                'line_nr' => 57
               }
             }
           ],
@@ -5237,8 +5123,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 56,
-            'macro' => ''
+            'line_nr' => 56
           }
         },
         {
@@ -5296,8 +5181,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 59,
-                        'macro' => ''
+                        'line_nr' => 59
                       }
                     },
                     {
@@ -5397,8 +5281,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               },
               'type' => 'def_line'
             },
@@ -5430,8 +5313,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 60,
-                'macro' => ''
+                'line_nr' => 60
               }
             }
           ],
@@ -5442,8 +5324,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 59,
-            'macro' => ''
+            'line_nr' => 59
           }
         },
         {
@@ -5482,8 +5363,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 62,
-                        'macro' => ''
+                        'line_nr' => 62
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -5511,8 +5391,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 62,
-                        'macro' => ''
+                        'line_nr' => 62
                       }
                     },
                     {
@@ -5533,8 +5412,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 62,
-                        'macro' => ''
+                        'line_nr' => 62
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -5642,8 +5520,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               },
               'type' => 'def_line'
             },
@@ -5675,8 +5552,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 63,
-                'macro' => ''
+                'line_nr' => 63
               }
             }
           ],
@@ -5687,8 +5563,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 62,
-            'macro' => ''
+            'line_nr' => 62
           }
         },
         {
@@ -5727,8 +5602,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
-                        'macro' => ''
+                        'line_nr' => 65
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -5756,8 +5630,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
-                        'macro' => ''
+                        'line_nr' => 65
                       }
                     },
                     {
@@ -5778,8 +5651,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
-                        'macro' => ''
+                        'line_nr' => 65
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -5887,8 +5759,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               },
               'type' => 'def_line'
             },
@@ -5920,8 +5791,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 66,
-                'macro' => ''
+                'line_nr' => 66
               }
             }
           ],
@@ -5932,8 +5802,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 65,
-            'macro' => ''
+            'line_nr' => 65
           }
         },
         {
@@ -5991,8 +5860,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 68,
-                        'macro' => ''
+                        'line_nr' => 68
                       }
                     },
                     {
@@ -6092,8 +5960,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 68,
-                'macro' => ''
+                'line_nr' => 68
               },
               'type' => 'def_line'
             },
@@ -6125,8 +5992,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 69,
-                'macro' => ''
+                'line_nr' => 69
               }
             }
           ],
@@ -6137,8 +6003,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 68,
-            'macro' => ''
+            'line_nr' => 68
           }
         },
         {
@@ -6196,8 +6061,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 71,
-                        'macro' => ''
+                        'line_nr' => 71
                       }
                     },
                     {
@@ -6297,8 +6161,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               },
               'type' => 'def_line'
             },
@@ -6330,8 +6193,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 72,
-                'macro' => ''
+                'line_nr' => 72
               }
             }
           ],
@@ -6342,8 +6204,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 71,
-            'macro' => ''
+            'line_nr' => 71
           }
         },
         {
@@ -6382,8 +6243,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 74,
-                        'macro' => ''
+                        'line_nr' => 74
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -6411,8 +6271,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 74,
-                        'macro' => ''
+                        'line_nr' => 74
                       }
                     },
                     {
@@ -6433,8 +6292,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 74,
-                        'macro' => ''
+                        'line_nr' => 74
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -6542,8 +6400,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 74,
-                'macro' => ''
+                'line_nr' => 74
               },
               'type' => 'def_line'
             },
@@ -6575,8 +6432,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 75,
-                'macro' => ''
+                'line_nr' => 75
               }
             }
           ],
@@ -6587,8 +6443,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 74,
-            'macro' => ''
+            'line_nr' => 74
           }
         },
         {
@@ -6627,8 +6482,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 77,
-                        'macro' => ''
+                        'line_nr' => 77
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -6656,8 +6510,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 77,
-                        'macro' => ''
+                        'line_nr' => 77
                       }
                     },
                     {
@@ -6678,8 +6531,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 77,
-                        'macro' => ''
+                        'line_nr' => 77
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -6787,8 +6639,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 77,
-                'macro' => ''
+                'line_nr' => 77
               },
               'type' => 'def_line'
             },
@@ -6820,8 +6671,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 78,
-                'macro' => ''
+                'line_nr' => 78
               }
             }
           ],
@@ -6832,8 +6682,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 77,
-            'macro' => ''
+            'line_nr' => 77
           }
         },
         {
@@ -6891,8 +6740,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 80,
-                        'macro' => ''
+                        'line_nr' => 80
                       }
                     },
                     {
@@ -6992,8 +6840,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 80,
-                'macro' => ''
+                'line_nr' => 80
               },
               'type' => 'def_line'
             },
@@ -7025,8 +6872,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 81,
-                'macro' => ''
+                'line_nr' => 81
               }
             }
           ],
@@ -7037,8 +6883,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 80,
-            'macro' => ''
+            'line_nr' => 80
           }
         },
         {
@@ -7096,8 +6941,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 83,
-                        'macro' => ''
+                        'line_nr' => 83
                       }
                     },
                     {
@@ -7197,8 +7041,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 83,
-                'macro' => ''
+                'line_nr' => 83
               },
               'type' => 'def_line'
             },
@@ -7230,8 +7073,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 84,
-                'macro' => ''
+                'line_nr' => 84
               }
             }
           ],
@@ -7242,8 +7084,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 83,
-            'macro' => ''
+            'line_nr' => 83
           }
         },
         {
@@ -7277,8 +7118,7 @@ $result_trees{'all_commands_delimiters'} = {
                           'cmdname' => 'code',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 86,
-                            'macro' => ''
+                            'line_nr' => 86
                           }
                         }
                       ],
@@ -7313,8 +7153,7 @@ $result_trees{'all_commands_delimiters'} = {
                           'cmdname' => 'code',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 86,
-                            'macro' => ''
+                            'line_nr' => 86
                           }
                         }
                       ],
@@ -7323,8 +7162,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 86,
-                        'macro' => ''
+                        'line_nr' => 86
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -7354,8 +7192,7 @@ $result_trees{'all_commands_delimiters'} = {
                           'cmdname' => 'var',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 86,
-                            'macro' => ''
+                            'line_nr' => 86
                           }
                         }
                       ],
@@ -7471,8 +7308,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 86,
-                'macro' => ''
+                'line_nr' => 86
               },
               'type' => 'def_line'
             },
@@ -7504,8 +7340,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 87,
-                'macro' => ''
+                'line_nr' => 87
               }
             }
           ],
@@ -7516,8 +7351,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 86,
-            'macro' => ''
+            'line_nr' => 86
           }
         },
         {
@@ -7616,8 +7450,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 89,
-                'macro' => ''
+                'line_nr' => 89
               },
               'type' => 'def_line'
             },
@@ -7649,8 +7482,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 90,
-                'macro' => ''
+                'line_nr' => 90
               }
             }
           ],
@@ -7661,8 +7493,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 89,
-            'macro' => ''
+            'line_nr' => 89
           }
         },
         {
@@ -7694,8 +7525,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 92,
-                        'macro' => ''
+                        'line_nr' => 92
                       }
                     },
                     {
@@ -7722,8 +7552,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 92,
-                        'macro' => ''
+                        'line_nr' => 92
                       }
                     },
                     {
@@ -7750,8 +7579,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 92,
-                        'macro' => ''
+                        'line_nr' => 92
                       }
                     },
                     {
@@ -7778,8 +7606,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 92,
-                        'macro' => ''
+                        'line_nr' => 92
                       }
                     }
                   ],
@@ -7803,8 +7630,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 92,
-                'macro' => ''
+                'line_nr' => 92
               },
               'type' => 'def_line'
             },
@@ -7836,8 +7662,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 93,
-                'macro' => ''
+                'line_nr' => 93
               }
             }
           ],
@@ -7848,8 +7673,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 92,
-            'macro' => ''
+            'line_nr' => 92
           }
         },
         {
@@ -7881,8 +7705,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 95,
-                        'macro' => ''
+                        'line_nr' => 95
                       }
                     },
                     {
@@ -7909,8 +7732,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 95,
-                        'macro' => ''
+                        'line_nr' => 95
                       }
                     },
                     {
@@ -7937,8 +7759,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 95,
-                        'macro' => ''
+                        'line_nr' => 95
                       }
                     },
                     {
@@ -7965,8 +7786,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 95,
-                        'macro' => ''
+                        'line_nr' => 95
                       }
                     }
                   ],
@@ -7990,8 +7810,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 95,
-                'macro' => ''
+                'line_nr' => 95
               },
               'type' => 'def_line'
             },
@@ -8023,8 +7842,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 96,
-                'macro' => ''
+                'line_nr' => 96
               }
             }
           ],
@@ -8035,8 +7853,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 95,
-            'macro' => ''
+            'line_nr' => 95
           }
         },
         {
@@ -8068,8 +7885,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 98,
-                        'macro' => ''
+                        'line_nr' => 98
                       }
                     },
                     {
@@ -8096,8 +7912,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 98,
-                        'macro' => ''
+                        'line_nr' => 98
                       }
                     },
                     {
@@ -8124,8 +7939,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 98,
-                        'macro' => ''
+                        'line_nr' => 98
                       }
                     },
                     {
@@ -8152,8 +7966,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 98,
-                        'macro' => ''
+                        'line_nr' => 98
                       }
                     }
                   ],
@@ -8177,8 +7990,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 98,
-                'macro' => ''
+                'line_nr' => 98
               },
               'type' => 'def_line'
             },
@@ -8210,8 +8022,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 99,
-                'macro' => ''
+                'line_nr' => 99
               }
             }
           ],
@@ -8222,8 +8033,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 98,
-            'macro' => ''
+            'line_nr' => 98
           }
         },
         {
@@ -8255,8 +8065,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 101,
-                        'macro' => ''
+                        'line_nr' => 101
                       }
                     },
                     {
@@ -8283,8 +8092,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 101,
-                        'macro' => ''
+                        'line_nr' => 101
                       }
                     },
                     {
@@ -8311,8 +8119,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 101,
-                        'macro' => ''
+                        'line_nr' => 101
                       }
                     },
                     {
@@ -8339,8 +8146,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 101,
-                        'macro' => ''
+                        'line_nr' => 101
                       }
                     }
                   ],
@@ -8364,8 +8170,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 101,
-                'macro' => ''
+                'line_nr' => 101
               },
               'type' => 'def_line'
             },
@@ -8397,8 +8202,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 102,
-                'macro' => ''
+                'line_nr' => 102
               }
             }
           ],
@@ -8409,8 +8213,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 101,
-            'macro' => ''
+            'line_nr' => 101
           }
         },
         {
@@ -8442,8 +8245,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 104,
-                        'macro' => ''
+                        'line_nr' => 104
                       }
                     },
                     {
@@ -8470,8 +8272,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 104,
-                        'macro' => ''
+                        'line_nr' => 104
                       }
                     },
                     {
@@ -8498,8 +8299,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 104,
-                        'macro' => ''
+                        'line_nr' => 104
                       }
                     },
                     {
@@ -8526,8 +8326,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 104,
-                        'macro' => ''
+                        'line_nr' => 104
                       }
                     },
                     {
@@ -8554,8 +8353,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 104,
-                        'macro' => ''
+                        'line_nr' => 104
                       }
                     }
                   ],
@@ -8579,8 +8377,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 104,
-                'macro' => ''
+                'line_nr' => 104
               },
               'type' => 'def_line'
             },
@@ -8612,8 +8409,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 105,
-                'macro' => ''
+                'line_nr' => 105
               }
             }
           ],
@@ -8624,8 +8420,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 104,
-            'macro' => ''
+            'line_nr' => 104
           }
         },
         {
@@ -8657,8 +8452,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 107,
-                        'macro' => ''
+                        'line_nr' => 107
                       }
                     },
                     {
@@ -8685,8 +8479,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 107,
-                        'macro' => ''
+                        'line_nr' => 107
                       }
                     },
                     {
@@ -8713,8 +8506,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 107,
-                        'macro' => ''
+                        'line_nr' => 107
                       }
                     },
                     {
@@ -8741,8 +8533,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 107,
-                        'macro' => ''
+                        'line_nr' => 107
                       }
                     },
                     {
@@ -8769,8 +8560,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 107,
-                        'macro' => ''
+                        'line_nr' => 107
                       }
                     }
                   ],
@@ -8794,8 +8584,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 107,
-                'macro' => ''
+                'line_nr' => 107
               },
               'type' => 'def_line'
             },
@@ -8827,8 +8616,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 108,
-                'macro' => ''
+                'line_nr' => 108
               }
             }
           ],
@@ -8839,8 +8627,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 107,
-            'macro' => ''
+            'line_nr' => 107
           }
         },
         {
@@ -8872,8 +8659,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 110,
-                        'macro' => ''
+                        'line_nr' => 110
                       }
                     },
                     {
@@ -8900,8 +8686,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 110,
-                        'macro' => ''
+                        'line_nr' => 110
                       }
                     },
                     {
@@ -8928,8 +8713,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 110,
-                        'macro' => ''
+                        'line_nr' => 110
                       }
                     },
                     {
@@ -8956,8 +8740,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 110,
-                        'macro' => ''
+                        'line_nr' => 110
                       }
                     },
                     {
@@ -8984,8 +8767,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 110,
-                        'macro' => ''
+                        'line_nr' => 110
                       }
                     }
                   ],
@@ -9009,8 +8791,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 110,
-                'macro' => ''
+                'line_nr' => 110
               },
               'type' => 'def_line'
             },
@@ -9042,8 +8823,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 111,
-                'macro' => ''
+                'line_nr' => 111
               }
             }
           ],
@@ -9054,8 +8834,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 110,
-            'macro' => ''
+            'line_nr' => 110
           }
         },
         {
@@ -9087,8 +8866,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 113,
-                        'macro' => ''
+                        'line_nr' => 113
                       }
                     },
                     {
@@ -9115,8 +8893,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 113,
-                        'macro' => ''
+                        'line_nr' => 113
                       }
                     },
                     {
@@ -9143,8 +8920,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 113,
-                        'macro' => ''
+                        'line_nr' => 113
                       }
                     },
                     {
@@ -9171,8 +8947,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 113,
-                        'macro' => ''
+                        'line_nr' => 113
                       }
                     },
                     {
@@ -9199,8 +8974,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 113,
-                        'macro' => ''
+                        'line_nr' => 113
                       }
                     }
                   ],
@@ -9224,8 +8998,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 113,
-                'macro' => ''
+                'line_nr' => 113
               },
               'type' => 'def_line'
             },
@@ -9257,8 +9030,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 114,
-                'macro' => ''
+                'line_nr' => 114
               }
             }
           ],
@@ -9269,8 +9041,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 113,
-            'macro' => ''
+            'line_nr' => 113
           }
         },
         {
@@ -9302,8 +9073,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 116,
-                        'macro' => ''
+                        'line_nr' => 116
                       }
                     },
                     {
@@ -9330,8 +9100,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 116,
-                        'macro' => ''
+                        'line_nr' => 116
                       }
                     },
                     {
@@ -9358,8 +9127,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 116,
-                        'macro' => ''
+                        'line_nr' => 116
                       }
                     },
                     {
@@ -9386,8 +9154,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 116,
-                        'macro' => ''
+                        'line_nr' => 116
                       }
                     }
                   ],
@@ -9411,8 +9178,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 116,
-                'macro' => ''
+                'line_nr' => 116
               },
               'type' => 'def_line'
             },
@@ -9444,8 +9210,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 117,
-                'macro' => ''
+                'line_nr' => 117
               }
             }
           ],
@@ -9456,8 +9221,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 116,
-            'macro' => ''
+            'line_nr' => 116
           }
         },
         {
@@ -9489,8 +9253,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 119,
-                        'macro' => ''
+                        'line_nr' => 119
                       }
                     },
                     {
@@ -9517,8 +9280,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 119,
-                        'macro' => ''
+                        'line_nr' => 119
                       }
                     },
                     {
@@ -9545,8 +9307,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 119,
-                        'macro' => ''
+                        'line_nr' => 119
                       }
                     },
                     {
@@ -9573,8 +9334,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 119,
-                        'macro' => ''
+                        'line_nr' => 119
                       }
                     }
                   ],
@@ -9598,8 +9358,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 119,
-                'macro' => ''
+                'line_nr' => 119
               },
               'type' => 'def_line'
             },
@@ -9631,8 +9390,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 120,
-                'macro' => ''
+                'line_nr' => 120
               }
             }
           ],
@@ -9643,8 +9401,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 119,
-            'macro' => ''
+            'line_nr' => 119
           }
         },
         {
@@ -9676,8 +9433,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 122,
-                        'macro' => ''
+                        'line_nr' => 122
                       }
                     },
                     {
@@ -9704,8 +9460,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 122,
-                        'macro' => ''
+                        'line_nr' => 122
                       }
                     },
                     {
@@ -9732,8 +9487,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 122,
-                        'macro' => ''
+                        'line_nr' => 122
                       }
                     },
                     {
@@ -9760,8 +9514,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 122,
-                        'macro' => ''
+                        'line_nr' => 122
                       }
                     },
                     {
@@ -9788,8 +9541,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 122,
-                        'macro' => ''
+                        'line_nr' => 122
                       }
                     }
                   ],
@@ -9813,8 +9565,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 122,
-                'macro' => ''
+                'line_nr' => 122
               },
               'type' => 'def_line'
             },
@@ -9846,8 +9597,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 123,
-                'macro' => ''
+                'line_nr' => 123
               }
             }
           ],
@@ -9858,8 +9608,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 122,
-            'macro' => ''
+            'line_nr' => 122
           }
         },
         {
@@ -9891,8 +9640,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 125,
-                        'macro' => ''
+                        'line_nr' => 125
                       }
                     },
                     {
@@ -9919,8 +9667,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 125,
-                        'macro' => ''
+                        'line_nr' => 125
                       }
                     },
                     {
@@ -9947,8 +9694,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 125,
-                        'macro' => ''
+                        'line_nr' => 125
                       }
                     },
                     {
@@ -9975,8 +9721,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 125,
-                        'macro' => ''
+                        'line_nr' => 125
                       }
                     },
                     {
@@ -10003,8 +9748,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 125,
-                        'macro' => ''
+                        'line_nr' => 125
                       }
                     }
                   ],
@@ -10028,8 +9772,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 125,
-                'macro' => ''
+                'line_nr' => 125
               },
               'type' => 'def_line'
             },
@@ -10061,8 +9804,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 126,
-                'macro' => ''
+                'line_nr' => 126
               }
             }
           ],
@@ -10073,8 +9815,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 125,
-            'macro' => ''
+            'line_nr' => 125
           }
         },
         {
@@ -10106,8 +9847,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 128,
-                        'macro' => ''
+                        'line_nr' => 128
                       }
                     },
                     {
@@ -10134,8 +9874,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 128,
-                        'macro' => ''
+                        'line_nr' => 128
                       }
                     },
                     {
@@ -10162,8 +9901,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 128,
-                        'macro' => ''
+                        'line_nr' => 128
                       }
                     },
                     {
@@ -10190,8 +9928,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 128,
-                        'macro' => ''
+                        'line_nr' => 128
                       }
                     },
                     {
@@ -10218,8 +9955,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 128,
-                        'macro' => ''
+                        'line_nr' => 128
                       }
                     },
                     {
@@ -10246,8 +9982,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 128,
-                        'macro' => ''
+                        'line_nr' => 128
                       }
                     }
                   ],
@@ -10348,8 +10083,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 128,
-                'macro' => ''
+                'line_nr' => 128
               },
               'type' => 'def_line'
             },
@@ -10381,8 +10115,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 129,
-                'macro' => ''
+                'line_nr' => 129
               }
             }
           ],
@@ -10393,8 +10126,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 128,
-            'macro' => ''
+            'line_nr' => 128
           }
         },
         {
@@ -10426,8 +10158,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 131,
-                        'macro' => ''
+                        'line_nr' => 131
                       }
                     },
                     {
@@ -10454,8 +10185,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 131,
-                        'macro' => ''
+                        'line_nr' => 131
                       }
                     },
                     {
@@ -10482,8 +10212,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 131,
-                        'macro' => ''
+                        'line_nr' => 131
                       }
                     },
                     {
@@ -10510,8 +10239,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 131,
-                        'macro' => ''
+                        'line_nr' => 131
                       }
                     },
                     {
@@ -10538,8 +10266,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 131,
-                        'macro' => ''
+                        'line_nr' => 131
                       }
                     },
                     {
@@ -10566,8 +10293,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 131,
-                        'macro' => ''
+                        'line_nr' => 131
                       }
                     }
                   ],
@@ -10668,8 +10394,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 131,
-                'macro' => ''
+                'line_nr' => 131
               },
               'type' => 'def_line'
             },
@@ -10701,8 +10426,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 132,
-                'macro' => ''
+                'line_nr' => 132
               }
             }
           ],
@@ -10713,8 +10437,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 131,
-            'macro' => ''
+            'line_nr' => 131
           }
         },
         {
@@ -10746,8 +10469,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 134,
-                        'macro' => ''
+                        'line_nr' => 134
                       }
                     },
                     {
@@ -10774,8 +10496,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 134,
-                        'macro' => ''
+                        'line_nr' => 134
                       }
                     },
                     {
@@ -10802,8 +10523,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 134,
-                        'macro' => ''
+                        'line_nr' => 134
                       }
                     },
                     {
@@ -10830,8 +10550,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 134,
-                        'macro' => ''
+                        'line_nr' => 134
                       }
                     },
                     {
@@ -10858,8 +10577,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 134,
-                        'macro' => ''
+                        'line_nr' => 134
                       }
                     }
                   ],
@@ -10960,8 +10678,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 134,
-                'macro' => ''
+                'line_nr' => 134
               },
               'type' => 'def_line'
             },
@@ -10993,8 +10710,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 135,
-                'macro' => ''
+                'line_nr' => 135
               }
             }
           ],
@@ -11005,8 +10721,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 134,
-            'macro' => ''
+            'line_nr' => 134
           }
         },
         {
@@ -11038,8 +10753,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 137,
-                        'macro' => ''
+                        'line_nr' => 137
                       }
                     },
                     {
@@ -11066,8 +10780,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 137,
-                        'macro' => ''
+                        'line_nr' => 137
                       }
                     },
                     {
@@ -11094,8 +10807,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 137,
-                        'macro' => ''
+                        'line_nr' => 137
                       }
                     },
                     {
@@ -11122,8 +10834,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 137,
-                        'macro' => ''
+                        'line_nr' => 137
                       }
                     },
                     {
@@ -11150,8 +10861,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 137,
-                        'macro' => ''
+                        'line_nr' => 137
                       }
                     }
                   ],
@@ -11252,8 +10962,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 137,
-                'macro' => ''
+                'line_nr' => 137
               },
               'type' => 'def_line'
             },
@@ -11285,8 +10994,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 138,
-                'macro' => ''
+                'line_nr' => 138
               }
             }
           ],
@@ -11297,8 +11005,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 137,
-            'macro' => ''
+            'line_nr' => 137
           }
         },
         {
@@ -11330,8 +11037,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     },
                     {
@@ -11358,8 +11064,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     },
                     {
@@ -11386,8 +11091,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     },
                     {
@@ -11414,8 +11118,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     },
                     {
@@ -11442,8 +11145,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     },
                     {
@@ -11470,8 +11172,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     }
                   ],
@@ -11572,8 +11273,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 140,
-                'macro' => ''
+                'line_nr' => 140
               },
               'type' => 'def_line'
             },
@@ -11605,8 +11305,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 141,
-                'macro' => ''
+                'line_nr' => 141
               }
             }
           ],
@@ -11617,8 +11316,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 140,
-            'macro' => ''
+            'line_nr' => 140
           }
         },
         {
@@ -11650,8 +11348,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 143,
-                        'macro' => ''
+                        'line_nr' => 143
                       }
                     },
                     {
@@ -11678,8 +11375,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 143,
-                        'macro' => ''
+                        'line_nr' => 143
                       }
                     },
                     {
@@ -11706,8 +11402,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 143,
-                        'macro' => ''
+                        'line_nr' => 143
                       }
                     },
                     {
@@ -11734,8 +11429,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 143,
-                        'macro' => ''
+                        'line_nr' => 143
                       }
                     },
                     {
@@ -11762,8 +11456,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 143,
-                        'macro' => ''
+                        'line_nr' => 143
                       }
                     },
                     {
@@ -11790,8 +11483,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 143,
-                        'macro' => ''
+                        'line_nr' => 143
                       }
                     }
                   ],
@@ -11892,8 +11584,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 143,
-                'macro' => ''
+                'line_nr' => 143
               },
               'type' => 'def_line'
             },
@@ -11925,8 +11616,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 144,
-                'macro' => ''
+                'line_nr' => 144
               }
             }
           ],
@@ -11937,8 +11627,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 143,
-            'macro' => ''
+            'line_nr' => 143
           }
         },
         {
@@ -11964,8 +11653,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 146,
-                        'macro' => ''
+                        'line_nr' => 146
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -11987,8 +11675,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 146,
-                        'macro' => ''
+                        'line_nr' => 146
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -12010,8 +11697,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 146,
-                        'macro' => ''
+                        'line_nr' => 146
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -12039,8 +11725,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 146,
-                        'macro' => ''
+                        'line_nr' => 146
                       }
                     },
                     {
@@ -12067,8 +11752,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 146,
-                        'macro' => ''
+                        'line_nr' => 146
                       }
                     },
                     {
@@ -12095,8 +11779,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 146,
-                        'macro' => ''
+                        'line_nr' => 146
                       }
                     },
                     {
@@ -12123,8 +11806,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 146,
-                        'macro' => ''
+                        'line_nr' => 146
                       }
                     }
                   ],
@@ -12148,8 +11830,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 146,
-                'macro' => ''
+                'line_nr' => 146
               },
               'type' => 'def_line'
             },
@@ -12181,8 +11862,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 147,
-                'macro' => ''
+                'line_nr' => 147
               }
             }
           ],
@@ -12193,8 +11873,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 146,
-            'macro' => ''
+            'line_nr' => 146
           }
         },
         {
@@ -12220,8 +11899,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 149,
-                        'macro' => ''
+                        'line_nr' => 149
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -12243,8 +11921,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 149,
-                        'macro' => ''
+                        'line_nr' => 149
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -12266,8 +11943,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 149,
-                        'macro' => ''
+                        'line_nr' => 149
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -12295,8 +11971,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 149,
-                        'macro' => ''
+                        'line_nr' => 149
                       }
                     },
                     {
@@ -12323,8 +11998,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 149,
-                        'macro' => ''
+                        'line_nr' => 149
                       }
                     },
                     {
@@ -12351,8 +12025,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 149,
-                        'macro' => ''
+                        'line_nr' => 149
                       }
                     },
                     {
@@ -12379,8 +12052,7 @@ $result_trees{'all_commands_delimiters'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 149,
-                        'macro' => ''
+                        'line_nr' => 149
                       }
                     }
                   ],
@@ -12404,8 +12076,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 149,
-                'macro' => ''
+                'line_nr' => 149
               },
               'type' => 'def_line'
             },
@@ -12437,8 +12108,7 @@ $result_trees{'all_commands_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 150,
-                'macro' => ''
+                'line_nr' => 150
               }
             }
           ],
@@ -12449,8 +12119,7 @@ $result_trees{'all_commands_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 149,
-            'macro' => ''
+            'line_nr' => 149
           }
         }
       ],
@@ -12730,7 +12399,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -12739,7 +12407,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'entry for index `vr\' outside of any node',
     'type' => 'warning'
   },
@@ -12748,7 +12415,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -12757,7 +12423,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -12766,7 +12431,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -12775,7 +12439,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 20,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -12784,7 +12447,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 24,
-    'macro' => '',
     'text' => 'entry for index `vr\' outside of any node',
     'type' => 'warning'
   },
@@ -12793,7 +12455,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 28,
-    'macro' => '',
     'text' => 'entry for index `tp\' outside of any node',
     'type' => 'warning'
   },
@@ -12802,7 +12463,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 32,
-    'macro' => '',
     'text' => 'entry for index `vr\' outside of any node',
     'type' => 'warning'
   },
@@ -12811,7 +12471,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 36,
-    'macro' => '',
     'text' => 'entry for index `vr\' outside of any node',
     'type' => 'warning'
   },
@@ -12820,7 +12479,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 40,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -12829,7 +12487,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 44,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -12838,7 +12495,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 47,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -12847,7 +12503,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 50,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -12856,7 +12511,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 53,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -12865,7 +12519,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 56,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -12874,7 +12527,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 59,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -12883,7 +12535,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 62,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -12892,7 +12543,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 65,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -12901,7 +12551,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 68,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -12910,7 +12559,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 71,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -12919,7 +12567,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 74,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -12928,7 +12575,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 77,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -12937,7 +12583,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 80,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -12946,7 +12591,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 83,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -12955,7 +12599,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 86,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -12964,7 +12607,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 89,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -12973,7 +12615,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 92,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -12982,7 +12623,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 95,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -12991,7 +12631,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 98,
-    'macro' => '',
     'text' => 'entry for index `vr\' outside of any node',
     'type' => 'warning'
   },
@@ -13000,7 +12639,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 101,
-    'macro' => '',
     'text' => 'entry for index `vr\' outside of any node',
     'type' => 'warning'
   },
@@ -13009,7 +12647,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 104,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -13018,7 +12655,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 107,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -13027,7 +12663,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 110,
-    'macro' => '',
     'text' => 'entry for index `vr\' outside of any node',
     'type' => 'warning'
   },
@@ -13036,7 +12671,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 113,
-    'macro' => '',
     'text' => 'entry for index `vr\' outside of any node',
     'type' => 'warning'
   },
@@ -13045,7 +12679,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 116,
-    'macro' => '',
     'text' => 'entry for index `tp\' outside of any node',
     'type' => 'warning'
   },
@@ -13054,7 +12687,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 119,
-    'macro' => '',
     'text' => 'entry for index `tp\' outside of any node',
     'type' => 'warning'
   },
@@ -13063,7 +12695,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 122,
-    'macro' => '',
     'text' => 'entry for index `vr\' outside of any node',
     'type' => 'warning'
   },
@@ -13072,7 +12703,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 125,
-    'macro' => '',
     'text' => 'entry for index `tp\' outside of any node',
     'type' => 'warning'
   },
@@ -13081,7 +12711,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 128,
-    'macro' => '',
     'text' => 'entry for index `vr\' outside of any node',
     'type' => 'warning'
   },
@@ -13090,7 +12719,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 131,
-    'macro' => '',
     'text' => 'entry for index `vr\' outside of any node',
     'type' => 'warning'
   },
@@ -13099,7 +12727,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 134,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -13108,7 +12735,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 137,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -13117,7 +12743,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 140,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -13126,7 +12751,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 143,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -13135,7 +12759,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 146,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -13144,7 +12767,6 @@ $result_errors{'all_commands_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 149,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/def/all_commands_delimiters_printindex.pl 
b/tp/t/results/def/all_commands_delimiters_printindex.pl
index 277cf71052..8858f6ed77 100644
--- a/tp/t/results/def/all_commands_delimiters_printindex.pl
+++ b/tp/t/results/def/all_commands_delimiters_printindex.pl
@@ -39,8 +39,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -104,8 +103,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     },
                     {
@@ -132,8 +130,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     },
                     {
@@ -154,8 +151,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -177,8 +173,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -286,8 +281,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -321,8 +315,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -343,8 +336,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -378,8 +370,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -444,8 +435,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'def_line'
             },
@@ -477,8 +467,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -489,8 +478,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -542,8 +530,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -565,8 +552,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -674,8 +660,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -709,8 +694,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -731,8 +715,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -766,8 +749,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -832,8 +814,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               },
               'type' => 'def_line'
             },
@@ -865,8 +846,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
@@ -877,8 +857,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -904,8 +883,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -979,8 +957,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     },
                     {
@@ -1027,8 +1004,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     },
                     {
@@ -1060,8 +1036,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               },
               'type' => 'def_line'
             },
@@ -1093,8 +1068,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             }
           ],
@@ -1105,8 +1079,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           }
         },
         {
@@ -1132,8 +1105,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -1207,8 +1179,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     },
                     {
@@ -1255,8 +1226,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     },
                     {
@@ -1344,8 +1314,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -1373,8 +1342,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -1408,8 +1376,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -1430,8 +1397,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -1465,8 +1431,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -1556,8 +1521,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               },
               'type' => 'def_line'
             },
@@ -1589,8 +1553,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             }
           ],
@@ -1601,8 +1564,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         },
         {
@@ -1628,8 +1590,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 19,
-                        'macro' => ''
+                        'line_nr' => 19
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -1677,8 +1638,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 19,
-                        'macro' => ''
+                        'line_nr' => 19
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -1704,8 +1664,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               },
               'type' => 'def_line'
             },
@@ -1737,8 +1696,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             }
           ],
@@ -1749,8 +1707,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         },
         {
@@ -1828,8 +1785,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -1895,8 +1851,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 23,
-                        'macro' => ''
+                        'line_nr' => 23
                       }
                     },
                     {
@@ -2012,8 +1967,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               },
               'type' => 'def_line'
             },
@@ -2045,8 +1999,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             }
           ],
@@ -2057,8 +2010,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 22,
-            'macro' => ''
+            'line_nr' => 22
           }
         },
         {
@@ -2084,8 +2036,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 26,
-                        'macro' => ''
+                        'line_nr' => 26
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -2219,8 +2170,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 27,
-                        'macro' => ''
+                        'line_nr' => 27
                       }
                     },
                     {
@@ -2254,8 +2204,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 27,
-                        'macro' => ''
+                        'line_nr' => 27
                       }
                     },
                     {
@@ -2276,8 +2225,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 27,
-                        'macro' => ''
+                        'line_nr' => 27
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -2311,8 +2259,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 27,
-                        'macro' => ''
+                        'line_nr' => 27
                       }
                     },
                     {
@@ -2377,8 +2324,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               },
               'type' => 'def_line'
             },
@@ -2410,8 +2356,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             }
           ],
@@ -2422,8 +2367,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         },
         {
@@ -2449,8 +2393,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 30,
-                        'macro' => ''
+                        'line_nr' => 30
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -2597,8 +2540,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 31,
-                        'macro' => ''
+                        'line_nr' => 31
                       }
                     },
                     {
@@ -2632,8 +2574,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 31,
-                        'macro' => ''
+                        'line_nr' => 31
                       }
                     },
                     {
@@ -2654,8 +2595,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 31,
-                        'macro' => ''
+                        'line_nr' => 31
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -2689,8 +2629,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 31,
-                        'macro' => ''
+                        'line_nr' => 31
                       }
                     },
                     {
@@ -2755,8 +2694,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               },
               'type' => 'def_line'
             },
@@ -2788,8 +2726,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               }
             }
           ],
@@ -2800,8 +2737,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 30,
-            'macro' => ''
+            'line_nr' => 30
           }
         },
         {
@@ -2827,8 +2763,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 34,
-                        'macro' => ''
+                        'line_nr' => 34
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -2962,8 +2897,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 35,
-                        'macro' => ''
+                        'line_nr' => 35
                       }
                     },
                     {
@@ -2997,8 +2931,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 35,
-                        'macro' => ''
+                        'line_nr' => 35
                       }
                     },
                     {
@@ -3019,8 +2952,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 35,
-                        'macro' => ''
+                        'line_nr' => 35
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -3054,8 +2986,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 35,
-                        'macro' => ''
+                        'line_nr' => 35
                       }
                     },
                     {
@@ -3120,8 +3051,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               },
               'type' => 'def_line'
             },
@@ -3153,8 +3083,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               }
             }
           ],
@@ -3165,8 +3094,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 34,
-            'macro' => ''
+            'line_nr' => 34
           }
         },
         {
@@ -3192,8 +3120,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 38,
-                        'macro' => ''
+                        'line_nr' => 38
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -3234,8 +3161,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 38,
-                        'macro' => ''
+                        'line_nr' => 38
                       }
                     },
                     {
@@ -3355,8 +3281,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 39,
-                        'macro' => ''
+                        'line_nr' => 39
                       }
                     },
                     {
@@ -3390,8 +3315,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 39,
-                        'macro' => ''
+                        'line_nr' => 39
                       }
                     },
                     {
@@ -3412,8 +3336,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 39,
-                        'macro' => ''
+                        'line_nr' => 39
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -3447,8 +3370,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 39,
-                        'macro' => ''
+                        'line_nr' => 39
                       }
                     },
                     {
@@ -3550,8 +3472,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               },
               'type' => 'def_line'
             },
@@ -3583,8 +3504,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               }
             }
           ],
@@ -3595,8 +3515,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 38,
-            'macro' => ''
+            'line_nr' => 38
           }
         },
         {
@@ -3747,8 +3666,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 43,
-                        'macro' => ''
+                        'line_nr' => 43
                       }
                     },
                     {
@@ -3782,8 +3700,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 43,
-                        'macro' => ''
+                        'line_nr' => 43
                       }
                     },
                     {
@@ -3804,8 +3721,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 43,
-                        'macro' => ''
+                        'line_nr' => 43
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -3839,8 +3755,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 43,
-                        'macro' => ''
+                        'line_nr' => 43
                       }
                     },
                     {
@@ -3942,8 +3857,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               },
               'type' => 'def_line'
             },
@@ -3975,8 +3889,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             }
           ],
@@ -3987,8 +3900,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 42,
-            'macro' => ''
+            'line_nr' => 42
           }
         },
         {
@@ -4046,8 +3958,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 46,
-                        'macro' => ''
+                        'line_nr' => 46
                       }
                     },
                     {
@@ -4167,8 +4078,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 47,
-                        'macro' => ''
+                        'line_nr' => 47
                       }
                     },
                     {
@@ -4202,8 +4112,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 47,
-                        'macro' => ''
+                        'line_nr' => 47
                       }
                     },
                     {
@@ -4224,8 +4133,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 47,
-                        'macro' => ''
+                        'line_nr' => 47
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -4259,8 +4167,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 47,
-                        'macro' => ''
+                        'line_nr' => 47
                       }
                     },
                     {
@@ -4362,8 +4269,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               },
               'type' => 'def_line'
             },
@@ -4395,8 +4301,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               }
             }
           ],
@@ -4407,8 +4312,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 46,
-            'macro' => ''
+            'line_nr' => 46
           }
         },
         {
@@ -4466,8 +4370,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 50,
-                        'macro' => ''
+                        'line_nr' => 50
                       }
                     },
                     {
@@ -4568,8 +4471,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               },
               'type' => 'def_line'
             },
@@ -4601,8 +4503,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 51,
-                'macro' => ''
+                'line_nr' => 51
               }
             }
           ],
@@ -4613,8 +4514,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 50,
-            'macro' => ''
+            'line_nr' => 50
           }
         },
         {
@@ -4653,8 +4553,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 53,
-                        'macro' => ''
+                        'line_nr' => 53
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -4682,8 +4581,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 53,
-                        'macro' => ''
+                        'line_nr' => 53
                       }
                     },
                     {
@@ -4704,8 +4602,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 53,
-                        'macro' => ''
+                        'line_nr' => 53
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -4814,8 +4711,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               },
               'type' => 'def_line'
             },
@@ -4847,8 +4743,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 54,
-                'macro' => ''
+                'line_nr' => 54
               }
             }
           ],
@@ -4859,8 +4754,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 53,
-            'macro' => ''
+            'line_nr' => 53
           }
         },
         {
@@ -4899,8 +4793,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 56,
-                        'macro' => ''
+                        'line_nr' => 56
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -4928,8 +4821,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 56,
-                        'macro' => ''
+                        'line_nr' => 56
                       }
                     },
                     {
@@ -4950,8 +4842,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 56,
-                        'macro' => ''
+                        'line_nr' => 56
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -5060,8 +4951,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               },
               'type' => 'def_line'
             },
@@ -5093,8 +4983,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 57,
-                'macro' => ''
+                'line_nr' => 57
               }
             }
           ],
@@ -5105,8 +4994,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 56,
-            'macro' => ''
+            'line_nr' => 56
           }
         },
         {
@@ -5164,8 +5052,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 59,
-                        'macro' => ''
+                        'line_nr' => 59
                       }
                     },
                     {
@@ -5266,8 +5153,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               },
               'type' => 'def_line'
             },
@@ -5299,8 +5185,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 60,
-                'macro' => ''
+                'line_nr' => 60
               }
             }
           ],
@@ -5311,8 +5196,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 59,
-            'macro' => ''
+            'line_nr' => 59
           }
         },
         {
@@ -5370,8 +5254,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 62,
-                        'macro' => ''
+                        'line_nr' => 62
                       }
                     },
                     {
@@ -5472,8 +5355,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               },
               'type' => 'def_line'
             },
@@ -5505,8 +5387,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 63,
-                'macro' => ''
+                'line_nr' => 63
               }
             }
           ],
@@ -5517,8 +5398,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 62,
-            'macro' => ''
+            'line_nr' => 62
           }
         },
         {
@@ -5557,8 +5437,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
-                        'macro' => ''
+                        'line_nr' => 65
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -5586,8 +5465,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
-                        'macro' => ''
+                        'line_nr' => 65
                       }
                     },
                     {
@@ -5608,8 +5486,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
-                        'macro' => ''
+                        'line_nr' => 65
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -5718,8 +5595,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               },
               'type' => 'def_line'
             },
@@ -5751,8 +5627,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 66,
-                'macro' => ''
+                'line_nr' => 66
               }
             }
           ],
@@ -5763,8 +5638,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 65,
-            'macro' => ''
+            'line_nr' => 65
           }
         },
         {
@@ -5803,8 +5677,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 68,
-                        'macro' => ''
+                        'line_nr' => 68
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -5832,8 +5705,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 68,
-                        'macro' => ''
+                        'line_nr' => 68
                       }
                     },
                     {
@@ -5854,8 +5726,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 68,
-                        'macro' => ''
+                        'line_nr' => 68
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -5964,8 +5835,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 68,
-                'macro' => ''
+                'line_nr' => 68
               },
               'type' => 'def_line'
             },
@@ -5997,8 +5867,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 69,
-                'macro' => ''
+                'line_nr' => 69
               }
             }
           ],
@@ -6009,8 +5878,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 68,
-            'macro' => ''
+            'line_nr' => 68
           }
         },
         {
@@ -6068,8 +5936,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 71,
-                        'macro' => ''
+                        'line_nr' => 71
                       }
                     },
                     {
@@ -6170,8 +6037,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               },
               'type' => 'def_line'
             },
@@ -6203,8 +6069,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 72,
-                'macro' => ''
+                'line_nr' => 72
               }
             }
           ],
@@ -6215,8 +6080,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 71,
-            'macro' => ''
+            'line_nr' => 71
           }
         },
         {
@@ -6274,8 +6138,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 74,
-                        'macro' => ''
+                        'line_nr' => 74
                       }
                     },
                     {
@@ -6376,8 +6239,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 74,
-                'macro' => ''
+                'line_nr' => 74
               },
               'type' => 'def_line'
             },
@@ -6409,8 +6271,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 75,
-                'macro' => ''
+                'line_nr' => 75
               }
             }
           ],
@@ -6421,8 +6282,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 74,
-            'macro' => ''
+            'line_nr' => 74
           }
         },
         {
@@ -6461,8 +6321,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 77,
-                        'macro' => ''
+                        'line_nr' => 77
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -6490,8 +6349,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 77,
-                        'macro' => ''
+                        'line_nr' => 77
                       }
                     },
                     {
@@ -6512,8 +6370,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 77,
-                        'macro' => ''
+                        'line_nr' => 77
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -6622,8 +6479,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 77,
-                'macro' => ''
+                'line_nr' => 77
               },
               'type' => 'def_line'
             },
@@ -6655,8 +6511,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 78,
-                'macro' => ''
+                'line_nr' => 78
               }
             }
           ],
@@ -6667,8 +6522,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 77,
-            'macro' => ''
+            'line_nr' => 77
           }
         },
         {
@@ -6707,8 +6561,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 80,
-                        'macro' => ''
+                        'line_nr' => 80
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -6736,8 +6589,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 80,
-                        'macro' => ''
+                        'line_nr' => 80
                       }
                     },
                     {
@@ -6758,8 +6610,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 80,
-                        'macro' => ''
+                        'line_nr' => 80
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -6868,8 +6719,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 80,
-                'macro' => ''
+                'line_nr' => 80
               },
               'type' => 'def_line'
             },
@@ -6901,8 +6751,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 81,
-                'macro' => ''
+                'line_nr' => 81
               }
             }
           ],
@@ -6913,8 +6762,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 80,
-            'macro' => ''
+            'line_nr' => 80
           }
         },
         {
@@ -6972,8 +6820,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 83,
-                        'macro' => ''
+                        'line_nr' => 83
                       }
                     },
                     {
@@ -7074,8 +6921,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 83,
-                'macro' => ''
+                'line_nr' => 83
               },
               'type' => 'def_line'
             },
@@ -7107,8 +6953,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 84,
-                'macro' => ''
+                'line_nr' => 84
               }
             }
           ],
@@ -7119,8 +6964,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 83,
-            'macro' => ''
+            'line_nr' => 83
           }
         },
         {
@@ -7178,8 +7022,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 86,
-                        'macro' => ''
+                        'line_nr' => 86
                       }
                     },
                     {
@@ -7280,8 +7123,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 86,
-                'macro' => ''
+                'line_nr' => 86
               },
               'type' => 'def_line'
             },
@@ -7313,8 +7155,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 87,
-                'macro' => ''
+                'line_nr' => 87
               }
             }
           ],
@@ -7325,8 +7166,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 86,
-            'macro' => ''
+            'line_nr' => 86
           }
         },
         {
@@ -7360,8 +7200,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                           'cmdname' => 'code',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 89,
-                            'macro' => ''
+                            'line_nr' => 89
                           }
                         }
                       ],
@@ -7396,8 +7235,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                           'cmdname' => 'code',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 89,
-                            'macro' => ''
+                            'line_nr' => 89
                           }
                         }
                       ],
@@ -7406,8 +7244,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 89,
-                        'macro' => ''
+                        'line_nr' => 89
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -7437,8 +7274,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                           'cmdname' => 'var',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 89,
-                            'macro' => ''
+                            'line_nr' => 89
                           }
                         }
                       ],
@@ -7555,8 +7391,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 89,
-                'macro' => ''
+                'line_nr' => 89
               },
               'type' => 'def_line'
             },
@@ -7588,8 +7423,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 90,
-                'macro' => ''
+                'line_nr' => 90
               }
             }
           ],
@@ -7600,8 +7434,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 89,
-            'macro' => ''
+            'line_nr' => 89
           }
         },
         {
@@ -7701,8 +7534,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 92,
-                'macro' => ''
+                'line_nr' => 92
               },
               'type' => 'def_line'
             },
@@ -7734,8 +7566,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 93,
-                'macro' => ''
+                'line_nr' => 93
               }
             }
           ],
@@ -7746,8 +7577,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 92,
-            'macro' => ''
+            'line_nr' => 92
           }
         },
         {
@@ -7779,8 +7609,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 95,
-                        'macro' => ''
+                        'line_nr' => 95
                       }
                     },
                     {
@@ -7807,8 +7636,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 95,
-                        'macro' => ''
+                        'line_nr' => 95
                       }
                     },
                     {
@@ -7835,8 +7663,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 95,
-                        'macro' => ''
+                        'line_nr' => 95
                       }
                     },
                     {
@@ -7863,8 +7690,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 95,
-                        'macro' => ''
+                        'line_nr' => 95
                       }
                     }
                   ],
@@ -7889,8 +7715,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 95,
-                'macro' => ''
+                'line_nr' => 95
               },
               'type' => 'def_line'
             },
@@ -7922,8 +7747,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 96,
-                'macro' => ''
+                'line_nr' => 96
               }
             }
           ],
@@ -7934,8 +7758,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 95,
-            'macro' => ''
+            'line_nr' => 95
           }
         },
         {
@@ -7967,8 +7790,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 98,
-                        'macro' => ''
+                        'line_nr' => 98
                       }
                     },
                     {
@@ -7995,8 +7817,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 98,
-                        'macro' => ''
+                        'line_nr' => 98
                       }
                     },
                     {
@@ -8023,8 +7844,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 98,
-                        'macro' => ''
+                        'line_nr' => 98
                       }
                     },
                     {
@@ -8051,8 +7871,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 98,
-                        'macro' => ''
+                        'line_nr' => 98
                       }
                     }
                   ],
@@ -8077,8 +7896,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 98,
-                'macro' => ''
+                'line_nr' => 98
               },
               'type' => 'def_line'
             },
@@ -8110,8 +7928,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 99,
-                'macro' => ''
+                'line_nr' => 99
               }
             }
           ],
@@ -8122,8 +7939,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 98,
-            'macro' => ''
+            'line_nr' => 98
           }
         },
         {
@@ -8155,8 +7971,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 101,
-                        'macro' => ''
+                        'line_nr' => 101
                       }
                     },
                     {
@@ -8183,8 +7998,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 101,
-                        'macro' => ''
+                        'line_nr' => 101
                       }
                     },
                     {
@@ -8211,8 +8025,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 101,
-                        'macro' => ''
+                        'line_nr' => 101
                       }
                     },
                     {
@@ -8239,8 +8052,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 101,
-                        'macro' => ''
+                        'line_nr' => 101
                       }
                     }
                   ],
@@ -8265,8 +8077,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 101,
-                'macro' => ''
+                'line_nr' => 101
               },
               'type' => 'def_line'
             },
@@ -8298,8 +8109,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 102,
-                'macro' => ''
+                'line_nr' => 102
               }
             }
           ],
@@ -8310,8 +8120,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 101,
-            'macro' => ''
+            'line_nr' => 101
           }
         },
         {
@@ -8343,8 +8152,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 104,
-                        'macro' => ''
+                        'line_nr' => 104
                       }
                     },
                     {
@@ -8371,8 +8179,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 104,
-                        'macro' => ''
+                        'line_nr' => 104
                       }
                     },
                     {
@@ -8399,8 +8206,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 104,
-                        'macro' => ''
+                        'line_nr' => 104
                       }
                     },
                     {
@@ -8427,8 +8233,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 104,
-                        'macro' => ''
+                        'line_nr' => 104
                       }
                     }
                   ],
@@ -8453,8 +8258,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 104,
-                'macro' => ''
+                'line_nr' => 104
               },
               'type' => 'def_line'
             },
@@ -8486,8 +8290,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 105,
-                'macro' => ''
+                'line_nr' => 105
               }
             }
           ],
@@ -8498,8 +8301,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 104,
-            'macro' => ''
+            'line_nr' => 104
           }
         },
         {
@@ -8531,8 +8333,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 107,
-                        'macro' => ''
+                        'line_nr' => 107
                       }
                     },
                     {
@@ -8559,8 +8360,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 107,
-                        'macro' => ''
+                        'line_nr' => 107
                       }
                     },
                     {
@@ -8587,8 +8387,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 107,
-                        'macro' => ''
+                        'line_nr' => 107
                       }
                     },
                     {
@@ -8615,8 +8414,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 107,
-                        'macro' => ''
+                        'line_nr' => 107
                       }
                     },
                     {
@@ -8643,8 +8441,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 107,
-                        'macro' => ''
+                        'line_nr' => 107
                       }
                     }
                   ],
@@ -8669,8 +8466,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 107,
-                'macro' => ''
+                'line_nr' => 107
               },
               'type' => 'def_line'
             },
@@ -8702,8 +8498,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 108,
-                'macro' => ''
+                'line_nr' => 108
               }
             }
           ],
@@ -8714,8 +8509,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 107,
-            'macro' => ''
+            'line_nr' => 107
           }
         },
         {
@@ -8747,8 +8541,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 110,
-                        'macro' => ''
+                        'line_nr' => 110
                       }
                     },
                     {
@@ -8775,8 +8568,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 110,
-                        'macro' => ''
+                        'line_nr' => 110
                       }
                     },
                     {
@@ -8803,8 +8595,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 110,
-                        'macro' => ''
+                        'line_nr' => 110
                       }
                     },
                     {
@@ -8831,8 +8622,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 110,
-                        'macro' => ''
+                        'line_nr' => 110
                       }
                     },
                     {
@@ -8859,8 +8649,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 110,
-                        'macro' => ''
+                        'line_nr' => 110
                       }
                     }
                   ],
@@ -8885,8 +8674,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 110,
-                'macro' => ''
+                'line_nr' => 110
               },
               'type' => 'def_line'
             },
@@ -8918,8 +8706,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 111,
-                'macro' => ''
+                'line_nr' => 111
               }
             }
           ],
@@ -8930,8 +8717,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 110,
-            'macro' => ''
+            'line_nr' => 110
           }
         },
         {
@@ -8963,8 +8749,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 113,
-                        'macro' => ''
+                        'line_nr' => 113
                       }
                     },
                     {
@@ -8991,8 +8776,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 113,
-                        'macro' => ''
+                        'line_nr' => 113
                       }
                     },
                     {
@@ -9019,8 +8803,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 113,
-                        'macro' => ''
+                        'line_nr' => 113
                       }
                     },
                     {
@@ -9047,8 +8830,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 113,
-                        'macro' => ''
+                        'line_nr' => 113
                       }
                     },
                     {
@@ -9075,8 +8857,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 113,
-                        'macro' => ''
+                        'line_nr' => 113
                       }
                     }
                   ],
@@ -9101,8 +8882,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 113,
-                'macro' => ''
+                'line_nr' => 113
               },
               'type' => 'def_line'
             },
@@ -9134,8 +8914,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 114,
-                'macro' => ''
+                'line_nr' => 114
               }
             }
           ],
@@ -9146,8 +8925,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 113,
-            'macro' => ''
+            'line_nr' => 113
           }
         },
         {
@@ -9179,8 +8957,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 116,
-                        'macro' => ''
+                        'line_nr' => 116
                       }
                     },
                     {
@@ -9207,8 +8984,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 116,
-                        'macro' => ''
+                        'line_nr' => 116
                       }
                     },
                     {
@@ -9235,8 +9011,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 116,
-                        'macro' => ''
+                        'line_nr' => 116
                       }
                     },
                     {
@@ -9263,8 +9038,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 116,
-                        'macro' => ''
+                        'line_nr' => 116
                       }
                     },
                     {
@@ -9291,8 +9065,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 116,
-                        'macro' => ''
+                        'line_nr' => 116
                       }
                     }
                   ],
@@ -9317,8 +9090,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 116,
-                'macro' => ''
+                'line_nr' => 116
               },
               'type' => 'def_line'
             },
@@ -9350,8 +9122,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 117,
-                'macro' => ''
+                'line_nr' => 117
               }
             }
           ],
@@ -9362,8 +9133,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 116,
-            'macro' => ''
+            'line_nr' => 116
           }
         },
         {
@@ -9395,8 +9165,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 119,
-                        'macro' => ''
+                        'line_nr' => 119
                       }
                     },
                     {
@@ -9423,8 +9192,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 119,
-                        'macro' => ''
+                        'line_nr' => 119
                       }
                     },
                     {
@@ -9451,8 +9219,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 119,
-                        'macro' => ''
+                        'line_nr' => 119
                       }
                     },
                     {
@@ -9479,8 +9246,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 119,
-                        'macro' => ''
+                        'line_nr' => 119
                       }
                     }
                   ],
@@ -9505,8 +9271,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 119,
-                'macro' => ''
+                'line_nr' => 119
               },
               'type' => 'def_line'
             },
@@ -9538,8 +9303,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 120,
-                'macro' => ''
+                'line_nr' => 120
               }
             }
           ],
@@ -9550,8 +9314,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 119,
-            'macro' => ''
+            'line_nr' => 119
           }
         },
         {
@@ -9583,8 +9346,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 122,
-                        'macro' => ''
+                        'line_nr' => 122
                       }
                     },
                     {
@@ -9611,8 +9373,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 122,
-                        'macro' => ''
+                        'line_nr' => 122
                       }
                     },
                     {
@@ -9639,8 +9400,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 122,
-                        'macro' => ''
+                        'line_nr' => 122
                       }
                     },
                     {
@@ -9667,8 +9427,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 122,
-                        'macro' => ''
+                        'line_nr' => 122
                       }
                     }
                   ],
@@ -9693,8 +9452,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 122,
-                'macro' => ''
+                'line_nr' => 122
               },
               'type' => 'def_line'
             },
@@ -9726,8 +9484,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 123,
-                'macro' => ''
+                'line_nr' => 123
               }
             }
           ],
@@ -9738,8 +9495,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 122,
-            'macro' => ''
+            'line_nr' => 122
           }
         },
         {
@@ -9771,8 +9527,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 125,
-                        'macro' => ''
+                        'line_nr' => 125
                       }
                     },
                     {
@@ -9799,8 +9554,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 125,
-                        'macro' => ''
+                        'line_nr' => 125
                       }
                     },
                     {
@@ -9827,8 +9581,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 125,
-                        'macro' => ''
+                        'line_nr' => 125
                       }
                     },
                     {
@@ -9855,8 +9608,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 125,
-                        'macro' => ''
+                        'line_nr' => 125
                       }
                     },
                     {
@@ -9883,8 +9635,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 125,
-                        'macro' => ''
+                        'line_nr' => 125
                       }
                     }
                   ],
@@ -9909,8 +9660,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 125,
-                'macro' => ''
+                'line_nr' => 125
               },
               'type' => 'def_line'
             },
@@ -9942,8 +9692,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 126,
-                'macro' => ''
+                'line_nr' => 126
               }
             }
           ],
@@ -9954,8 +9703,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 125,
-            'macro' => ''
+            'line_nr' => 125
           }
         },
         {
@@ -9987,8 +9735,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 128,
-                        'macro' => ''
+                        'line_nr' => 128
                       }
                     },
                     {
@@ -10015,8 +9762,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 128,
-                        'macro' => ''
+                        'line_nr' => 128
                       }
                     },
                     {
@@ -10043,8 +9789,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 128,
-                        'macro' => ''
+                        'line_nr' => 128
                       }
                     },
                     {
@@ -10071,8 +9816,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 128,
-                        'macro' => ''
+                        'line_nr' => 128
                       }
                     },
                     {
@@ -10099,8 +9843,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 128,
-                        'macro' => ''
+                        'line_nr' => 128
                       }
                     }
                   ],
@@ -10125,8 +9868,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 128,
-                'macro' => ''
+                'line_nr' => 128
               },
               'type' => 'def_line'
             },
@@ -10158,8 +9900,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 129,
-                'macro' => ''
+                'line_nr' => 129
               }
             }
           ],
@@ -10170,8 +9911,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 128,
-            'macro' => ''
+            'line_nr' => 128
           }
         },
         {
@@ -10203,8 +9943,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 131,
-                        'macro' => ''
+                        'line_nr' => 131
                       }
                     },
                     {
@@ -10231,8 +9970,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 131,
-                        'macro' => ''
+                        'line_nr' => 131
                       }
                     },
                     {
@@ -10259,8 +9997,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 131,
-                        'macro' => ''
+                        'line_nr' => 131
                       }
                     },
                     {
@@ -10287,8 +10024,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 131,
-                        'macro' => ''
+                        'line_nr' => 131
                       }
                     },
                     {
@@ -10315,8 +10051,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 131,
-                        'macro' => ''
+                        'line_nr' => 131
                       }
                     },
                     {
@@ -10343,8 +10078,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 131,
-                        'macro' => ''
+                        'line_nr' => 131
                       }
                     }
                   ],
@@ -10446,8 +10180,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 131,
-                'macro' => ''
+                'line_nr' => 131
               },
               'type' => 'def_line'
             },
@@ -10479,8 +10212,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 132,
-                'macro' => ''
+                'line_nr' => 132
               }
             }
           ],
@@ -10491,8 +10223,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 131,
-            'macro' => ''
+            'line_nr' => 131
           }
         },
         {
@@ -10524,8 +10255,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 134,
-                        'macro' => ''
+                        'line_nr' => 134
                       }
                     },
                     {
@@ -10552,8 +10282,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 134,
-                        'macro' => ''
+                        'line_nr' => 134
                       }
                     },
                     {
@@ -10580,8 +10309,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 134,
-                        'macro' => ''
+                        'line_nr' => 134
                       }
                     },
                     {
@@ -10608,8 +10336,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 134,
-                        'macro' => ''
+                        'line_nr' => 134
                       }
                     },
                     {
@@ -10636,8 +10363,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 134,
-                        'macro' => ''
+                        'line_nr' => 134
                       }
                     },
                     {
@@ -10664,8 +10390,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 134,
-                        'macro' => ''
+                        'line_nr' => 134
                       }
                     }
                   ],
@@ -10767,8 +10492,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 134,
-                'macro' => ''
+                'line_nr' => 134
               },
               'type' => 'def_line'
             },
@@ -10800,8 +10524,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 135,
-                'macro' => ''
+                'line_nr' => 135
               }
             }
           ],
@@ -10812,8 +10535,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 134,
-            'macro' => ''
+            'line_nr' => 134
           }
         },
         {
@@ -10845,8 +10567,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 137,
-                        'macro' => ''
+                        'line_nr' => 137
                       }
                     },
                     {
@@ -10873,8 +10594,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 137,
-                        'macro' => ''
+                        'line_nr' => 137
                       }
                     },
                     {
@@ -10901,8 +10621,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 137,
-                        'macro' => ''
+                        'line_nr' => 137
                       }
                     },
                     {
@@ -10929,8 +10648,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 137,
-                        'macro' => ''
+                        'line_nr' => 137
                       }
                     },
                     {
@@ -10957,8 +10675,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 137,
-                        'macro' => ''
+                        'line_nr' => 137
                       }
                     }
                   ],
@@ -11060,8 +10777,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 137,
-                'macro' => ''
+                'line_nr' => 137
               },
               'type' => 'def_line'
             },
@@ -11093,8 +10809,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 138,
-                'macro' => ''
+                'line_nr' => 138
               }
             }
           ],
@@ -11105,8 +10820,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 137,
-            'macro' => ''
+            'line_nr' => 137
           }
         },
         {
@@ -11138,8 +10852,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     },
                     {
@@ -11166,8 +10879,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     },
                     {
@@ -11194,8 +10906,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     },
                     {
@@ -11222,8 +10933,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     },
                     {
@@ -11250,8 +10960,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     }
                   ],
@@ -11353,8 +11062,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 140,
-                'macro' => ''
+                'line_nr' => 140
               },
               'type' => 'def_line'
             },
@@ -11386,8 +11094,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 141,
-                'macro' => ''
+                'line_nr' => 141
               }
             }
           ],
@@ -11398,8 +11105,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 140,
-            'macro' => ''
+            'line_nr' => 140
           }
         },
         {
@@ -11431,8 +11137,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 143,
-                        'macro' => ''
+                        'line_nr' => 143
                       }
                     },
                     {
@@ -11459,8 +11164,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 143,
-                        'macro' => ''
+                        'line_nr' => 143
                       }
                     },
                     {
@@ -11487,8 +11191,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 143,
-                        'macro' => ''
+                        'line_nr' => 143
                       }
                     },
                     {
@@ -11515,8 +11218,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 143,
-                        'macro' => ''
+                        'line_nr' => 143
                       }
                     },
                     {
@@ -11543,8 +11245,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 143,
-                        'macro' => ''
+                        'line_nr' => 143
                       }
                     },
                     {
@@ -11571,8 +11272,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 143,
-                        'macro' => ''
+                        'line_nr' => 143
                       }
                     }
                   ],
@@ -11674,8 +11374,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 143,
-                'macro' => ''
+                'line_nr' => 143
               },
               'type' => 'def_line'
             },
@@ -11707,8 +11406,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 144,
-                'macro' => ''
+                'line_nr' => 144
               }
             }
           ],
@@ -11719,8 +11417,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 143,
-            'macro' => ''
+            'line_nr' => 143
           }
         },
         {
@@ -11752,8 +11449,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 146,
-                        'macro' => ''
+                        'line_nr' => 146
                       }
                     },
                     {
@@ -11780,8 +11476,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 146,
-                        'macro' => ''
+                        'line_nr' => 146
                       }
                     },
                     {
@@ -11808,8 +11503,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 146,
-                        'macro' => ''
+                        'line_nr' => 146
                       }
                     },
                     {
@@ -11836,8 +11530,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 146,
-                        'macro' => ''
+                        'line_nr' => 146
                       }
                     },
                     {
@@ -11864,8 +11557,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 146,
-                        'macro' => ''
+                        'line_nr' => 146
                       }
                     },
                     {
@@ -11892,8 +11584,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 146,
-                        'macro' => ''
+                        'line_nr' => 146
                       }
                     }
                   ],
@@ -11995,8 +11686,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 146,
-                'macro' => ''
+                'line_nr' => 146
               },
               'type' => 'def_line'
             },
@@ -12028,8 +11718,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 147,
-                'macro' => ''
+                'line_nr' => 147
               }
             }
           ],
@@ -12040,8 +11729,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 146,
-            'macro' => ''
+            'line_nr' => 146
           }
         },
         {
@@ -12067,8 +11755,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 149,
-                        'macro' => ''
+                        'line_nr' => 149
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -12090,8 +11777,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 149,
-                        'macro' => ''
+                        'line_nr' => 149
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -12113,8 +11799,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 149,
-                        'macro' => ''
+                        'line_nr' => 149
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -12142,8 +11827,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 149,
-                        'macro' => ''
+                        'line_nr' => 149
                       }
                     },
                     {
@@ -12170,8 +11854,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 149,
-                        'macro' => ''
+                        'line_nr' => 149
                       }
                     },
                     {
@@ -12198,8 +11881,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 149,
-                        'macro' => ''
+                        'line_nr' => 149
                       }
                     },
                     {
@@ -12226,8 +11908,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 149,
-                        'macro' => ''
+                        'line_nr' => 149
                       }
                     }
                   ],
@@ -12252,8 +11933,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 149,
-                'macro' => ''
+                'line_nr' => 149
               },
               'type' => 'def_line'
             },
@@ -12285,8 +11965,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 150,
-                'macro' => ''
+                'line_nr' => 150
               }
             }
           ],
@@ -12297,8 +11976,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 149,
-            'macro' => ''
+            'line_nr' => 149
           }
         },
         {
@@ -12324,8 +12002,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 152,
-                        'macro' => ''
+                        'line_nr' => 152
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -12347,8 +12024,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 152,
-                        'macro' => ''
+                        'line_nr' => 152
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -12370,8 +12046,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 152,
-                        'macro' => ''
+                        'line_nr' => 152
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -12399,8 +12074,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 152,
-                        'macro' => ''
+                        'line_nr' => 152
                       }
                     },
                     {
@@ -12427,8 +12101,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 152,
-                        'macro' => ''
+                        'line_nr' => 152
                       }
                     },
                     {
@@ -12455,8 +12128,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 152,
-                        'macro' => ''
+                        'line_nr' => 152
                       }
                     },
                     {
@@ -12483,8 +12155,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 152,
-                        'macro' => ''
+                        'line_nr' => 152
                       }
                     }
                   ],
@@ -12509,8 +12180,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 152,
-                'macro' => ''
+                'line_nr' => 152
               },
               'type' => 'def_line'
             },
@@ -12542,8 +12212,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 153,
-                'macro' => ''
+                'line_nr' => 153
               }
             }
           ],
@@ -12554,8 +12223,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 152,
-            'macro' => ''
+            'line_nr' => 152
           }
         },
         {
@@ -12588,8 +12256,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 155,
-            'macro' => ''
+            'line_nr' => 155
           }
         },
         {
@@ -12622,8 +12289,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 156,
-            'macro' => ''
+            'line_nr' => 156
           }
         },
         {
@@ -12656,8 +12322,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 158,
-            'macro' => ''
+            'line_nr' => 158
           }
         },
         {
@@ -12690,8 +12355,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 159,
-            'macro' => ''
+            'line_nr' => 159
           }
         },
         {
@@ -12724,8 +12388,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 161,
-            'macro' => ''
+            'line_nr' => 161
           }
         },
         {
@@ -12758,8 +12421,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 162,
-            'macro' => ''
+            'line_nr' => 162
           }
         }
       ],
@@ -12775,8 +12437,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
diff --git a/tp/t/results/def/all_commands_printindex.pl 
b/tp/t/results/def/all_commands_printindex.pl
index 392c0babe7..86c4eff347 100644
--- a/tp/t/results/def/all_commands_printindex.pl
+++ b/tp/t/results/def/all_commands_printindex.pl
@@ -39,8 +39,7 @@ $result_trees{'all_commands_printindex'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -115,8 +114,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'def_line'
             },
@@ -162,8 +160,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -174,8 +171,7 @@ $result_trees{'all_commands_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -244,8 +240,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               },
               'type' => 'def_line'
             },
@@ -291,8 +286,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
@@ -303,8 +297,7 @@ $result_trees{'all_commands_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -360,8 +353,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               },
               'type' => 'def_line'
             },
@@ -407,8 +399,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
@@ -419,8 +410,7 @@ $result_trees{'all_commands_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           }
         },
         {
@@ -502,8 +492,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               },
               'type' => 'def_line'
             },
@@ -549,8 +538,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             }
           ],
@@ -561,8 +549,7 @@ $result_trees{'all_commands_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           }
         },
         {
@@ -631,8 +618,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               },
               'type' => 'def_line'
             },
@@ -678,8 +664,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           ],
@@ -690,8 +675,7 @@ $result_trees{'all_commands_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
@@ -823,8 +807,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               },
               'type' => 'def_line'
             },
@@ -870,8 +853,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             }
           ],
@@ -882,8 +864,7 @@ $result_trees{'all_commands_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 24,
-            'macro' => ''
+            'line_nr' => 24
           }
         },
         {
@@ -1002,8 +983,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               },
               'type' => 'def_line'
             },
@@ -1049,8 +1029,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             }
           ],
@@ -1061,8 +1040,7 @@ $result_trees{'all_commands_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 28,
-            'macro' => ''
+            'line_nr' => 28
           }
         },
         {
@@ -1131,8 +1109,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               },
               'type' => 'def_line'
             },
@@ -1178,8 +1155,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             }
           ],
@@ -1190,8 +1166,7 @@ $result_trees{'all_commands_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 32,
-            'macro' => ''
+            'line_nr' => 32
           }
         },
         {
@@ -1260,8 +1235,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               },
               'type' => 'def_line'
             },
@@ -1307,8 +1281,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               }
             }
           ],
@@ -1319,8 +1292,7 @@ $result_trees{'all_commands_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 36,
-            'macro' => ''
+            'line_nr' => 36
           }
         },
         {
@@ -1402,8 +1374,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               },
               'type' => 'def_line'
             },
@@ -1449,8 +1420,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               }
             }
           ],
@@ -1461,8 +1431,7 @@ $result_trees{'all_commands_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 40,
-            'macro' => ''
+            'line_nr' => 40
           }
         },
         {
@@ -1581,8 +1550,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               },
               'type' => 'def_line'
             },
@@ -1628,8 +1596,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             }
           ],
@@ -1640,8 +1607,7 @@ $result_trees{'all_commands_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 44,
-            'macro' => ''
+            'line_nr' => 44
           }
         },
         {
@@ -1773,8 +1739,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               },
               'type' => 'def_line'
             },
@@ -1820,8 +1785,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             }
           ],
@@ -1832,8 +1796,7 @@ $result_trees{'all_commands_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 48,
-            'macro' => ''
+            'line_nr' => 48
           }
         },
         {
@@ -1952,8 +1915,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               },
               'type' => 'def_line'
             },
@@ -1999,8 +1961,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 54,
-                'macro' => ''
+                'line_nr' => 54
               }
             }
           ],
@@ -2011,8 +1972,7 @@ $result_trees{'all_commands_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 52,
-            'macro' => ''
+            'line_nr' => 52
           }
         },
         {
@@ -2118,8 +2078,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               },
               'type' => 'def_line'
             },
@@ -2165,8 +2124,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             }
           ],
@@ -2177,8 +2135,7 @@ $result_trees{'all_commands_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 56,
-            'macro' => ''
+            'line_nr' => 56
           }
         },
         {
@@ -2247,8 +2204,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 60,
-                'macro' => ''
+                'line_nr' => 60
               },
               'type' => 'def_line'
             },
@@ -2294,8 +2250,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             }
           ],
@@ -2306,8 +2261,7 @@ $result_trees{'all_commands_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 60,
-            'macro' => ''
+            'line_nr' => 60
           }
         },
         {
@@ -2381,8 +2335,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               },
               'type' => 'def_line'
             },
@@ -2428,8 +2381,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 66,
-                'macro' => ''
+                'line_nr' => 66
               }
             }
           ],
@@ -2440,8 +2392,7 @@ $result_trees{'all_commands_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 64,
-            'macro' => ''
+            'line_nr' => 64
           }
         },
         {
@@ -2515,8 +2466,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 68,
-                'macro' => ''
+                'line_nr' => 68
               },
               'type' => 'def_line'
             },
@@ -2562,8 +2512,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 70,
-                'macro' => ''
+                'line_nr' => 70
               }
             }
           ],
@@ -2574,8 +2523,7 @@ $result_trees{'all_commands_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 68,
-            'macro' => ''
+            'line_nr' => 68
           }
         },
         {
@@ -2649,8 +2597,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 72,
-                'macro' => ''
+                'line_nr' => 72
               },
               'type' => 'def_line'
             },
@@ -2696,8 +2643,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 74,
-                'macro' => ''
+                'line_nr' => 74
               }
             }
           ],
@@ -2708,8 +2654,7 @@ $result_trees{'all_commands_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 72,
-            'macro' => ''
+            'line_nr' => 72
           }
         },
         {
@@ -2770,8 +2715,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 76,
-                'macro' => ''
+                'line_nr' => 76
               },
               'type' => 'def_line'
             },
@@ -2817,8 +2761,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 78,
-                'macro' => ''
+                'line_nr' => 78
               }
             }
           ],
@@ -2829,8 +2772,7 @@ $result_trees{'all_commands_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 76,
-            'macro' => ''
+            'line_nr' => 76
           }
         },
         {
@@ -2917,8 +2859,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 80,
-                'macro' => ''
+                'line_nr' => 80
               },
               'type' => 'def_line'
             },
@@ -2964,8 +2905,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 82,
-                'macro' => ''
+                'line_nr' => 82
               }
             }
           ],
@@ -2976,8 +2916,7 @@ $result_trees{'all_commands_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 80,
-            'macro' => ''
+            'line_nr' => 80
           }
         },
         {
@@ -3038,8 +2977,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 84,
-                'macro' => ''
+                'line_nr' => 84
               },
               'type' => 'def_line'
             },
@@ -3085,8 +3023,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 86,
-                'macro' => ''
+                'line_nr' => 86
               }
             }
           ],
@@ -3097,8 +3034,7 @@ $result_trees{'all_commands_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 84,
-            'macro' => ''
+            'line_nr' => 84
           }
         },
         {
@@ -3185,8 +3121,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 88,
-                'macro' => ''
+                'line_nr' => 88
               },
               'type' => 'def_line'
             },
@@ -3232,8 +3167,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 90,
-                'macro' => ''
+                'line_nr' => 90
               }
             }
           ],
@@ -3244,8 +3178,7 @@ $result_trees{'all_commands_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 88,
-            'macro' => ''
+            'line_nr' => 88
           }
         },
         {
@@ -3319,8 +3252,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 92,
-                'macro' => ''
+                'line_nr' => 92
               },
               'type' => 'def_line'
             },
@@ -3366,8 +3298,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 94,
-                'macro' => ''
+                'line_nr' => 94
               }
             }
           ],
@@ -3378,8 +3309,7 @@ $result_trees{'all_commands_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 92,
-            'macro' => ''
+            'line_nr' => 92
           }
         },
         {
@@ -3490,8 +3420,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 96,
-                'macro' => ''
+                'line_nr' => 96
               },
               'type' => 'def_line'
             },
@@ -3537,8 +3466,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 98,
-                'macro' => ''
+                'line_nr' => 98
               }
             }
           ],
@@ -3549,8 +3477,7 @@ $result_trees{'all_commands_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 96,
-            'macro' => ''
+            'line_nr' => 96
           }
         },
         {
@@ -3674,8 +3601,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 100,
-                'macro' => ''
+                'line_nr' => 100
               },
               'type' => 'def_line'
             },
@@ -3721,8 +3647,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 102,
-                'macro' => ''
+                'line_nr' => 102
               }
             }
           ],
@@ -3733,8 +3658,7 @@ $result_trees{'all_commands_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 100,
-            'macro' => ''
+            'line_nr' => 100
           }
         },
         {
@@ -3858,8 +3782,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 104,
-                'macro' => ''
+                'line_nr' => 104
               },
               'type' => 'def_line'
             },
@@ -3905,8 +3828,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 106,
-                'macro' => ''
+                'line_nr' => 106
               }
             }
           ],
@@ -3917,8 +3839,7 @@ $result_trees{'all_commands_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 104,
-            'macro' => ''
+            'line_nr' => 104
           }
         },
         {
@@ -4055,8 +3976,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 108,
-                'macro' => ''
+                'line_nr' => 108
               },
               'type' => 'def_line'
             },
@@ -4102,8 +4022,7 @@ $result_trees{'all_commands_printindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 110,
-                'macro' => ''
+                'line_nr' => 110
               }
             }
           ],
@@ -4114,8 +4033,7 @@ $result_trees{'all_commands_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 108,
-            'macro' => ''
+            'line_nr' => 108
           }
         },
         {
@@ -4148,8 +4066,7 @@ $result_trees{'all_commands_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 112,
-            'macro' => ''
+            'line_nr' => 112
           }
         },
         {
@@ -4182,8 +4099,7 @@ $result_trees{'all_commands_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 113,
-            'macro' => ''
+            'line_nr' => 113
           }
         },
         {
@@ -4216,8 +4132,7 @@ $result_trees{'all_commands_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 115,
-            'macro' => ''
+            'line_nr' => 115
           }
         },
         {
@@ -4250,8 +4165,7 @@ $result_trees{'all_commands_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 116,
-            'macro' => ''
+            'line_nr' => 116
           }
         },
         {
@@ -4284,8 +4198,7 @@ $result_trees{'all_commands_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 118,
-            'macro' => ''
+            'line_nr' => 118
           }
         },
         {
@@ -4318,8 +4231,7 @@ $result_trees{'all_commands_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 119,
-            'macro' => ''
+            'line_nr' => 119
           }
         }
       ],
@@ -4335,8 +4247,7 @@ $result_trees{'all_commands_printindex'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
diff --git a/tp/t/results/def/all_empty_def.pl 
b/tp/t/results/def/all_empty_def.pl
index 41b639463d..1155f5b4ae 100644
--- a/tp/t/results/def/all_empty_def.pl
+++ b/tp/t/results/def/all_empty_def.pl
@@ -30,8 +30,7 @@ $result_trees{'all_empty_def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               },
               'type' => 'def_line'
             },
@@ -63,15 +62,13 @@ $result_trees{'all_empty_def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -100,8 +97,7 @@ $result_trees{'all_empty_def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'def_line'
             },
@@ -133,15 +129,13 @@ $result_trees{'all_empty_def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -170,8 +164,7 @@ $result_trees{'all_empty_def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'def_line'
             },
@@ -203,15 +196,13 @@ $result_trees{'all_empty_def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -240,8 +231,7 @@ $result_trees{'all_empty_def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'def_line'
             },
@@ -273,15 +263,13 @@ $result_trees{'all_empty_def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -310,8 +298,7 @@ $result_trees{'all_empty_def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               },
               'type' => 'def_line'
             },
@@ -343,15 +330,13 @@ $result_trees{'all_empty_def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -380,8 +365,7 @@ $result_trees{'all_empty_def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               },
               'type' => 'def_line'
             },
@@ -413,15 +397,13 @@ $result_trees{'all_empty_def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           }
         },
         {
@@ -450,8 +432,7 @@ $result_trees{'all_empty_def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               },
               'type' => 'def_line'
             },
@@ -483,15 +464,13 @@ $result_trees{'all_empty_def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         },
         {
@@ -520,8 +499,7 @@ $result_trees{'all_empty_def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               },
               'type' => 'def_line'
             },
@@ -553,15 +531,13 @@ $result_trees{'all_empty_def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 22,
-            'macro' => ''
+            'line_nr' => 22
           }
         },
         {
@@ -590,8 +566,7 @@ $result_trees{'all_empty_def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               },
               'type' => 'def_line'
             },
@@ -623,15 +598,13 @@ $result_trees{'all_empty_def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           }
         }
       ],
@@ -686,7 +659,6 @@ $result_errors{'all_empty_def'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'missing category for @deffn',
     'type' => 'warning'
   },
@@ -695,7 +667,6 @@ $result_errors{'all_empty_def'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'missing category for @defvr',
     'type' => 'warning'
   },
@@ -704,7 +675,6 @@ $result_errors{'all_empty_def'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'missing category for @deftypefn',
     'type' => 'warning'
   },
@@ -713,7 +683,6 @@ $result_errors{'all_empty_def'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => 'missing category for @deftypeop',
     'type' => 'warning'
   },
@@ -722,7 +691,6 @@ $result_errors{'all_empty_def'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => 'missing category for @deftypevr',
     'type' => 'warning'
   },
@@ -731,7 +699,6 @@ $result_errors{'all_empty_def'} = [
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => 'missing category for @defcv',
     'type' => 'warning'
   },
@@ -740,7 +707,6 @@ $result_errors{'all_empty_def'} = [
 ',
     'file_name' => '',
     'line_nr' => 19,
-    'macro' => '',
     'text' => 'missing category for @deftypecv',
     'type' => 'warning'
   },
@@ -749,7 +715,6 @@ $result_errors{'all_empty_def'} = [
 ',
     'file_name' => '',
     'line_nr' => 22,
-    'macro' => '',
     'text' => 'missing category for @defop',
     'type' => 'warning'
   },
@@ -758,7 +723,6 @@ $result_errors{'all_empty_def'} = [
 ',
     'file_name' => '',
     'line_nr' => 25,
-    'macro' => '',
     'text' => 'missing category for @deftp',
     'type' => 'warning'
   }
diff --git a/tp/t/results/def/ampchar.pl b/tp/t/results/def/ampchar.pl
index aaef3f78df..c2084406c7 100644
--- a/tp/t/results/def/ampchar.pl
+++ b/tp/t/results/def/ampchar.pl
@@ -27,8 +27,7 @@ $result_trees{'ampchar'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -92,8 +91,7 @@ $result_trees{'ampchar'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     },
                     {
@@ -161,8 +159,7 @@ $result_trees{'ampchar'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               },
               'type' => 'def_line'
             },
@@ -194,8 +191,7 @@ $result_trees{'ampchar'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -206,8 +202,7 @@ $result_trees{'ampchar'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -230,8 +225,7 @@ $result_trees{'ampchar'} = {
               'cmdname' => 'ampchar',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -282,7 +276,6 @@ $result_errors{'ampchar'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/def/code_in_def.pl b/tp/t/results/def/code_in_def.pl
index ec4cd91ce7..a5dd8c0a40 100644
--- a/tp/t/results/def/code_in_def.pl
+++ b/tp/t/results/def/code_in_def.pl
@@ -82,8 +82,7 @@ $result_trees{'code_in_def'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     },
                     {
@@ -127,8 +126,7 @@ $result_trees{'code_in_def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               },
               'type' => 'def_line'
             },
@@ -153,8 +151,7 @@ $result_trees{'code_in_def'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -195,8 +192,7 @@ $result_trees{'code_in_def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -207,8 +203,7 @@ $result_trees{'code_in_def'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -235,7 +230,6 @@ $result_errors{'code_in_def'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/def/def_defx_mismatch.pl 
b/tp/t/results/def/def_defx_mismatch.pl
index 90f3f7f090..c86355840f 100644
--- a/tp/t/results/def/def_defx_mismatch.pl
+++ b/tp/t/results/def/def_defx_mismatch.pl
@@ -45,8 +45,7 @@ $result_trees{'def_defx_mismatch'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -87,8 +86,7 @@ $result_trees{'def_defx_mismatch'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     },
                     {
@@ -110,8 +108,7 @@ $result_trees{'def_defx_mismatch'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     }
                   ],
@@ -135,8 +132,7 @@ $result_trees{'def_defx_mismatch'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               },
               'type' => 'def_line'
             },
@@ -155,8 +151,7 @@ $result_trees{'def_defx_mismatch'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -178,8 +173,7 @@ $result_trees{'def_defx_mismatch'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -263,8 +257,7 @@ $result_trees{'def_defx_mismatch'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               },
               'type' => 'def_line'
             },
@@ -320,8 +313,7 @@ $result_trees{'def_defx_mismatch'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -332,8 +324,7 @@ $result_trees{'def_defx_mismatch'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -367,7 +358,6 @@ $result_errors{'def_defx_mismatch'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -376,7 +366,6 @@ $result_errors{'def_defx_mismatch'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'must be after `@deffn\' to use `@deffnx\'',
     'type' => 'error'
   },
@@ -385,7 +374,6 @@ $result_errors{'def_defx_mismatch'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/def/def_groupings_args.pl 
b/tp/t/results/def/def_groupings_args.pl
index d77d4d1584..3024d0289f 100644
--- a/tp/t/results/def/def_groupings_args.pl
+++ b/tp/t/results/def/def_groupings_args.pl
@@ -48,8 +48,7 @@ $result_trees{'def_groupings_args'} = {
                           'cmdname' => 'code',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 1,
-                            'macro' => ''
+                            'line_nr' => 1
                           }
                         },
                         {
@@ -82,8 +81,7 @@ $result_trees{'def_groupings_args'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               },
               'type' => 'def_line'
             },
@@ -115,8 +113,7 @@ $result_trees{'def_groupings_args'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -127,8 +124,7 @@ $result_trees{'def_groupings_args'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -162,8 +158,7 @@ $result_trees{'def_groupings_args'} = {
                           'cmdname' => 'samp',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 4,
-                            'macro' => ''
+                            'line_nr' => 4
                           }
                         }
                       ],
@@ -188,8 +183,7 @@ $result_trees{'def_groupings_args'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'def_line'
             },
@@ -221,8 +215,7 @@ $result_trees{'def_groupings_args'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -233,8 +226,7 @@ $result_trees{'def_groupings_args'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -265,8 +257,7 @@ $result_trees{'def_groupings_args'} = {
                           'cmdname' => 'var',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 7,
-                            'macro' => ''
+                            'line_nr' => 7
                           }
                         },
                         {
@@ -304,8 +295,7 @@ $result_trees{'def_groupings_args'} = {
                           'cmdname' => 'samp',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 7,
-                            'macro' => ''
+                            'line_nr' => 7
                           }
                         }
                       ],
@@ -314,8 +304,7 @@ $result_trees{'def_groupings_args'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -349,8 +338,7 @@ $result_trees{'def_groupings_args'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     },
                     {
@@ -381,8 +369,7 @@ $result_trees{'def_groupings_args'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'def_line'
             },
@@ -414,8 +401,7 @@ $result_trees{'def_groupings_args'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
@@ -426,8 +412,7 @@ $result_trees{'def_groupings_args'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         }
       ],
@@ -463,7 +448,6 @@ $result_errors{'def_groupings_args'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -472,7 +456,6 @@ $result_errors{'def_groupings_args'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'missing name for @deffn',
     'type' => 'warning'
   },
@@ -481,7 +464,6 @@ $result_errors{'def_groupings_args'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/def/defblock_no_defline.pl 
b/tp/t/results/def/defblock_no_defline.pl
index babe61e54f..9ee9858d10 100644
--- a/tp/t/results/def/defblock_no_defline.pl
+++ b/tp/t/results/def/defblock_no_defline.pl
@@ -65,15 +65,13 @@ $result_trees{'defblock_no_defline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/def/defline_no_params.pl 
b/tp/t/results/def/defline_no_params.pl
index 34fa9d3961..0f060ca589 100644
--- a/tp/t/results/def/defline_no_params.pl
+++ b/tp/t/results/def/defline_no_params.pl
@@ -69,8 +69,7 @@ $result_trees{'defline_no_params'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               },
               'type' => 'def_line'
             },
@@ -116,15 +115,13 @@ $result_trees{'defline_no_params'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/def/deftypeline.pl b/tp/t/results/def/deftypeline.pl
index 1cef975212..b64cab4e08 100644
--- a/tp/t/results/def/deftypeline.pl
+++ b/tp/t/results/def/deftypeline.pl
@@ -51,8 +51,7 @@ $result_trees{'deftypeline'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -113,8 +112,7 @@ $result_trees{'deftypeline'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -161,8 +159,7 @@ $result_trees{'deftypeline'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -195,8 +192,7 @@ $result_trees{'deftypeline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               },
               'type' => 'def_line'
             },
@@ -213,8 +209,7 @@ $result_trees{'deftypeline'} = {
                       'cmdname' => 'dots',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     },
                     {
@@ -255,15 +250,13 @@ $result_trees{'deftypeline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/def/defx_after_comment.pl 
b/tp/t/results/def/defx_after_comment.pl
index 05fc977d16..a3b280c892 100644
--- a/tp/t/results/def/defx_after_comment.pl
+++ b/tp/t/results/def/defx_after_comment.pl
@@ -46,8 +46,7 @@ $result_trees{'defx_after_comment'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     },
                     {
@@ -97,8 +96,7 @@ $result_trees{'defx_after_comment'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               },
               'type' => 'def_line'
             },
@@ -132,8 +130,7 @@ $result_trees{'defx_after_comment'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -190,8 +187,7 @@ $result_trees{'defx_after_comment'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               },
               'type' => 'def_line'
             },
@@ -217,8 +213,7 @@ $result_trees{'defx_after_comment'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -229,8 +224,7 @@ $result_trees{'defx_after_comment'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -258,7 +252,6 @@ $result_errors{'defx_after_comment'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -267,7 +260,6 @@ $result_errors{'defx_after_comment'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/def/defx_after_comment_in_example.pl 
b/tp/t/results/def/defx_after_comment_in_example.pl
index 61958bf4da..7be704cd88 100644
--- a/tp/t/results/def/defx_after_comment_in_example.pl
+++ b/tp/t/results/def/defx_after_comment_in_example.pl
@@ -60,8 +60,7 @@ $result_trees{'defx_after_comment_in_example'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 2,
-                            'macro' => ''
+                            'line_nr' => 2
                           }
                         },
                         {
@@ -111,8 +110,7 @@ $result_trees{'defx_after_comment_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   },
                   'type' => 'def_line'
                 },
@@ -151,8 +149,7 @@ $result_trees{'defx_after_comment_in_example'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 4,
-                            'macro' => ''
+                            'line_nr' => 4
                           },
                           'type' => 'bracketed_arg'
                         },
@@ -209,8 +206,7 @@ $result_trees{'defx_after_comment_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   },
                   'type' => 'def_line'
                 },
@@ -242,8 +238,7 @@ $result_trees{'defx_after_comment_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 }
               ],
@@ -254,8 +249,7 @@ $result_trees{'defx_after_comment_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -286,15 +280,13 @@ $result_trees{'defx_after_comment_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -325,7 +317,6 @@ $result_errors{'defx_after_comment_in_example'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -334,7 +325,6 @@ $result_errors{'defx_after_comment_in_example'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/def/defx_after_empty_line.pl 
b/tp/t/results/def/defx_after_empty_line.pl
index 343e31b456..a76d307a1d 100644
--- a/tp/t/results/def/defx_after_empty_line.pl
+++ b/tp/t/results/def/defx_after_empty_line.pl
@@ -46,8 +46,7 @@ $result_trees{'defx_after_empty_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     },
                     {
@@ -97,8 +96,7 @@ $result_trees{'defx_after_empty_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               },
               'type' => 'def_line'
             },
@@ -127,8 +125,7 @@ $result_trees{'defx_after_empty_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -185,8 +182,7 @@ $result_trees{'defx_after_empty_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               },
               'type' => 'def_line'
             },
@@ -212,8 +208,7 @@ $result_trees{'defx_after_empty_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -224,8 +219,7 @@ $result_trees{'defx_after_empty_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -254,7 +248,6 @@ $result_errors{'defx_after_empty_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -263,7 +256,6 @@ $result_errors{'defx_after_empty_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/def/defx_after_empty_line_in_example.pl 
b/tp/t/results/def/defx_after_empty_line_in_example.pl
index 78bad06c5f..def1dc1365 100644
--- a/tp/t/results/def/defx_after_empty_line_in_example.pl
+++ b/tp/t/results/def/defx_after_empty_line_in_example.pl
@@ -60,8 +60,7 @@ $result_trees{'defx_after_empty_line_in_example'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 2,
-                            'macro' => ''
+                            'line_nr' => 2
                           }
                         },
                         {
@@ -111,8 +110,7 @@ $result_trees{'defx_after_empty_line_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   },
                   'type' => 'def_line'
                 },
@@ -171,8 +169,7 @@ $result_trees{'defx_after_empty_line_in_example'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 7,
-                            'macro' => ''
+                            'line_nr' => 7
                           },
                           'type' => 'bracketed_arg'
                         },
@@ -229,8 +226,7 @@ $result_trees{'defx_after_empty_line_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   },
                   'type' => 'def_line'
                 },
@@ -262,8 +258,7 @@ $result_trees{'defx_after_empty_line_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 8,
-                    'macro' => ''
+                    'line_nr' => 8
                   }
                 }
               ],
@@ -274,8 +269,7 @@ $result_trees{'defx_after_empty_line_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -306,15 +300,13 @@ $result_trees{'defx_after_empty_line_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -350,7 +342,6 @@ $result_errors{'defx_after_empty_line_in_example'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -359,7 +350,6 @@ $result_errors{'defx_after_empty_line_in_example'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/def/defx_after_paragraph_end.pl 
b/tp/t/results/def/defx_after_paragraph_end.pl
index 116ca6fe4e..598055a2cf 100644
--- a/tp/t/results/def/defx_after_paragraph_end.pl
+++ b/tp/t/results/def/defx_after_paragraph_end.pl
@@ -46,8 +46,7 @@ $result_trees{'defx_after_paragraph_end'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     },
                     {
@@ -97,8 +96,7 @@ $result_trees{'defx_after_paragraph_end'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               },
               'type' => 'def_line'
             },
@@ -136,8 +134,7 @@ $result_trees{'defx_after_paragraph_end'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -195,8 +192,7 @@ $result_trees{'defx_after_paragraph_end'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'def_line'
             },
@@ -222,8 +218,7 @@ $result_trees{'defx_after_paragraph_end'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -234,8 +229,7 @@ $result_trees{'defx_after_paragraph_end'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -266,7 +260,6 @@ $result_errors{'defx_after_paragraph_end'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -275,7 +268,6 @@ $result_errors{'defx_after_paragraph_end'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'must be after `@deffn\' to use `@deffnx\'',
     'type' => 'error'
   },
@@ -284,7 +276,6 @@ $result_errors{'defx_after_paragraph_end'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/def/defx_after_preformatted_with_text.pl 
b/tp/t/results/def/defx_after_preformatted_with_text.pl
index aefb32fc07..d759e6480e 100644
--- a/tp/t/results/def/defx_after_preformatted_with_text.pl
+++ b/tp/t/results/def/defx_after_preformatted_with_text.pl
@@ -60,8 +60,7 @@ $result_trees{'defx_after_preformatted_with_text'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 2,
-                            'macro' => ''
+                            'line_nr' => 2
                           }
                         },
                         {
@@ -111,8 +110,7 @@ $result_trees{'defx_after_preformatted_with_text'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   },
                   'type' => 'def_line'
                 },
@@ -150,8 +148,7 @@ $result_trees{'defx_after_preformatted_with_text'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 5,
-                            'macro' => ''
+                            'line_nr' => 5
                           },
                           'type' => 'bracketed_arg'
                         },
@@ -209,8 +206,7 @@ $result_trees{'defx_after_preformatted_with_text'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   },
                   'type' => 'def_line'
                 },
@@ -242,8 +238,7 @@ $result_trees{'defx_after_preformatted_with_text'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   }
                 }
               ],
@@ -254,8 +249,7 @@ $result_trees{'defx_after_preformatted_with_text'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -286,15 +280,13 @@ $result_trees{'defx_after_preformatted_with_text'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -328,7 +320,6 @@ $result_errors{'defx_after_preformatted_with_text'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -337,7 +328,6 @@ $result_errors{'defx_after_preformatted_with_text'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'must be after `@deffn\' to use `@deffnx\'',
     'type' => 'error'
   },
@@ -346,7 +336,6 @@ $result_errors{'defx_after_preformatted_with_text'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/def/defx_after_text.pl 
b/tp/t/results/def/defx_after_text.pl
index e6596e7baf..8e1d9377e5 100644
--- a/tp/t/results/def/defx_after_text.pl
+++ b/tp/t/results/def/defx_after_text.pl
@@ -46,8 +46,7 @@ $result_trees{'defx_after_text'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     },
                     {
@@ -97,8 +96,7 @@ $result_trees{'defx_after_text'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               },
               'type' => 'def_line'
             },
@@ -131,8 +129,7 @@ $result_trees{'defx_after_text'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -190,8 +187,7 @@ $result_trees{'defx_after_text'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               },
               'type' => 'def_line'
             },
@@ -217,8 +213,7 @@ $result_trees{'defx_after_text'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -229,8 +224,7 @@ $result_trees{'defx_after_text'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -259,7 +253,6 @@ $result_errors{'defx_after_text'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -268,7 +261,6 @@ $result_errors{'defx_after_text'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'must be after `@deffn\' to use `@deffnx\'',
     'type' => 'error'
   },
@@ -277,7 +269,6 @@ $result_errors{'defx_after_text'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/def/defx_in_example.pl 
b/tp/t/results/def/defx_in_example.pl
index 15d90fe96c..c88095d151 100644
--- a/tp/t/results/def/defx_in_example.pl
+++ b/tp/t/results/def/defx_in_example.pl
@@ -60,8 +60,7 @@ $result_trees{'defx_in_example'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 2,
-                            'macro' => ''
+                            'line_nr' => 2
                           }
                         },
                         {
@@ -111,8 +110,7 @@ $result_trees{'defx_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   },
                   'type' => 'def_line'
                 },
@@ -131,8 +129,7 @@ $result_trees{'defx_in_example'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 3,
-                            'macro' => ''
+                            'line_nr' => 3
                           },
                           'type' => 'bracketed_arg'
                         },
@@ -189,8 +186,7 @@ $result_trees{'defx_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   },
                   'type' => 'def_line'
                 },
@@ -222,8 +218,7 @@ $result_trees{'defx_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 }
               ],
@@ -234,8 +229,7 @@ $result_trees{'defx_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -266,15 +260,13 @@ $result_trees{'defx_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -304,7 +296,6 @@ $result_errors{'defx_in_example'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -313,7 +304,6 @@ $result_errors{'defx_in_example'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/def/double_command.pl 
b/tp/t/results/def/double_command.pl
index 83c7b9b6b7..d49590ea1a 100644
--- a/tp/t/results/def/double_command.pl
+++ b/tp/t/results/def/double_command.pl
@@ -288,8 +288,7 @@ $result_trees{'double_command'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       },
                       'type' => 'def_line'
                     }
@@ -308,8 +307,7 @@ $result_trees{'double_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               },
               'type' => 'def_line'
             },
@@ -355,8 +353,7 @@ $result_trees{'double_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -367,8 +364,7 @@ $result_trees{'double_command'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -469,8 +465,7 @@ $result_trees{'double_command'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 5,
-                            'macro' => ''
+                            'line_nr' => 5
                           },
                           'type' => 'def_line'
                         }
@@ -485,8 +480,7 @@ $result_trees{'double_command'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
@@ -504,8 +498,7 @@ $result_trees{'double_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'def_line'
             },
@@ -551,8 +544,7 @@ $result_trees{'double_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -563,8 +555,7 @@ $result_trees{'double_command'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
@@ -603,7 +594,6 @@ $result_errors{'double_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@deffnx should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -612,7 +602,6 @@ $result_errors{'double_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@deffnx should not appear on @deffn line',
     'type' => 'warning'
   },
@@ -621,7 +610,6 @@ $result_errors{'double_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'must be after `@deffn\' to use `@deffnx\'',
     'type' => 'error'
   },
@@ -630,7 +618,6 @@ $result_errors{'double_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -639,7 +626,6 @@ $result_errors{'double_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -648,7 +634,6 @@ $result_errors{'double_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@defvr should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -657,7 +642,6 @@ $result_errors{'double_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@defvr should not appear on @deffn line',
     'type' => 'warning'
   },
@@ -666,7 +650,6 @@ $result_errors{'double_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'entry for index `vr\' outside of any node',
     'type' => 'warning'
   },
@@ -675,7 +658,6 @@ $result_errors{'double_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'no matching `@end defvr\'',
     'type' => 'error'
   },
@@ -684,7 +666,6 @@ $result_errors{'double_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/def/empty_def_arguments.pl 
b/tp/t/results/def/empty_def_arguments.pl
index 4a01d5bef8..beb1bc2644 100644
--- a/tp/t/results/def/empty_def_arguments.pl
+++ b/tp/t/results/def/empty_def_arguments.pl
@@ -46,8 +46,7 @@ $result_trees{'empty_def_arguments'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     },
                     {
@@ -97,8 +96,7 @@ $result_trees{'empty_def_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               },
               'type' => 'def_line'
             },
@@ -127,8 +125,7 @@ $result_trees{'empty_def_arguments'} = {
                               'cmdname' => 'samp',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 2,
-                                'macro' => ''
+                                'line_nr' => 2
                               }
                             },
                             {
@@ -144,8 +141,7 @@ $result_trees{'empty_def_arguments'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -170,8 +166,7 @@ $result_trees{'empty_def_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               },
               'type' => 'def_line'
             },
@@ -194,8 +189,7 @@ $result_trees{'empty_def_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               },
               'type' => 'def_line'
             },
@@ -231,8 +225,7 @@ $result_trees{'empty_def_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'def_line'
             },
@@ -246,8 +239,7 @@ $result_trees{'empty_def_arguments'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -264,8 +256,7 @@ $result_trees{'empty_def_arguments'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -291,8 +282,7 @@ $result_trees{'empty_def_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'def_line'
             },
@@ -306,8 +296,7 @@ $result_trees{'empty_def_arguments'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -328,8 +317,7 @@ $result_trees{'empty_def_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'def_line'
             },
@@ -348,8 +336,7 @@ $result_trees{'empty_def_arguments'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -371,8 +358,7 @@ $result_trees{'empty_def_arguments'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -393,8 +379,7 @@ $result_trees{'empty_def_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'def_line'
             },
@@ -413,8 +398,7 @@ $result_trees{'empty_def_arguments'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -435,8 +419,7 @@ $result_trees{'empty_def_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               },
               'type' => 'def_line'
             },
@@ -450,8 +433,7 @@ $result_trees{'empty_def_arguments'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -468,8 +450,7 @@ $result_trees{'empty_def_arguments'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -490,8 +471,7 @@ $result_trees{'empty_def_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'def_line'
             },
@@ -523,8 +503,7 @@ $result_trees{'empty_def_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
@@ -535,8 +514,7 @@ $result_trees{'empty_def_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -576,7 +554,6 @@ $result_errors{'empty_def_arguments'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -585,7 +562,6 @@ $result_errors{'empty_def_arguments'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'missing name for @deffnx',
     'type' => 'warning'
   },
@@ -594,7 +570,6 @@ $result_errors{'empty_def_arguments'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'missing category for @deffnx',
     'type' => 'warning'
   },
@@ -603,7 +578,6 @@ $result_errors{'empty_def_arguments'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'missing name for @deffnx',
     'type' => 'warning'
   },
@@ -612,7 +586,6 @@ $result_errors{'empty_def_arguments'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'missing name for @deffnx',
     'type' => 'warning'
   },
@@ -621,7 +594,6 @@ $result_errors{'empty_def_arguments'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'missing name for @deffnx',
     'type' => 'warning'
   },
@@ -630,7 +602,6 @@ $result_errors{'empty_def_arguments'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'missing name for @deffnx',
     'type' => 'warning'
   },
@@ -639,7 +610,6 @@ $result_errors{'empty_def_arguments'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => 'missing name for @deffnx',
     'type' => 'warning'
   },
@@ -648,7 +618,6 @@ $result_errors{'empty_def_arguments'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'missing name for @deffnx',
     'type' => 'warning'
   }
diff --git a/tp/t/results/def/empty_def_command.pl 
b/tp/t/results/def/empty_def_command.pl
index 35bbf45c4e..b4cbdd78ae 100644
--- a/tp/t/results/def/empty_def_command.pl
+++ b/tp/t/results/def/empty_def_command.pl
@@ -56,8 +56,7 @@ $result_trees{'empty_def_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               },
               'type' => 'def_line'
             },
@@ -89,8 +88,7 @@ $result_trees{'empty_def_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -101,8 +99,7 @@ $result_trees{'empty_def_command'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -183,8 +180,7 @@ $result_trees{'empty_def_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'def_line'
             },
@@ -238,8 +234,7 @@ $result_trees{'empty_def_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'def_line'
             },
@@ -271,8 +266,7 @@ $result_trees{'empty_def_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -283,8 +277,7 @@ $result_trees{'empty_def_command'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         }
       ],
@@ -318,7 +311,6 @@ $result_errors{'empty_def_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -327,7 +319,6 @@ $result_errors{'empty_def_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -336,7 +327,6 @@ $result_errors{'empty_def_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/def/empty_deftype.pl 
b/tp/t/results/def/empty_deftype.pl
index 3442c8635c..d49e669eef 100644
--- a/tp/t/results/def/empty_deftype.pl
+++ b/tp/t/results/def/empty_deftype.pl
@@ -40,8 +40,7 @@ $result_trees{'empty_deftype'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -132,8 +131,7 @@ $result_trees{'empty_deftype'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               },
               'type' => 'def_line'
             },
@@ -179,8 +177,7 @@ $result_trees{'empty_deftype'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -191,8 +188,7 @@ $result_trees{'empty_deftype'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -305,8 +301,7 @@ $result_trees{'empty_deftype'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'def_line'
             },
@@ -352,8 +347,7 @@ $result_trees{'empty_deftype'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -364,8 +358,7 @@ $result_trees{'empty_deftype'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -417,8 +410,7 @@ $result_trees{'empty_deftype'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -546,8 +538,7 @@ $result_trees{'empty_deftype'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'def_line'
             },
@@ -593,8 +584,7 @@ $result_trees{'empty_deftype'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
@@ -605,8 +595,7 @@ $result_trees{'empty_deftype'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -769,8 +758,7 @@ $result_trees{'empty_deftype'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               },
               'type' => 'def_line'
             },
@@ -816,8 +804,7 @@ $result_trees{'empty_deftype'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
@@ -828,8 +815,7 @@ $result_trees{'empty_deftype'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         }
       ],
@@ -878,7 +864,6 @@ $result_errors{'empty_deftype'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -887,7 +872,6 @@ $result_errors{'empty_deftype'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -896,7 +880,6 @@ $result_errors{'empty_deftype'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -905,7 +888,6 @@ $result_errors{'empty_deftype'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/def/empty_deftypeop_name.pl 
b/tp/t/results/def/empty_deftypeop_name.pl
index 0e96af4e32..928a6266e1 100644
--- a/tp/t/results/def/empty_deftypeop_name.pl
+++ b/tp/t/results/def/empty_deftypeop_name.pl
@@ -35,8 +35,7 @@ $result_trees{'empty_deftypeop_name'} = {
                           'cmdname' => 'code',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 1,
-                            'macro' => ''
+                            'line_nr' => 1
                           }
                         }
                       ],
@@ -71,8 +70,7 @@ $result_trees{'empty_deftypeop_name'} = {
                           'cmdname' => 'code',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 1,
-                            'macro' => ''
+                            'line_nr' => 1
                           }
                         }
                       ],
@@ -81,8 +79,7 @@ $result_trees{'empty_deftypeop_name'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -112,8 +109,7 @@ $result_trees{'empty_deftypeop_name'} = {
                           'cmdname' => 'var',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 1,
-                            'macro' => ''
+                            'line_nr' => 1
                           }
                         }
                       ],
@@ -138,8 +134,7 @@ $result_trees{'empty_deftypeop_name'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               },
               'type' => 'def_line'
             },
@@ -171,8 +166,7 @@ $result_trees{'empty_deftypeop_name'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -183,8 +177,7 @@ $result_trees{'empty_deftypeop_name'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -208,7 +201,6 @@ $result_errors{'empty_deftypeop_name'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'missing name for @deftypeop',
     'type' => 'warning'
   }
diff --git a/tp/t/results/def/empty_main_def_arguments.pl 
b/tp/t/results/def/empty_main_def_arguments.pl
index 2a419910ff..da0f9be476 100644
--- a/tp/t/results/def/empty_main_def_arguments.pl
+++ b/tp/t/results/def/empty_main_def_arguments.pl
@@ -38,8 +38,7 @@ $result_trees{'empty_main_def_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               },
               'type' => 'def_line'
             },
@@ -71,8 +70,7 @@ $result_trees{'empty_main_def_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -83,8 +81,7 @@ $result_trees{'empty_main_def_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -108,7 +105,6 @@ $result_errors{'empty_main_def_arguments'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'missing name for @deffn',
     'type' => 'warning'
   }
diff --git a/tp/t/results/def/end_of_line_end_file.pl 
b/tp/t/results/def/end_of_line_end_file.pl
index 829445fc40..9984b508cb 100644
--- a/tp/t/results/def/end_of_line_end_file.pl
+++ b/tp/t/results/def/end_of_line_end_file.pl
@@ -75,8 +75,7 @@ $result_trees{'end_of_line_end_file'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               },
               'type' => 'def_line'
             }
@@ -88,8 +87,7 @@ $result_trees{'end_of_line_end_file'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -112,7 +110,6 @@ $result_errors{'end_of_line_end_file'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -121,7 +118,6 @@ $result_errors{'end_of_line_end_file'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'no matching `@end deffn\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/def/end_of_line_protect_at_end.pl 
b/tp/t/results/def/end_of_line_protect_at_end.pl
index 2e5961845f..bb9c0d9f86 100644
--- a/tp/t/results/def/end_of_line_protect_at_end.pl
+++ b/tp/t/results/def/end_of_line_protect_at_end.pl
@@ -73,8 +73,7 @@ $result_trees{'end_of_line_protect_at_end'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               },
               'type' => 'def_line'
             }
@@ -86,8 +85,7 @@ $result_trees{'end_of_line_protect_at_end'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
@@ -112,7 +110,6 @@ $result_errors{'end_of_line_protect_at_end'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'unexpected @',
     'type' => 'error'
   },
@@ -121,7 +118,6 @@ $result_errors{'end_of_line_protect_at_end'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -130,7 +126,6 @@ $result_errors{'end_of_line_protect_at_end'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'no matching `@end deffn\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/def/end_of_lines_protected.pl 
b/tp/t/results/def/end_of_lines_protected.pl
index 4b8d0c7faf..bd5e48dff2 100644
--- a/tp/t/results/def/end_of_lines_protected.pl
+++ b/tp/t/results/def/end_of_lines_protected.pl
@@ -93,8 +93,7 @@ $result_trees{'end_of_lines_protected'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -174,8 +173,7 @@ $result_trees{'end_of_lines_protected'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -200,8 +198,7 @@ $result_trees{'end_of_lines_protected'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               },
               'type' => 'def_line'
             },
@@ -247,8 +244,7 @@ $result_trees{'end_of_lines_protected'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -259,8 +255,7 @@ $result_trees{'end_of_lines_protected'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -287,7 +282,6 @@ $result_errors{'end_of_lines_protected'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   }
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 124cfe4a69..d3ad651979 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
@@ -112,8 +112,7 @@ $result_trees{'end_of_lines_protected_in_footnote'} = {
                                   },
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 3,
-                                    'macro' => ''
+                                    'line_nr' => 3
                                   },
                                   'type' => 'bracketed_arg'
                                 },
@@ -193,8 +192,7 @@ $result_trees{'end_of_lines_protected_in_footnote'} = {
                                   },
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 5,
-                                    'macro' => ''
+                                    'line_nr' => 5
                                   },
                                   'type' => 'bracketed_arg'
                                 }
@@ -219,8 +217,7 @@ $result_trees{'end_of_lines_protected_in_footnote'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 2,
-                            'macro' => ''
+                            'line_nr' => 2
                           },
                           'type' => 'def_line'
                         },
@@ -266,8 +263,7 @@ $result_trees{'end_of_lines_protected_in_footnote'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 7,
-                            'macro' => ''
+                            'line_nr' => 7
                           }
                         }
                       ],
@@ -278,8 +274,7 @@ $result_trees{'end_of_lines_protected_in_footnote'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -295,8 +290,7 @@ $result_trees{'end_of_lines_protected_in_footnote'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -331,7 +325,6 @@ $result_errors{'end_of_lines_protected_in_footnote'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   }
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 ddb7efd08f..96e79eb0d7 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
@@ -106,8 +106,7 @@ $result_trees{'end_of_lines_protected_non_ascii'} = {
                       },
                       'source_info' => {
                         'file_name' => 'end_of_lines_protected_non_ascii.texi',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -187,8 +186,7 @@ $result_trees{'end_of_lines_protected_non_ascii'} = {
                       },
                       'source_info' => {
                         'file_name' => 'end_of_lines_protected_non_ascii.texi',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -213,8 +211,7 @@ $result_trees{'end_of_lines_protected_non_ascii'} = {
               },
               'source_info' => {
                 'file_name' => 'end_of_lines_protected_non_ascii.texi',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               },
               'type' => 'def_line'
             },
@@ -260,8 +257,7 @@ $result_trees{'end_of_lines_protected_non_ascii'} = {
               },
               'source_info' => {
                 'file_name' => 'end_of_lines_protected_non_ascii.texi',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -272,8 +268,7 @@ $result_trees{'end_of_lines_protected_non_ascii'} = {
           },
           'source_info' => {
             'file_name' => 'end_of_lines_protected_non_ascii.texi',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -308,7 +303,6 @@ $result_errors{'end_of_lines_protected_non_ascii'} = [
 ',
     'file_name' => 'end_of_lines_protected_non_ascii.texi',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/def/inter_item_commands_in_def.pl 
b/tp/t/results/def/inter_item_commands_in_def.pl
index f6290f9840..6d7cf102e7 100644
--- a/tp/t/results/def/inter_item_commands_in_def.pl
+++ b/tp/t/results/def/inter_item_commands_in_def.pl
@@ -46,8 +46,7 @@ $result_trees{'inter_item_commands_in_def'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     },
                     {
@@ -97,8 +96,7 @@ $result_trees{'inter_item_commands_in_def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               },
               'type' => 'def_line'
             },
@@ -155,8 +153,7 @@ $result_trees{'inter_item_commands_in_def'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -173,8 +170,7 @@ $result_trees{'inter_item_commands_in_def'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -205,8 +201,7 @@ $result_trees{'inter_item_commands_in_def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'def_line'
             },
@@ -244,8 +239,7 @@ $result_trees{'inter_item_commands_in_def'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   },
                   'type' => 'index_entry_command'
                 }
@@ -290,8 +284,7 @@ $result_trees{'inter_item_commands_in_def'} = {
                               'cmdname' => 'samp',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 6,
-                                'macro' => ''
+                                'line_nr' => 6
                               }
                             },
                             {
@@ -307,8 +300,7 @@ $result_trees{'inter_item_commands_in_def'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     },
                     {
@@ -351,8 +343,7 @@ $result_trees{'inter_item_commands_in_def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'def_line'
             },
@@ -390,8 +381,7 @@ $result_trees{'inter_item_commands_in_def'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   },
                   'type' => 'index_entry_command'
                 },
@@ -440,8 +430,7 @@ $result_trees{'inter_item_commands_in_def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
@@ -452,8 +441,7 @@ $result_trees{'inter_item_commands_in_def'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -493,7 +481,6 @@ $result_errors{'inter_item_commands_in_def'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -502,7 +489,6 @@ $result_errors{'inter_item_commands_in_def'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -511,7 +497,6 @@ $result_errors{'inter_item_commands_in_def'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -520,7 +505,6 @@ $result_errors{'inter_item_commands_in_def'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -529,7 +513,6 @@ $result_errors{'inter_item_commands_in_def'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/def/inter_item_commands_in_def_in_example.pl 
b/tp/t/results/def/inter_item_commands_in_def_in_example.pl
index 329af8b8da..f523ede6f2 100644
--- a/tp/t/results/def/inter_item_commands_in_def_in_example.pl
+++ b/tp/t/results/def/inter_item_commands_in_def_in_example.pl
@@ -60,8 +60,7 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 2,
-                            'macro' => ''
+                            'line_nr' => 2
                           }
                         },
                         {
@@ -111,8 +110,7 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   },
                   'type' => 'def_line'
                 },
@@ -174,8 +172,7 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 5,
-                            'macro' => ''
+                            'line_nr' => 5
                           },
                           'type' => 'bracketed_arg'
                         },
@@ -192,8 +189,7 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 5,
-                            'macro' => ''
+                            'line_nr' => 5
                           },
                           'type' => 'bracketed_arg'
                         }
@@ -224,8 +220,7 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   },
                   'type' => 'def_line'
                 },
@@ -265,8 +260,7 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 6,
-                            'macro' => ''
+                            'line_nr' => 6
                           },
                           'type' => 'index_entry_command'
                         }
@@ -314,8 +308,7 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                                   'cmdname' => 'samp',
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 7,
-                                    'macro' => ''
+                                    'line_nr' => 7
                                   }
                                 },
                                 {
@@ -331,8 +324,7 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 7,
-                            'macro' => ''
+                            'line_nr' => 7
                           }
                         },
                         {
@@ -375,8 +367,7 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   },
                   'type' => 'def_line'
                 },
@@ -416,8 +407,7 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 8,
-                            'macro' => ''
+                            'line_nr' => 8
                           },
                           'type' => 'index_entry_command'
                         },
@@ -464,8 +454,7 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 }
               ],
@@ -476,8 +465,7 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -508,15 +496,13 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -558,7 +544,6 @@ $result_errors{'inter_item_commands_in_def_in_example'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -567,7 +552,6 @@ $result_errors{'inter_item_commands_in_def_in_example'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -576,7 +560,6 @@ $result_errors{'inter_item_commands_in_def_in_example'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -585,7 +568,6 @@ $result_errors{'inter_item_commands_in_def_in_example'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -594,7 +576,6 @@ $result_errors{'inter_item_commands_in_def_in_example'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/def/leading_space_in_def_arg.pl 
b/tp/t/results/def/leading_space_in_def_arg.pl
index ff04e38741..7da1074160 100644
--- a/tp/t/results/def/leading_space_in_def_arg.pl
+++ b/tp/t/results/def/leading_space_in_def_arg.pl
@@ -45,8 +45,7 @@ $result_trees{'leading_space_in_def_arg'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -84,8 +83,7 @@ $result_trees{'leading_space_in_def_arg'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               },
               'type' => 'def_line'
             },
@@ -117,8 +115,7 @@ $result_trees{'leading_space_in_def_arg'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -129,8 +126,7 @@ $result_trees{'leading_space_in_def_arg'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -155,7 +151,6 @@ $result_errors{'leading_space_in_def_arg'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/def/multiple_defline.pl 
b/tp/t/results/def/multiple_defline.pl
index f35c049047..df11505605 100644
--- a/tp/t/results/def/multiple_defline.pl
+++ b/tp/t/results/def/multiple_defline.pl
@@ -96,8 +96,7 @@ $result_trees{'multiple_defline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               },
               'type' => 'def_line'
             },
@@ -212,8 +211,7 @@ $result_trees{'multiple_defline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'def_line'
             },
@@ -263,15 +261,13 @@ $result_trees{'multiple_defline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/def/no_category_or_no_name.pl 
b/tp/t/results/def/no_category_or_no_name.pl
index 116f0aeda4..95fab6d4af 100644
--- a/tp/t/results/def/no_category_or_no_name.pl
+++ b/tp/t/results/def/no_category_or_no_name.pl
@@ -30,8 +30,7 @@ $result_trees{'no_category_or_no_name'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               },
               'type' => 'def_line'
             },
@@ -77,15 +76,13 @@ $result_trees{'no_category_or_no_name'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -111,8 +108,7 @@ $result_trees{'no_category_or_no_name'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -132,8 +128,7 @@ $result_trees{'no_category_or_no_name'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'def_line'
             },
@@ -179,8 +174,7 @@ $result_trees{'no_category_or_no_name'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -191,8 +185,7 @@ $result_trees{'no_category_or_no_name'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -273,8 +266,7 @@ $result_trees{'no_category_or_no_name'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'def_line'
             },
@@ -310,8 +302,7 @@ $result_trees{'no_category_or_no_name'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'def_line'
             },
@@ -334,8 +325,7 @@ $result_trees{'no_category_or_no_name'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'def_line'
             },
@@ -381,8 +371,7 @@ $result_trees{'no_category_or_no_name'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             }
           ],
@@ -393,8 +382,7 @@ $result_trees{'no_category_or_no_name'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         }
       ],
@@ -437,7 +425,6 @@ $result_errors{'no_category_or_no_name'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'missing category for @deffn',
     'type' => 'warning'
   },
@@ -446,7 +433,6 @@ $result_errors{'no_category_or_no_name'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'missing name for @deffn',
     'type' => 'warning'
   },
@@ -455,7 +441,6 @@ $result_errors{'no_category_or_no_name'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -464,7 +449,6 @@ $result_errors{'no_category_or_no_name'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => 'missing name for @deffnx',
     'type' => 'warning'
   },
@@ -473,7 +457,6 @@ $result_errors{'no_category_or_no_name'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'missing category for @deffnx',
     'type' => 'warning'
   }
diff --git a/tp/t/results/def/not_closed.pl b/tp/t/results/def/not_closed.pl
index 1ce7a803f7..47e5f22ae1 100644
--- a/tp/t/results/def/not_closed.pl
+++ b/tp/t/results/def/not_closed.pl
@@ -69,8 +69,7 @@ $result_trees{'not_closed'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               },
               'type' => 'def_line'
             },
@@ -137,8 +136,7 @@ $result_trees{'not_closed'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               },
               'type' => 'def_line'
             },
@@ -222,8 +220,7 @@ $result_trees{'not_closed'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       },
                       'type' => 'def_line'
                     }
@@ -235,8 +232,7 @@ $result_trees{'not_closed'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 }
               ],
@@ -250,8 +246,7 @@ $result_trees{'not_closed'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -281,7 +276,6 @@ $result_errors{'not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -290,7 +284,6 @@ $result_errors{'not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -299,7 +292,6 @@ $result_errors{'not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'entry for index `vr\' outside of any node',
     'type' => 'warning'
   },
@@ -308,7 +300,6 @@ $result_errors{'not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'no matching `@end defvar\'',
     'type' => 'error'
   },
@@ -317,7 +308,6 @@ $result_errors{'not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'no matching `@end deffn\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/def/omit_def_space.pl 
b/tp/t/results/def/omit_def_space.pl
index a09e788003..bb29a278a4 100644
--- a/tp/t/results/def/omit_def_space.pl
+++ b/tp/t/results/def/omit_def_space.pl
@@ -46,8 +46,7 @@ $result_trees{'omit_def_space'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -197,8 +196,7 @@ $result_trees{'omit_def_space'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'def_line'
             },
@@ -286,8 +284,7 @@ $result_trees{'omit_def_space'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               },
               'type' => 'def_line'
             },
@@ -333,8 +330,7 @@ $result_trees{'omit_def_space'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
@@ -345,8 +341,7 @@ $result_trees{'omit_def_space'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         }
       ],
@@ -361,8 +356,7 @@ $result_trees{'omit_def_space'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     }
   ],
diff --git a/tp/t/results/def/protected_brace.pl 
b/tp/t/results/def/protected_brace.pl
index 4fc230c138..2d16ba6ecd 100644
--- a/tp/t/results/def/protected_brace.pl
+++ b/tp/t/results/def/protected_brace.pl
@@ -56,8 +56,7 @@ $result_trees{'protected_brace'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               },
               'type' => 'def_line'
             },
@@ -89,8 +88,7 @@ $result_trees{'protected_brace'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -101,8 +99,7 @@ $result_trees{'protected_brace'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -127,7 +124,6 @@ $result_errors{'protected_brace'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/def/ref_in_def.pl b/tp/t/results/def/ref_in_def.pl
index 3e87606508..7795e84c2d 100644
--- a/tp/t/results/def/ref_in_def.pl
+++ b/tp/t/results/def/ref_in_def.pl
@@ -73,8 +73,7 @@ $result_trees{'ref_in_def'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     },
                     {
@@ -109,8 +108,7 @@ $result_trees{'ref_in_def'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     },
                     {
@@ -144,8 +142,7 @@ $result_trees{'ref_in_def'} = {
                           'cmdname' => 'pxref',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 4,
-                            'macro' => ''
+                            'line_nr' => 4
                           }
                         }
                       ],
@@ -154,8 +151,7 @@ $result_trees{'ref_in_def'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -191,8 +187,7 @@ $result_trees{'ref_in_def'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     },
                     {
@@ -227,8 +222,7 @@ $result_trees{'ref_in_def'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     }
                   ],
@@ -253,8 +247,7 @@ $result_trees{'ref_in_def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'def_line'
             },
@@ -287,8 +280,7 @@ $result_trees{'ref_in_def'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -323,8 +315,7 @@ $result_trees{'ref_in_def'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -358,8 +349,7 @@ $result_trees{'ref_in_def'} = {
                           'cmdname' => 'pxref',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 5,
-                            'macro' => ''
+                            'line_nr' => 5
                           }
                         }
                       ],
@@ -368,8 +358,7 @@ $result_trees{'ref_in_def'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -405,8 +394,7 @@ $result_trees{'ref_in_def'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -441,8 +429,7 @@ $result_trees{'ref_in_def'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
@@ -473,8 +460,7 @@ $result_trees{'ref_in_def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'def_line'
             },
@@ -520,8 +506,7 @@ $result_trees{'ref_in_def'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -532,8 +517,7 @@ $result_trees{'ref_in_def'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -559,8 +543,7 @@ $result_trees{'ref_in_def'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -580,8 +563,7 @@ $result_trees{'ref_in_def'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
diff --git a/tp/t/results/def/space_in_def_for_index.pl 
b/tp/t/results/def/space_in_def_for_index.pl
index 63a7649966..e3297ece27 100644
--- a/tp/t/results/def/space_in_def_for_index.pl
+++ b/tp/t/results/def/space_in_def_for_index.pl
@@ -39,8 +39,7 @@ $result_trees{'space_in_def_for_index'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -93,8 +92,7 @@ $result_trees{'space_in_def_for_index'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -124,8 +122,7 @@ $result_trees{'space_in_def_for_index'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -155,8 +152,7 @@ $result_trees{'space_in_def_for_index'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -195,8 +191,7 @@ $result_trees{'space_in_def_for_index'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'def_line'
             },
@@ -215,8 +210,7 @@ $result_trees{'space_in_def_for_index'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -238,8 +232,7 @@ $result_trees{'space_in_def_for_index'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -284,8 +277,7 @@ $result_trees{'space_in_def_for_index'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'def_line'
             },
@@ -317,8 +309,7 @@ $result_trees{'space_in_def_for_index'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -329,8 +320,7 @@ $result_trees{'space_in_def_for_index'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -368,8 +358,7 @@ $result_trees{'space_in_def_for_index'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         }
       ],
@@ -385,8 +374,7 @@ $result_trees{'space_in_def_for_index'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
diff --git a/tp/t/results/def/wrong_braces_simple.pl 
b/tp/t/results/def/wrong_braces_simple.pl
index 670b09b7de..ba4a38debd 100644
--- a/tp/t/results/def/wrong_braces_simple.pl
+++ b/tp/t/results/def/wrong_braces_simple.pl
@@ -95,8 +95,7 @@ $result_trees{'wrong_braces_simple'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               },
               'type' => 'def_line'
             },
@@ -128,8 +127,7 @@ $result_trees{'wrong_braces_simple'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -140,8 +138,7 @@ $result_trees{'wrong_braces_simple'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -248,8 +245,7 @@ $result_trees{'wrong_braces_simple'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'def_line'
             },
@@ -281,8 +277,7 @@ $result_trees{'wrong_braces_simple'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -293,8 +288,7 @@ $result_trees{'wrong_braces_simple'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -386,8 +380,7 @@ $result_trees{'wrong_braces_simple'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -406,8 +399,7 @@ $result_trees{'wrong_braces_simple'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'def_line'
             },
@@ -439,8 +431,7 @@ $result_trees{'wrong_braces_simple'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
@@ -451,8 +442,7 @@ $result_trees{'wrong_braces_simple'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -552,8 +542,7 @@ $result_trees{'wrong_braces_simple'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -572,8 +561,7 @@ $result_trees{'wrong_braces_simple'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'def_line'
             },
@@ -605,8 +593,7 @@ $result_trees{'wrong_braces_simple'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
@@ -617,8 +604,7 @@ $result_trees{'wrong_braces_simple'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -712,8 +698,7 @@ $result_trees{'wrong_braces_simple'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               },
               'type' => 'def_line'
             },
@@ -806,8 +791,7 @@ $result_trees{'wrong_braces_simple'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               },
               'type' => 'def_line'
             },
@@ -913,8 +897,7 @@ $result_trees{'wrong_braces_simple'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               },
               'type' => 'def_line'
             },
@@ -999,8 +982,7 @@ $result_trees{'wrong_braces_simple'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -1025,8 +1007,7 @@ $result_trees{'wrong_braces_simple'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               },
               'type' => 'def_line'
             },
@@ -1119,8 +1100,7 @@ $result_trees{'wrong_braces_simple'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -1145,8 +1125,7 @@ $result_trees{'wrong_braces_simple'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               },
               'type' => 'def_line'
             },
@@ -1178,8 +1157,7 @@ $result_trees{'wrong_braces_simple'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             }
           ],
@@ -1190,8 +1168,7 @@ $result_trees{'wrong_braces_simple'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         }
       ],
@@ -1252,7 +1229,6 @@ $result_errors{'wrong_braces_simple'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   },
@@ -1261,7 +1237,6 @@ $result_errors{'wrong_braces_simple'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -1270,7 +1245,6 @@ $result_errors{'wrong_braces_simple'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   },
@@ -1279,7 +1253,6 @@ $result_errors{'wrong_braces_simple'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -1288,7 +1261,6 @@ $result_errors{'wrong_braces_simple'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
   },
@@ -1297,7 +1269,6 @@ $result_errors{'wrong_braces_simple'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -1306,7 +1277,6 @@ $result_errors{'wrong_braces_simple'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
   },
@@ -1315,7 +1285,6 @@ $result_errors{'wrong_braces_simple'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -1324,7 +1293,6 @@ $result_errors{'wrong_braces_simple'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -1333,7 +1301,6 @@ $result_errors{'wrong_braces_simple'} = [
 ',
     'file_name' => '',
     'line_nr' => 14,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   },
@@ -1342,7 +1309,6 @@ $result_errors{'wrong_braces_simple'} = [
 ',
     'file_name' => '',
     'line_nr' => 14,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -1351,7 +1317,6 @@ $result_errors{'wrong_braces_simple'} = [
 ',
     'file_name' => '',
     'line_nr' => 15,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   },
@@ -1360,7 +1325,6 @@ $result_errors{'wrong_braces_simple'} = [
 ',
     'file_name' => '',
     'line_nr' => 15,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -1369,7 +1333,6 @@ $result_errors{'wrong_braces_simple'} = [
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
   },
@@ -1378,7 +1341,6 @@ $result_errors{'wrong_braces_simple'} = [
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -1387,7 +1349,6 @@ $result_errors{'wrong_braces_simple'} = [
 ',
     'file_name' => '',
     'line_nr' => 17,
-    'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
   },
@@ -1396,7 +1357,6 @@ $result_errors{'wrong_braces_simple'} = [
 ',
     'file_name' => '',
     'line_nr' => 17,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   }
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 a761dc1d0c..ae8b54a95f 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
@@ -82,8 +82,7 @@ $result_trees{'wrong_braces_with_end_of_lines'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -102,8 +101,7 @@ $result_trees{'wrong_braces_with_end_of_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               },
               'type' => 'def_line'
             },
@@ -155,8 +153,7 @@ $result_trees{'wrong_braces_with_end_of_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -167,8 +164,7 @@ $result_trees{'wrong_braces_with_end_of_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -269,8 +265,7 @@ $result_trees{'wrong_braces_with_end_of_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'def_line'
             },
@@ -322,8 +317,7 @@ $result_trees{'wrong_braces_with_end_of_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
@@ -334,8 +328,7 @@ $result_trees{'wrong_braces_with_end_of_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         }
       ],
@@ -370,7 +363,6 @@ $result_errors{'wrong_braces_with_end_of_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
   },
@@ -379,7 +371,6 @@ $result_errors{'wrong_braces_with_end_of_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -388,7 +379,6 @@ $result_errors{'wrong_braces_with_end_of_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   },
@@ -397,7 +387,6 @@ $result_errors{'wrong_braces_with_end_of_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/docbook_tests/between_node_and_section.pl 
b/tp/t/results/docbook_tests/between_node_and_section.pl
index f9154a9ad9..499bf15ccf 100644
--- a/tp/t/results/docbook_tests/between_node_and_section.pl
+++ b/tp/t/results/docbook_tests/between_node_and_section.pl
@@ -46,8 +46,7 @@ $result_trees{'between_node_and_section'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -85,8 +84,7 @@ $result_trees{'between_node_and_section'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -118,8 +116,7 @@ $result_trees{'between_node_and_section'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -157,8 +154,7 @@ $result_trees{'between_node_and_section'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -198,8 +194,7 @@ $result_trees{'between_node_and_section'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -219,8 +214,7 @@ $result_trees{'between_node_and_section'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -251,8 +245,7 @@ $result_trees{'between_node_and_section'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     }
   ],
diff --git 
a/tp/t/results/docbook_tests/empty_quotation_with_arg_followed_by_quotation.pl 
b/tp/t/results/docbook_tests/empty_quotation_with_arg_followed_by_quotation.pl
index 21cc586c53..b942dd48b5 100644
--- 
a/tp/t/results/docbook_tests/empty_quotation_with_arg_followed_by_quotation.pl
+++ 
b/tp/t/results/docbook_tests/empty_quotation_with_arg_followed_by_quotation.pl
@@ -56,8 +56,7 @@ 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -68,8 +67,7 @@ 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -128,15 +126,13 @@ 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         }
       ],
diff --git a/tp/t/results/docbook_tests/multiple_documentlanguage.pl 
b/tp/t/results/docbook_tests/multiple_documentlanguage.pl
index 4a1a161c9c..da11486747 100644
--- a/tp/t/results/docbook_tests/multiple_documentlanguage.pl
+++ b/tp/t/results/docbook_tests/multiple_documentlanguage.pl
@@ -37,8 +37,7 @@ $result_trees{'multiple_documentlanguage'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -78,8 +77,7 @@ $result_trees{'multiple_documentlanguage'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -115,8 +113,7 @@ $result_trees{'multiple_documentlanguage'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -148,8 +145,7 @@ $result_trees{'multiple_documentlanguage'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -204,8 +200,7 @@ $result_trees{'multiple_documentlanguage'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         }
       ],
@@ -219,8 +214,7 @@ $result_trees{'multiple_documentlanguage'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -252,8 +246,7 @@ $result_trees{'multiple_documentlanguage'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -308,8 +301,7 @@ $result_trees{'multiple_documentlanguage'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         }
       ],
@@ -323,8 +315,7 @@ $result_trees{'multiple_documentlanguage'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -356,8 +347,7 @@ $result_trees{'multiple_documentlanguage'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -412,8 +402,7 @@ $result_trees{'multiple_documentlanguage'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         }
       ],
@@ -427,8 +416,7 @@ $result_trees{'multiple_documentlanguage'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -460,8 +448,7 @@ $result_trees{'multiple_documentlanguage'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -499,8 +486,7 @@ $result_trees{'multiple_documentlanguage'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 19,
-        'macro' => ''
+        'line_nr' => 19
       }
     }
   ],
diff --git a/tp/t/results/docbook_tests/special_docbook_unnumbered.pl 
b/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
index f668b3218d..a43bde567a 100644
--- a/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
+++ b/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
@@ -39,8 +39,7 @@ $result_trees{'special_docbook_unnumbered'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -138,8 +137,7 @@ $result_trees{'special_docbook_unnumbered'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -186,8 +184,7 @@ $result_trees{'special_docbook_unnumbered'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               },
               'type' => 'menu_entry'
             },
@@ -234,8 +231,7 @@ $result_trees{'special_docbook_unnumbered'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -282,8 +278,7 @@ $result_trees{'special_docbook_unnumbered'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'menu_entry'
             },
@@ -315,15 +310,13 @@ $result_trees{'special_docbook_unnumbered'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -340,8 +333,7 @@ $result_trees{'special_docbook_unnumbered'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -373,8 +365,7 @@ $result_trees{'special_docbook_unnumbered'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -424,8 +415,7 @@ $result_trees{'special_docbook_unnumbered'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -457,8 +447,7 @@ $result_trees{'special_docbook_unnumbered'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -508,8 +497,7 @@ $result_trees{'special_docbook_unnumbered'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 19,
-        'macro' => ''
+        'line_nr' => 19
       }
     },
     {
@@ -541,8 +529,7 @@ $result_trees{'special_docbook_unnumbered'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 23,
-        'macro' => ''
+        'line_nr' => 23
       }
     },
     {
@@ -592,8 +579,7 @@ $result_trees{'special_docbook_unnumbered'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     {
@@ -625,8 +611,7 @@ $result_trees{'special_docbook_unnumbered'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 28,
-        'macro' => ''
+        'line_nr' => 28
       }
     },
     {
@@ -673,8 +658,7 @@ $result_trees{'special_docbook_unnumbered'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 29,
-        'macro' => ''
+        'line_nr' => 29
       }
     }
   ],
diff --git a/tp/t/results/float/anchor_in_caption.pl 
b/tp/t/results/float/anchor_in_caption.pl
index f5494c6466..cf87109524 100644
--- a/tp/t/results/float/anchor_in_caption.pl
+++ b/tp/t/results/float/anchor_in_caption.pl
@@ -44,8 +44,7 @@ $result_trees{'anchor_in_caption'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -100,8 +99,7 @@ $result_trees{'anchor_in_caption'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -175,8 +173,7 @@ $result_trees{'anchor_in_caption'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 8,
-                            'macro' => ''
+                            'line_nr' => 8
                           }
                         }
                       ],
@@ -192,8 +189,7 @@ $result_trees{'anchor_in_caption'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -229,8 +225,7 @@ $result_trees{'anchor_in_caption'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
@@ -247,8 +242,7 @@ $result_trees{'anchor_in_caption'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         }
       ],
@@ -263,8 +257,7 @@ $result_trees{'anchor_in_caption'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
diff --git a/tp/t/results/float/cindex_in_caption.pl 
b/tp/t/results/float/cindex_in_caption.pl
index 03b09d0f9e..6e1c305eb9 100644
--- a/tp/t/results/float/cindex_in_caption.pl
+++ b/tp/t/results/float/cindex_in_caption.pl
@@ -44,8 +44,7 @@ $result_trees{'cindex_in_caption'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -100,8 +99,7 @@ $result_trees{'cindex_in_caption'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -191,8 +189,7 @@ $result_trees{'cindex_in_caption'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 9,
-                            'macro' => ''
+                            'line_nr' => 9
                           },
                           'type' => 'index_entry_command'
                         }
@@ -209,8 +206,7 @@ $result_trees{'cindex_in_caption'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -246,8 +242,7 @@ $result_trees{'cindex_in_caption'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
@@ -264,8 +259,7 @@ $result_trees{'cindex_in_caption'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -303,8 +297,7 @@ $result_trees{'cindex_in_caption'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -325,8 +318,7 @@ $result_trees{'cindex_in_caption'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
diff --git a/tp/t/results/float/comment_space_comand_in_float.pl 
b/tp/t/results/float/comment_space_comand_in_float.pl
index 819cc04a7c..5ec8795908 100644
--- a/tp/t/results/float/comment_space_comand_in_float.pl
+++ b/tp/t/results/float/comment_space_comand_in_float.pl
@@ -44,8 +44,7 @@ $result_trees{'comment_space_comand_in_float'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -151,8 +150,7 @@ $result_trees{'comment_space_comand_in_float'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -168,8 +166,7 @@ $result_trees{'comment_space_comand_in_float'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -214,8 +211,7 @@ $result_trees{'comment_space_comand_in_float'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         }
       ],
@@ -230,8 +226,7 @@ $result_trees{'comment_space_comand_in_float'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
diff --git a/tp/t/results/float/complex_float.pl 
b/tp/t/results/float/complex_float.pl
index ff275ab114..9cb6d1ff10 100644
--- a/tp/t/results/float/complex_float.pl
+++ b/tp/t/results/float/complex_float.pl
@@ -44,8 +44,7 @@ $result_trees{'complex_float'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -109,8 +108,7 @@ $result_trees{'complex_float'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -184,8 +182,7 @@ $result_trees{'complex_float'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -217,15 +214,13 @@ $result_trees{'complex_float'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -277,8 +272,7 @@ $result_trees{'complex_float'} = {
                   'cmdname' => 'enddots',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 13,
-                    'macro' => ''
+                    'line_nr' => 13
                   }
                 },
                 {
@@ -402,8 +396,7 @@ $result_trees{'complex_float'} = {
                         },
                         'source_info' => {
                           'file_name' => '',
-                          'line_nr' => 27,
-                          'macro' => ''
+                          'line_nr' => 27
                         }
                       }
                     ],
@@ -414,8 +407,7 @@ $result_trees{'complex_float'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 16,
-                      'macro' => ''
+                      'line_nr' => 16
                     }
                   },
                   'sourcemark_type' => 'ignored_conditional_block'
@@ -466,8 +458,7 @@ $result_trees{'complex_float'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 30,
-                    'macro' => ''
+                    'line_nr' => 30
                   },
                   'type' => 'index_entry_command'
                 }
@@ -496,8 +487,7 @@ $result_trees{'complex_float'} = {
                       'cmdname' => 'emph',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 33,
-                        'macro' => ''
+                        'line_nr' => 33
                       },
                       'type' => 'command_as_argument'
                     }
@@ -542,8 +532,7 @@ $result_trees{'complex_float'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 34,
-                            'macro' => ''
+                            'line_nr' => 34
                           }
                         }
                       ],
@@ -594,8 +583,7 @@ $result_trees{'complex_float'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 36,
-                    'macro' => ''
+                    'line_nr' => 36
                   }
                 }
               ],
@@ -609,8 +597,7 @@ $result_trees{'complex_float'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               }
             },
             {
@@ -635,8 +622,7 @@ $result_trees{'complex_float'} = {
                       'cmdname' => 'minus',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 39,
-                        'macro' => ''
+                        'line_nr' => 39
                       },
                       'type' => 'command_as_argument'
                     }
@@ -678,8 +664,7 @@ $result_trees{'complex_float'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 40,
-                    'macro' => ''
+                    'line_nr' => 40
                   }
                 },
                 {
@@ -710,8 +695,7 @@ $result_trees{'complex_float'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 42,
-                    'macro' => ''
+                    'line_nr' => 42
                   }
                 }
               ],
@@ -725,8 +709,7 @@ $result_trees{'complex_float'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 39,
-                'macro' => ''
+                'line_nr' => 39
               }
             },
             {
@@ -770,8 +753,7 @@ $result_trees{'complex_float'} = {
                   'cmdname' => 'xref',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 45,
-                    'macro' => ''
+                    'line_nr' => 45
                   }
                 },
                 {
@@ -801,8 +783,7 @@ $result_trees{'complex_float'} = {
                   'cmdname' => 'footnote',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 47,
-                    'macro' => ''
+                    'line_nr' => 47
                   }
                 },
                 {
@@ -828,8 +809,7 @@ $result_trees{'complex_float'} = {
                   'cmdname' => 'TeX',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 49,
-                    'macro' => ''
+                    'line_nr' => 49
                   }
                 },
                 {
@@ -860,8 +840,7 @@ $result_trees{'complex_float'} = {
                                   'cmdname' => '\'',
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 49,
-                                    'macro' => ''
+                                    'line_nr' => 49
                                   }
                                 },
                                 {
@@ -882,8 +861,7 @@ $result_trees{'complex_float'} = {
                                           'cmdname' => 'dotless',
                                           'source_info' => {
                                             'file_name' => '',
-                                            'line_nr' => 49,
-                                            'macro' => ''
+                                            'line_nr' => 49
                                           }
                                         }
                                       ],
@@ -893,8 +871,7 @@ $result_trees{'complex_float'} = {
                                   'cmdname' => '^',
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 49,
-                                    'macro' => ''
+                                    'line_nr' => 49
                                   }
                                 }
                               ],
@@ -904,8 +881,7 @@ $result_trees{'complex_float'} = {
                           'cmdname' => 'b',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 49,
-                            'macro' => ''
+                            'line_nr' => 49
                           }
                         },
                         {
@@ -922,8 +898,7 @@ $result_trees{'complex_float'} = {
                           'cmdname' => 'url',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 49,
-                            'macro' => ''
+                            'line_nr' => 49
                           }
                         }
                       ],
@@ -933,8 +908,7 @@ $result_trees{'complex_float'} = {
                   'cmdname' => 'emph',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 49,
-                    'macro' => ''
+                    'line_nr' => 49
                   }
                 },
                 {
@@ -954,8 +928,7 @@ $result_trees{'complex_float'} = {
                   'cmdname' => 'sc',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 49,
-                    'macro' => ''
+                    'line_nr' => 49
                   }
                 },
                 {
@@ -979,8 +952,7 @@ $result_trees{'complex_float'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 49,
-                    'macro' => ''
+                    'line_nr' => 49
                   }
                 },
                 {
@@ -1016,8 +988,7 @@ $result_trees{'complex_float'} = {
                   'cmdname' => 'AE',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 49,
-                    'macro' => ''
+                    'line_nr' => 49
                   }
                 },
                 {
@@ -1050,8 +1021,7 @@ $result_trees{'complex_float'} = {
                           'cmdname' => 'enddots',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 51,
-                            'macro' => ''
+                            'line_nr' => 51
                           }
                         },
                         {
@@ -1116,15 +1086,13 @@ $result_trees{'complex_float'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 55,
-                            'macro' => ''
+                            'line_nr' => 55
                           }
                         }
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 53,
-                        'macro' => ''
+                        'line_nr' => 53
                       }
                     },
                     {
@@ -1150,8 +1118,7 @@ $result_trees{'complex_float'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 57,
-                        'macro' => ''
+                        'line_nr' => 57
                       }
                     },
                     {
@@ -1181,8 +1148,7 @@ $result_trees{'complex_float'} = {
                               'cmdname' => 'emph',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 60,
-                                'macro' => ''
+                                'line_nr' => 60
                               },
                               'type' => 'command_as_argument'
                             }
@@ -1227,8 +1193,7 @@ $result_trees{'complex_float'} = {
                                   },
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 61,
-                                    'macro' => ''
+                                    'line_nr' => 61
                                   }
                                 }
                               ],
@@ -1279,8 +1244,7 @@ $result_trees{'complex_float'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 63,
-                            'macro' => ''
+                            'line_nr' => 63
                           }
                         }
                       ],
@@ -1294,8 +1258,7 @@ $result_trees{'complex_float'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 60,
-                        'macro' => ''
+                        'line_nr' => 60
                       }
                     },
                     {
@@ -1324,8 +1287,7 @@ $result_trees{'complex_float'} = {
                               ],
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 66,
-                                'macro' => ''
+                                'line_nr' => 66
                               },
                               'type' => 'bracketed_arg'
                             },
@@ -1340,8 +1302,7 @@ $result_trees{'complex_float'} = {
                               ],
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 66,
-                                'macro' => ''
+                                'line_nr' => 66
                               },
                               'type' => 'bracketed_arg'
                             }
@@ -1382,8 +1343,7 @@ $result_trees{'complex_float'} = {
                                   },
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 67,
-                                    'macro' => ''
+                                    'line_nr' => 67
                                   }
                                 },
                                 {
@@ -1408,8 +1368,7 @@ $result_trees{'complex_float'} = {
                                   },
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 67,
-                                    'macro' => ''
+                                    'line_nr' => 67
                                   }
                                 }
                               ],
@@ -1441,8 +1400,7 @@ $result_trees{'complex_float'} = {
                                   },
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 68,
-                                    'macro' => ''
+                                    'line_nr' => 68
                                   }
                                 },
                                 {
@@ -1467,8 +1425,7 @@ $result_trees{'complex_float'} = {
                                   },
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 68,
-                                    'macro' => ''
+                                    'line_nr' => 68
                                   }
                                 }
                               ],
@@ -1508,8 +1465,7 @@ $result_trees{'complex_float'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 69,
-                            'macro' => ''
+                            'line_nr' => 69
                           }
                         }
                       ],
@@ -1523,8 +1479,7 @@ $result_trees{'complex_float'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 66,
-                        'macro' => ''
+                        'line_nr' => 66
                       }
                     },
                     {
@@ -1566,8 +1521,7 @@ $result_trees{'complex_float'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 71,
-                            'macro' => ''
+                            'line_nr' => 71
                           },
                           'type' => 'index_entry_command'
                         }
@@ -1596,8 +1550,7 @@ $result_trees{'complex_float'} = {
                               'cmdname' => 'minus',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 74,
-                                'macro' => ''
+                                'line_nr' => 74
                               },
                               'type' => 'command_as_argument'
                             }
@@ -1639,8 +1592,7 @@ $result_trees{'complex_float'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 75,
-                            'macro' => ''
+                            'line_nr' => 75
                           }
                         },
                         {
@@ -1671,8 +1623,7 @@ $result_trees{'complex_float'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 77,
-                            'macro' => ''
+                            'line_nr' => 77
                           }
                         }
                       ],
@@ -1686,8 +1637,7 @@ $result_trees{'complex_float'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 74,
-                        'macro' => ''
+                        'line_nr' => 74
                       }
                     },
                     {
@@ -1731,8 +1681,7 @@ $result_trees{'complex_float'} = {
                           'cmdname' => 'xref',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 80,
-                            'macro' => ''
+                            'line_nr' => 80
                           }
                         },
                         {
@@ -1762,8 +1711,7 @@ $result_trees{'complex_float'} = {
                           'cmdname' => 'footnote',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 82,
-                            'macro' => ''
+                            'line_nr' => 82
                           }
                         },
                         {
@@ -1789,8 +1737,7 @@ $result_trees{'complex_float'} = {
                           'cmdname' => 'TeX',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 84,
-                            'macro' => ''
+                            'line_nr' => 84
                           }
                         },
                         {
@@ -1821,8 +1768,7 @@ $result_trees{'complex_float'} = {
                                           'cmdname' => '\'',
                                           'source_info' => {
                                             'file_name' => '',
-                                            'line_nr' => 84,
-                                            'macro' => ''
+                                            'line_nr' => 84
                                           }
                                         },
                                         {
@@ -1843,8 +1789,7 @@ $result_trees{'complex_float'} = {
                                                   'cmdname' => 'dotless',
                                                   'source_info' => {
                                                     'file_name' => '',
-                                                    'line_nr' => 84,
-                                                    'macro' => ''
+                                                    'line_nr' => 84
                                                   }
                                                 }
                                               ],
@@ -1854,8 +1799,7 @@ $result_trees{'complex_float'} = {
                                           'cmdname' => '^',
                                           'source_info' => {
                                             'file_name' => '',
-                                            'line_nr' => 84,
-                                            'macro' => ''
+                                            'line_nr' => 84
                                           }
                                         }
                                       ],
@@ -1865,8 +1809,7 @@ $result_trees{'complex_float'} = {
                                   'cmdname' => 'b',
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 84,
-                                    'macro' => ''
+                                    'line_nr' => 84
                                   }
                                 },
                                 {
@@ -1883,8 +1826,7 @@ $result_trees{'complex_float'} = {
                                   'cmdname' => 'url',
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 84,
-                                    'macro' => ''
+                                    'line_nr' => 84
                                   }
                                 }
                               ],
@@ -1894,8 +1836,7 @@ $result_trees{'complex_float'} = {
                           'cmdname' => 'emph',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 84,
-                            'macro' => ''
+                            'line_nr' => 84
                           }
                         },
                         {
@@ -1915,8 +1856,7 @@ $result_trees{'complex_float'} = {
                           'cmdname' => 'sc',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 84,
-                            'macro' => ''
+                            'line_nr' => 84
                           }
                         },
                         {
@@ -1940,8 +1880,7 @@ $result_trees{'complex_float'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 84,
-                            'macro' => ''
+                            'line_nr' => 84
                           }
                         },
                         {
@@ -1977,8 +1916,7 @@ $result_trees{'complex_float'} = {
                           'cmdname' => 'AE',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 84,
-                            'macro' => ''
+                            'line_nr' => 84
                           }
                         },
                         {
@@ -2003,8 +1941,7 @@ $result_trees{'complex_float'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 51,
-                'macro' => ''
+                'line_nr' => 51
               }
             },
             {
@@ -2032,8 +1969,7 @@ $result_trees{'complex_float'} = {
                           'cmdname' => 'TeX',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 87,
-                            'macro' => ''
+                            'line_nr' => 87
                           }
                         },
                         {
@@ -2064,8 +2000,7 @@ $result_trees{'complex_float'} = {
                                           'cmdname' => '\'',
                                           'source_info' => {
                                             'file_name' => '',
-                                            'line_nr' => 87,
-                                            'macro' => ''
+                                            'line_nr' => 87
                                           }
                                         },
                                         {
@@ -2086,8 +2021,7 @@ $result_trees{'complex_float'} = {
                                                   'cmdname' => 'dotless',
                                                   'source_info' => {
                                                     'file_name' => '',
-                                                    'line_nr' => 87,
-                                                    'macro' => ''
+                                                    'line_nr' => 87
                                                   }
                                                 }
                                               ],
@@ -2097,8 +2031,7 @@ $result_trees{'complex_float'} = {
                                           'cmdname' => '^',
                                           'source_info' => {
                                             'file_name' => '',
-                                            'line_nr' => 87,
-                                            'macro' => ''
+                                            'line_nr' => 87
                                           }
                                         }
                                       ],
@@ -2108,8 +2041,7 @@ $result_trees{'complex_float'} = {
                                   'cmdname' => 'b',
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 87,
-                                    'macro' => ''
+                                    'line_nr' => 87
                                   }
                                 },
                                 {
@@ -2126,8 +2058,7 @@ $result_trees{'complex_float'} = {
                                   'cmdname' => 'url',
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 87,
-                                    'macro' => ''
+                                    'line_nr' => 87
                                   }
                                 }
                               ],
@@ -2137,8 +2068,7 @@ $result_trees{'complex_float'} = {
                           'cmdname' => 'emph',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 87,
-                            'macro' => ''
+                            'line_nr' => 87
                           }
                         },
                         {
@@ -2158,8 +2088,7 @@ $result_trees{'complex_float'} = {
                           'cmdname' => 'sc',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 87,
-                            'macro' => ''
+                            'line_nr' => 87
                           }
                         },
                         {
@@ -2183,8 +2112,7 @@ $result_trees{'complex_float'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 87,
-                            'macro' => ''
+                            'line_nr' => 87
                           }
                         },
                         {
@@ -2220,8 +2148,7 @@ $result_trees{'complex_float'} = {
                           'cmdname' => 'AE',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 87,
-                            'macro' => ''
+                            'line_nr' => 87
                           }
                         },
                         {
@@ -2240,8 +2167,7 @@ $result_trees{'complex_float'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 87,
-                'macro' => ''
+                'line_nr' => 87
               }
             },
             {
@@ -2282,8 +2208,7 @@ $result_trees{'complex_float'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 89,
-                'macro' => ''
+                'line_nr' => 89
               }
             }
           ],
@@ -2302,8 +2227,7 @@ $result_trees{'complex_float'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           }
         },
         {
@@ -2320,8 +2244,7 @@ $result_trees{'complex_float'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -2353,8 +2276,7 @@ $result_trees{'complex_float'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 91,
-        'macro' => ''
+        'line_nr' => 91
       }
     },
     {
@@ -2448,8 +2370,7 @@ $result_trees{'complex_float'} = {
                           'cmdname' => 'enddots',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 98,
-                            'macro' => ''
+                            'line_nr' => 98
                           }
                         },
                         {
@@ -2514,15 +2435,13 @@ $result_trees{'complex_float'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 102,
-                            'macro' => ''
+                            'line_nr' => 102
                           }
                         }
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 100,
-                        'macro' => ''
+                        'line_nr' => 100
                       }
                     },
                     {
@@ -2547,8 +2466,7 @@ $result_trees{'complex_float'} = {
                               'cmdname' => 'emph',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 105,
-                                'macro' => ''
+                                'line_nr' => 105
                               },
                               'type' => 'command_as_argument'
                             }
@@ -2593,8 +2511,7 @@ $result_trees{'complex_float'} = {
                                   },
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 106,
-                                    'macro' => ''
+                                    'line_nr' => 106
                                   }
                                 }
                               ],
@@ -2645,8 +2562,7 @@ $result_trees{'complex_float'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 108,
-                            'macro' => ''
+                            'line_nr' => 108
                           }
                         }
                       ],
@@ -2660,8 +2576,7 @@ $result_trees{'complex_float'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 105,
-                        'macro' => ''
+                        'line_nr' => 105
                       }
                     },
                     {
@@ -2690,8 +2605,7 @@ $result_trees{'complex_float'} = {
                               ],
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 111,
-                                'macro' => ''
+                                'line_nr' => 111
                               },
                               'type' => 'bracketed_arg'
                             },
@@ -2706,8 +2620,7 @@ $result_trees{'complex_float'} = {
                               ],
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 111,
-                                'macro' => ''
+                                'line_nr' => 111
                               },
                               'type' => 'bracketed_arg'
                             }
@@ -2748,8 +2661,7 @@ $result_trees{'complex_float'} = {
                                   },
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 112,
-                                    'macro' => ''
+                                    'line_nr' => 112
                                   }
                                 },
                                 {
@@ -2774,8 +2686,7 @@ $result_trees{'complex_float'} = {
                                   },
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 112,
-                                    'macro' => ''
+                                    'line_nr' => 112
                                   }
                                 }
                               ],
@@ -2807,8 +2718,7 @@ $result_trees{'complex_float'} = {
                                   },
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 113,
-                                    'macro' => ''
+                                    'line_nr' => 113
                                   }
                                 },
                                 {
@@ -2833,8 +2743,7 @@ $result_trees{'complex_float'} = {
                                   },
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 113,
-                                    'macro' => ''
+                                    'line_nr' => 113
                                   }
                                 }
                               ],
@@ -2874,8 +2783,7 @@ $result_trees{'complex_float'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 114,
-                            'macro' => ''
+                            'line_nr' => 114
                           }
                         }
                       ],
@@ -2889,8 +2797,7 @@ $result_trees{'complex_float'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 111,
-                        'macro' => ''
+                        'line_nr' => 111
                       }
                     },
                     {
@@ -2932,8 +2839,7 @@ $result_trees{'complex_float'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 116,
-                            'macro' => ''
+                            'line_nr' => 116
                           },
                           'type' => 'index_entry_command'
                         }
@@ -2962,8 +2868,7 @@ $result_trees{'complex_float'} = {
                               'cmdname' => 'minus',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 119,
-                                'macro' => ''
+                                'line_nr' => 119
                               },
                               'type' => 'command_as_argument'
                             }
@@ -3005,8 +2910,7 @@ $result_trees{'complex_float'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 120,
-                            'macro' => ''
+                            'line_nr' => 120
                           }
                         },
                         {
@@ -3037,8 +2941,7 @@ $result_trees{'complex_float'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 122,
-                            'macro' => ''
+                            'line_nr' => 122
                           }
                         }
                       ],
@@ -3052,8 +2955,7 @@ $result_trees{'complex_float'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 119,
-                        'macro' => ''
+                        'line_nr' => 119
                       }
                     },
                     {
@@ -3079,8 +2981,7 @@ $result_trees{'complex_float'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 124,
-                        'macro' => ''
+                        'line_nr' => 124
                       }
                     },
                     {
@@ -3129,8 +3030,7 @@ $result_trees{'complex_float'} = {
                           'cmdname' => 'xref',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 127,
-                            'macro' => ''
+                            'line_nr' => 127
                           }
                         },
                         {
@@ -3160,8 +3060,7 @@ $result_trees{'complex_float'} = {
                           'cmdname' => 'footnote',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 129,
-                            'macro' => ''
+                            'line_nr' => 129
                           }
                         },
                         {
@@ -3187,8 +3086,7 @@ $result_trees{'complex_float'} = {
                           'cmdname' => 'TeX',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 131,
-                            'macro' => ''
+                            'line_nr' => 131
                           }
                         },
                         {
@@ -3219,8 +3117,7 @@ $result_trees{'complex_float'} = {
                                           'cmdname' => '\'',
                                           'source_info' => {
                                             'file_name' => '',
-                                            'line_nr' => 131,
-                                            'macro' => ''
+                                            'line_nr' => 131
                                           }
                                         },
                                         {
@@ -3241,8 +3138,7 @@ $result_trees{'complex_float'} = {
                                                   'cmdname' => 'dotless',
                                                   'source_info' => {
                                                     'file_name' => '',
-                                                    'line_nr' => 131,
-                                                    'macro' => ''
+                                                    'line_nr' => 131
                                                   }
                                                 }
                                               ],
@@ -3252,8 +3148,7 @@ $result_trees{'complex_float'} = {
                                           'cmdname' => '^',
                                           'source_info' => {
                                             'file_name' => '',
-                                            'line_nr' => 131,
-                                            'macro' => ''
+                                            'line_nr' => 131
                                           }
                                         }
                                       ],
@@ -3263,8 +3158,7 @@ $result_trees{'complex_float'} = {
                                   'cmdname' => 'b',
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 131,
-                                    'macro' => ''
+                                    'line_nr' => 131
                                   }
                                 },
                                 {
@@ -3281,8 +3175,7 @@ $result_trees{'complex_float'} = {
                                   'cmdname' => 'url',
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 131,
-                                    'macro' => ''
+                                    'line_nr' => 131
                                   }
                                 }
                               ],
@@ -3292,8 +3185,7 @@ $result_trees{'complex_float'} = {
                           'cmdname' => 'emph',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 131,
-                            'macro' => ''
+                            'line_nr' => 131
                           }
                         },
                         {
@@ -3313,8 +3205,7 @@ $result_trees{'complex_float'} = {
                           'cmdname' => 'sc',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 131,
-                            'macro' => ''
+                            'line_nr' => 131
                           }
                         },
                         {
@@ -3338,8 +3229,7 @@ $result_trees{'complex_float'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 131,
-                            'macro' => ''
+                            'line_nr' => 131
                           }
                         },
                         {
@@ -3375,8 +3265,7 @@ $result_trees{'complex_float'} = {
                           'cmdname' => 'AE',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 131,
-                            'macro' => ''
+                            'line_nr' => 131
                           }
                         },
                         {
@@ -3401,8 +3290,7 @@ $result_trees{'complex_float'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 98,
-                'macro' => ''
+                'line_nr' => 98
               }
             },
             {
@@ -3443,8 +3331,7 @@ $result_trees{'complex_float'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 134,
-                'macro' => ''
+                'line_nr' => 134
               }
             }
           ],
@@ -3462,8 +3349,7 @@ $result_trees{'complex_float'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 94,
-            'macro' => ''
+            'line_nr' => 94
           }
         },
         {
@@ -3495,8 +3381,7 @@ $result_trees{'complex_float'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 136,
-                'macro' => ''
+                'line_nr' => 136
               }
             },
             {
@@ -3522,8 +3407,7 @@ $result_trees{'complex_float'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 92,
-        'macro' => ''
+        'line_nr' => 92
       }
     }
   ],
@@ -3834,7 +3718,6 @@ $result_errors{'complex_float'} = [
 ',
     'file_name' => '',
     'line_nr' => 87,
-    'macro' => '',
     'text' => '@verb should not appear anywhere inside @shortcaption',
     'type' => 'warning'
   }
diff --git a/tp/t/results/float/empty_caption.pl 
b/tp/t/results/float/empty_caption.pl
index 4cc359b3c0..896a73bbd4 100644
--- a/tp/t/results/float/empty_caption.pl
+++ b/tp/t/results/float/empty_caption.pl
@@ -63,8 +63,7 @@ $result_trees{'empty_caption'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -100,8 +99,7 @@ $result_trees{'empty_caption'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -118,8 +116,7 @@ $result_trees{'empty_caption'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -173,8 +170,7 @@ $result_trees{'empty_caption'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -210,8 +206,7 @@ $result_trees{'empty_caption'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
@@ -228,8 +223,7 @@ $result_trees{'empty_caption'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -272,8 +266,7 @@ $result_trees{'empty_caption'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -293,8 +286,7 @@ $result_trees{'empty_caption'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -330,8 +322,7 @@ $result_trees{'empty_caption'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
@@ -342,8 +333,7 @@ $result_trees{'empty_caption'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         }
       ],
diff --git a/tp/t/results/float/empty_label_no_space.pl 
b/tp/t/results/float/empty_label_no_space.pl
index 90b70be22e..f315073583 100644
--- a/tp/t/results/float/empty_label_no_space.pl
+++ b/tp/t/results/float/empty_label_no_space.pl
@@ -62,8 +62,7 @@ $result_trees{'empty_label_no_space'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -77,8 +76,7 @@ $result_trees{'empty_label_no_space'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/float/empty_label_no_space_comment.pl 
b/tp/t/results/float/empty_label_no_space_comment.pl
index 4defae7c0c..24708cee7c 100644
--- a/tp/t/results/float/empty_label_no_space_comment.pl
+++ b/tp/t/results/float/empty_label_no_space_comment.pl
@@ -68,8 +68,7 @@ $result_trees{'empty_label_no_space_comment'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -83,8 +82,7 @@ $result_trees{'empty_label_no_space_comment'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/float/empty_label_with_space.pl 
b/tp/t/results/float/empty_label_with_space.pl
index b5f4dd3100..6bd8ed2ce0 100644
--- a/tp/t/results/float/empty_label_with_space.pl
+++ b/tp/t/results/float/empty_label_with_space.pl
@@ -62,8 +62,7 @@ $result_trees{'empty_label_with_space'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -77,8 +76,7 @@ $result_trees{'empty_label_with_space'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/float/empty_label_with_space_comment.pl 
b/tp/t/results/float/empty_label_with_space_comment.pl
index bca0eb4d3a..2305900ed3 100644
--- a/tp/t/results/float/empty_label_with_space_comment.pl
+++ b/tp/t/results/float/empty_label_with_space_comment.pl
@@ -71,8 +71,7 @@ $result_trees{'empty_label_with_space_comment'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -86,8 +85,7 @@ $result_trees{'empty_label_with_space_comment'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/float/empty_listoffloats.pl 
b/tp/t/results/float/empty_listoffloats.pl
index c7e3dde3c3..7fc47eda3f 100644
--- a/tp/t/results/float/empty_listoffloats.pl
+++ b/tp/t/results/float/empty_listoffloats.pl
@@ -30,8 +30,7 @@ $result_trees{'empty_listoffloats'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/float/empty_listoffloats_with_floats.pl 
b/tp/t/results/float/empty_listoffloats_with_floats.pl
index 6ae4597f43..912b19bf58 100644
--- a/tp/t/results/float/empty_listoffloats_with_floats.pl
+++ b/tp/t/results/float/empty_listoffloats_with_floats.pl
@@ -84,8 +84,7 @@ $result_trees{'empty_listoffloats_with_floats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -101,8 +100,7 @@ $result_trees{'empty_listoffloats_with_floats'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -166,8 +164,7 @@ $result_trees{'empty_listoffloats_with_floats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -203,8 +200,7 @@ $result_trees{'empty_listoffloats_with_floats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
@@ -221,8 +217,7 @@ $result_trees{'empty_listoffloats_with_floats'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -281,8 +276,7 @@ $result_trees{'empty_listoffloats_with_floats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             }
           ],
@@ -291,8 +285,7 @@ $result_trees{'empty_listoffloats_with_floats'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -345,8 +338,7 @@ $result_trees{'empty_listoffloats_with_floats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -382,8 +374,7 @@ $result_trees{'empty_listoffloats_with_floats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             }
           ],
@@ -393,8 +384,7 @@ $result_trees{'empty_listoffloats_with_floats'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         },
         {
@@ -420,8 +410,7 @@ $result_trees{'empty_listoffloats_with_floats'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         }
       ],
diff --git a/tp/t/results/float/float_copying.pl 
b/tp/t/results/float/float_copying.pl
index 6603c50b0f..b3c390cd47 100644
--- a/tp/t/results/float/float_copying.pl
+++ b/tp/t/results/float/float_copying.pl
@@ -123,8 +123,7 @@ $result_trees{'float_copying'} = {
                                               },
                                               'source_info' => {
                                                 'file_name' => '',
-                                                'line_nr' => 10,
-                                                'macro' => ''
+                                                'line_nr' => 10
                                               }
                                             },
                                             {
@@ -173,8 +172,7 @@ $result_trees{'float_copying'} = {
                                           },
                                           'source_info' => {
                                             'file_name' => '',
-                                            'line_nr' => 12,
-                                            'macro' => ''
+                                            'line_nr' => 12
                                           },
                                           'type' => 'index_entry_command'
                                         },
@@ -211,8 +209,7 @@ $result_trees{'float_copying'} = {
                                           },
                                           'source_info' => {
                                             'file_name' => '',
-                                            'line_nr' => 13,
-                                            'macro' => ''
+                                            'line_nr' => 13
                                           },
                                           'type' => 'index_entry_command'
                                         },
@@ -248,8 +245,7 @@ $result_trees{'float_copying'} = {
                                               'cmdname' => 'ref',
                                               'source_info' => {
                                                 'file_name' => '',
-                                                'line_nr' => 15,
-                                                'macro' => ''
+                                                'line_nr' => 15
                                               }
                                             },
                                             {
@@ -277,8 +273,7 @@ $result_trees{'float_copying'} = {
                                   },
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 8,
-                                    'macro' => ''
+                                    'line_nr' => 8
                                   }
                                 },
                                 {
@@ -314,8 +309,7 @@ $result_trees{'float_copying'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 19,
-                                'macro' => ''
+                                'line_nr' => 19
                               }
                             },
                             {
@@ -356,8 +350,7 @@ $result_trees{'float_copying'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 20,
-                                'macro' => ''
+                                'line_nr' => 20
                               },
                               'type' => 'index_entry_command'
                             },
@@ -394,8 +387,7 @@ $result_trees{'float_copying'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 21,
-                                'macro' => ''
+                                'line_nr' => 21
                               },
                               'type' => 'index_entry_command'
                             }
@@ -409,8 +401,7 @@ $result_trees{'float_copying'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     },
                     {
@@ -446,8 +437,7 @@ $result_trees{'float_copying'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 23,
-                        'macro' => ''
+                        'line_nr' => 23
                       }
                     }
                   ],
@@ -464,8 +454,7 @@ $result_trees{'float_copying'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 },
                 {
@@ -496,15 +485,13 @@ $result_trees{'float_copying'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 24,
-                    'macro' => ''
+                    'line_nr' => 24
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -547,8 +534,7 @@ $result_trees{'float_copying'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 26,
-        'macro' => ''
+        'line_nr' => 26
       }
     },
     {
@@ -586,8 +572,7 @@ $result_trees{'float_copying'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 29,
-            'macro' => ''
+            'line_nr' => 29
           }
         },
         {
@@ -652,8 +637,7 @@ $result_trees{'float_copying'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               },
               'type' => 'menu_entry'
             },
@@ -685,15 +669,13 @@ $result_trees{'float_copying'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 31,
-            'macro' => ''
+            'line_nr' => 31
           }
         },
         {
@@ -710,8 +692,7 @@ $result_trees{'float_copying'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 27,
-        'macro' => ''
+        'line_nr' => 27
       }
     },
     {
@@ -744,8 +725,7 @@ $result_trees{'float_copying'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 35,
-        'macro' => ''
+        'line_nr' => 35
       }
     },
     {
@@ -783,8 +763,7 @@ $result_trees{'float_copying'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 38,
-            'macro' => ''
+            'line_nr' => 38
           }
         },
         {
@@ -798,8 +777,7 @@ $result_trees{'float_copying'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 39,
-            'macro' => ''
+            'line_nr' => 39
           }
         },
         {
@@ -835,8 +813,7 @@ $result_trees{'float_copying'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 41,
-            'macro' => ''
+            'line_nr' => 41
           }
         },
         {
@@ -874,8 +851,7 @@ $result_trees{'float_copying'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 43,
-            'macro' => ''
+            'line_nr' => 43
           }
         },
         {
@@ -908,8 +884,7 @@ $result_trees{'float_copying'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 44,
-            'macro' => ''
+            'line_nr' => 44
           }
         }
       ],
@@ -923,8 +898,7 @@ $result_trees{'float_copying'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 36,
-        'macro' => ''
+        'line_nr' => 36
       }
     }
   ],
@@ -1294,7 +1268,6 @@ $result_converted_errors{'info'}->{'float_copying'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@float output more than once: public domain',
     'type' => 'error'
   },
@@ -1303,7 +1276,6 @@ $result_converted_errors{'info'}->{'float_copying'} = [
 ',
     'file_name' => '',
     'line_nr' => 19,
-    'macro' => '',
     'text' => '@anchor output more than once: public domain anchor',
     'type' => 'error'
   },
@@ -1312,7 +1284,6 @@ $result_converted_errors{'info'}->{'float_copying'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@float output more than once: public domain',
     'type' => 'error'
   },
@@ -1321,7 +1292,6 @@ $result_converted_errors{'info'}->{'float_copying'} = [
 ',
     'file_name' => '',
     'line_nr' => 19,
-    'macro' => '',
     'text' => '@anchor output more than once: public domain anchor',
     'type' => 'error'
   },
@@ -1330,7 +1300,6 @@ $result_converted_errors{'info'}->{'float_copying'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => '@anchor output more than once: caption copying footnote anchor',
     'type' => 'error'
   },
@@ -1339,7 +1308,6 @@ $result_converted_errors{'info'}->{'float_copying'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => '@anchor output more than once: caption copying footnote anchor',
     'type' => 'error'
   }
diff --git a/tp/t/results/float/float_in_block_commands.pl 
b/tp/t/results/float/float_in_block_commands.pl
index c015fc7e20..f1d5430e85 100644
--- a/tp/t/results/float/float_in_block_commands.pl
+++ b/tp/t/results/float/float_in_block_commands.pl
@@ -78,8 +78,7 @@ $result_trees{'float_in_block_commands'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 },
                 {
@@ -123,8 +122,7 @@ $result_trees{'float_in_block_commands'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 }
               ],
@@ -141,8 +139,7 @@ $result_trees{'float_in_block_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -173,15 +170,13 @@ $result_trees{'float_in_block_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -255,8 +250,7 @@ $result_trees{'float_in_block_commands'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 },
                 {
@@ -292,8 +286,7 @@ $result_trees{'float_in_block_commands'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 }
               ],
@@ -310,8 +303,7 @@ $result_trees{'float_in_block_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -342,15 +334,13 @@ $result_trees{'float_in_block_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -424,8 +414,7 @@ $result_trees{'float_in_block_commands'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 15,
-                    'macro' => ''
+                    'line_nr' => 15
                   }
                 },
                 {
@@ -461,8 +450,7 @@ $result_trees{'float_in_block_commands'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 16,
-                    'macro' => ''
+                    'line_nr' => 16
                   }
                 }
               ],
@@ -479,8 +467,7 @@ $result_trees{'float_in_block_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -511,15 +498,13 @@ $result_trees{'float_in_block_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
diff --git a/tp/t/results/float/float_type_with_tieaccent.pl 
b/tp/t/results/float/float_type_with_tieaccent.pl
index 7b47d57c53..8ffcd873c6 100644
--- a/tp/t/results/float/float_type_with_tieaccent.pl
+++ b/tp/t/results/float/float_type_with_tieaccent.pl
@@ -33,8 +33,7 @@ $result_trees{'float_type_with_tieaccent'} = {
                   'cmdname' => 'tieaccent',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -54,8 +53,7 @@ $result_trees{'float_type_with_tieaccent'} = {
                   'cmdname' => 'tieaccent',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -79,8 +77,7 @@ $result_trees{'float_type_with_tieaccent'} = {
                           'cmdname' => '^',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 1,
-                            'macro' => ''
+                            'line_nr' => 1
                           }
                         },
                         {
@@ -93,8 +90,7 @@ $result_trees{'float_type_with_tieaccent'} = {
                   'cmdname' => 'tieaccent',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 }
               ],
@@ -157,8 +153,7 @@ $result_trees{'float_type_with_tieaccent'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -174,8 +169,7 @@ $result_trees{'float_type_with_tieaccent'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -204,8 +198,7 @@ $result_trees{'float_type_with_tieaccent'} = {
                   'cmdname' => 'tieaccent',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 },
                 {
@@ -225,8 +218,7 @@ $result_trees{'float_type_with_tieaccent'} = {
                   'cmdname' => 'tieaccent',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 },
                 {
@@ -250,8 +242,7 @@ $result_trees{'float_type_with_tieaccent'} = {
                           'cmdname' => '^',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 5,
-                            'macro' => ''
+                            'line_nr' => 5
                           }
                         },
                         {
@@ -264,8 +255,7 @@ $result_trees{'float_type_with_tieaccent'} = {
                   'cmdname' => 'tieaccent',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 }
               ],
@@ -289,8 +279,7 @@ $result_trees{'float_type_with_tieaccent'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
diff --git a/tp/t/results/float/float_with_at_commands.pl 
b/tp/t/results/float/float_with_at_commands.pl
index aecf2bdf97..a9548adafe 100644
--- a/tp/t/results/float/float_with_at_commands.pl
+++ b/tp/t/results/float/float_with_at_commands.pl
@@ -33,8 +33,7 @@ $result_trees{'float_with_at_commands'} = {
                   'cmdname' => '\'',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -62,8 +61,7 @@ $result_trees{'float_with_at_commands'} = {
                   'cmdname' => '`',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -83,8 +81,7 @@ $result_trees{'float_with_at_commands'} = {
                   'cmdname' => '\'',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -129,8 +126,7 @@ $result_trees{'float_with_at_commands'} = {
                   'cmdname' => '`',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 },
                 {
@@ -150,8 +146,7 @@ $result_trees{'float_with_at_commands'} = {
                   'cmdname' => '\'',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 },
                 {
@@ -184,8 +179,7 @@ $result_trees{'float_with_at_commands'} = {
                           'cmdname' => '`',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 4,
-                            'macro' => ''
+                            'line_nr' => 4
                           }
                         },
                         {
@@ -205,8 +199,7 @@ $result_trees{'float_with_at_commands'} = {
                           'cmdname' => '\'',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 4,
-                            'macro' => ''
+                            'line_nr' => 4
                           }
                         },
                         {
@@ -225,8 +218,7 @@ $result_trees{'float_with_at_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -267,8 +259,7 @@ $result_trees{'float_with_at_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -285,8 +276,7 @@ $result_trees{'float_with_at_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -320,8 +310,7 @@ $result_trees{'float_with_at_commands'} = {
                   'cmdname' => '\'',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 },
                 {
@@ -348,8 +337,7 @@ $result_trees{'float_with_at_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         }
       ],
diff --git a/tp/t/results/float/footnote_in_caption.pl 
b/tp/t/results/float/footnote_in_caption.pl
index e957888178..a65d49c43b 100644
--- a/tp/t/results/float/footnote_in_caption.pl
+++ b/tp/t/results/float/footnote_in_caption.pl
@@ -44,8 +44,7 @@ $result_trees{'footnote_in_caption'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -100,8 +99,7 @@ $result_trees{'footnote_in_caption'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -176,8 +174,7 @@ $result_trees{'footnote_in_caption'} = {
                           'cmdname' => 'footnote',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 8,
-                            'macro' => ''
+                            'line_nr' => 8
                           }
                         }
                       ],
@@ -193,8 +190,7 @@ $result_trees{'footnote_in_caption'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -230,8 +226,7 @@ $result_trees{'footnote_in_caption'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
@@ -248,8 +243,7 @@ $result_trees{'footnote_in_caption'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         }
       ],
@@ -264,8 +258,7 @@ $result_trees{'footnote_in_caption'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
diff --git a/tp/t/results/float/footnote_in_caption_and_error.pl 
b/tp/t/results/float/footnote_in_caption_and_error.pl
index 264715183e..8eee178dd5 100644
--- a/tp/t/results/float/footnote_in_caption_and_error.pl
+++ b/tp/t/results/float/footnote_in_caption_and_error.pl
@@ -44,8 +44,7 @@ $result_trees{'footnote_in_caption_and_error'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -100,8 +99,7 @@ $result_trees{'footnote_in_caption_and_error'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -170,8 +168,7 @@ $result_trees{'footnote_in_caption_and_error'} = {
                                       'cmdname' => 'error',
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 8,
-                                        'macro' => ''
+                                        'line_nr' => 8
                                       }
                                     }
                                   ],
@@ -184,8 +181,7 @@ $result_trees{'footnote_in_caption_and_error'} = {
                           'cmdname' => 'footnote',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 8,
-                            'macro' => ''
+                            'line_nr' => 8
                           }
                         }
                       ],
@@ -201,8 +197,7 @@ $result_trees{'footnote_in_caption_and_error'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -238,8 +233,7 @@ $result_trees{'footnote_in_caption_and_error'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
@@ -256,8 +250,7 @@ $result_trees{'footnote_in_caption_and_error'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         }
       ],
@@ -272,8 +265,7 @@ $result_trees{'footnote_in_caption_and_error'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
@@ -342,7 +334,6 @@ $result_errors{'footnote_in_caption_and_error'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => '@error expected braces',
     'type' => 'error'
   }
diff --git a/tp/t/results/float/listoffloats_with_commands.pl 
b/tp/t/results/float/listoffloats_with_commands.pl
index c5471fdf24..8767a45943 100644
--- a/tp/t/results/float/listoffloats_with_commands.pl
+++ b/tp/t/results/float/listoffloats_with_commands.pl
@@ -33,8 +33,7 @@ $result_trees{'listoffloats_with_commands'} = {
                   'cmdname' => '\'',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -54,8 +53,7 @@ $result_trees{'listoffloats_with_commands'} = {
                   'cmdname' => '`',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -82,8 +80,7 @@ $result_trees{'listoffloats_with_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/float/multiple_spaces_in_float_type.pl 
b/tp/t/results/float/multiple_spaces_in_float_type.pl
index 4d8b26a5db..f455df5c23 100644
--- a/tp/t/results/float/multiple_spaces_in_float_type.pl
+++ b/tp/t/results/float/multiple_spaces_in_float_type.pl
@@ -79,8 +79,7 @@ $result_trees{'multiple_spaces_in_float_type'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -96,8 +95,7 @@ $result_trees{'multiple_spaces_in_float_type'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -133,8 +131,7 @@ $result_trees{'multiple_spaces_in_float_type'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
diff --git a/tp/t/results/float/numbering_captions_listoffloats.pl 
b/tp/t/results/float/numbering_captions_listoffloats.pl
index 8d9307c0b3..84e0964be9 100644
--- a/tp/t/results/float/numbering_captions_listoffloats.pl
+++ b/tp/t/results/float/numbering_captions_listoffloats.pl
@@ -44,8 +44,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -125,8 +124,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                           'cmdname' => 'enddots',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 6,
-                            'macro' => ''
+                            'line_nr' => 6
                           }
                         }
                       ],
@@ -147,8 +145,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -171,8 +168,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                           'cmdname' => 'TeX',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 7,
-                            'macro' => ''
+                            'line_nr' => 7
                           }
                         },
                         {
@@ -191,8 +187,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -228,8 +223,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
@@ -248,8 +242,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -312,8 +305,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -343,8 +335,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -380,8 +371,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
@@ -398,8 +388,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -465,8 +454,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -496,8 +484,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -533,8 +520,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           ],
@@ -553,8 +539,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -631,8 +616,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             }
           ],
@@ -649,8 +633,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           }
         },
         {
@@ -719,8 +702,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             }
           ],
@@ -730,8 +712,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 31,
-            'macro' => ''
+            'line_nr' => 31
           }
         },
         {
@@ -784,8 +765,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               }
             },
             {
@@ -815,8 +795,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 39,
-                'macro' => ''
+                'line_nr' => 39
               }
             },
             {
@@ -852,8 +831,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               }
             }
           ],
@@ -865,8 +843,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 36,
-            'macro' => ''
+            'line_nr' => 36
           }
         },
         {
@@ -932,8 +909,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 45,
-                'macro' => ''
+                'line_nr' => 45
               }
             },
             {
@@ -963,8 +939,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -1000,8 +975,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               }
             }
           ],
@@ -1020,8 +994,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 42,
-            'macro' => ''
+            'line_nr' => 42
           }
         },
         {
@@ -1095,8 +1068,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               }
             },
             {
@@ -1126,8 +1098,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               }
             },
             {
@@ -1163,8 +1134,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 54,
-                'macro' => ''
+                'line_nr' => 54
               }
             }
           ],
@@ -1183,8 +1153,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 49,
-            'macro' => ''
+            'line_nr' => 49
           }
         },
         {
@@ -1249,8 +1218,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 57,
-                'macro' => ''
+                'line_nr' => 57
               },
               'type' => 'menu_entry'
             },
@@ -1297,8 +1265,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               },
               'type' => 'menu_entry'
             },
@@ -1345,8 +1312,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               },
               'type' => 'menu_entry'
             },
@@ -1393,8 +1359,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 60,
-                'macro' => ''
+                'line_nr' => 60
               },
               'type' => 'menu_entry'
             },
@@ -1441,8 +1406,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               },
               'type' => 'menu_entry'
             },
@@ -1474,15 +1438,13 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 56,
-            'macro' => ''
+            'line_nr' => 56
           }
         },
         {
@@ -1499,8 +1461,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -1532,8 +1493,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 64,
-        'macro' => ''
+        'line_nr' => 64
       }
     },
     {
@@ -1626,8 +1586,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 70,
-                'macro' => ''
+                'line_nr' => 70
               }
             },
             {
@@ -1663,8 +1622,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             }
           ],
@@ -1682,8 +1640,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 67,
-            'macro' => ''
+            'line_nr' => 67
           }
         },
         {
@@ -1739,8 +1696,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                           'cmdname' => 'enddots',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 74,
-                            'macro' => ''
+                            'line_nr' => 74
                           }
                         }
                       ],
@@ -1761,8 +1717,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 74,
-                'macro' => ''
+                'line_nr' => 74
               }
             },
             {
@@ -1798,8 +1753,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 75,
-                'macro' => ''
+                'line_nr' => 75
               }
             }
           ],
@@ -1817,8 +1771,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 73,
-            'macro' => ''
+            'line_nr' => 73
           }
         },
         {
@@ -1847,8 +1800,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'cmdname' => '\'',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 77,
-                    'macro' => ''
+                    'line_nr' => 77
                   }
                 },
                 {
@@ -1868,8 +1820,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'cmdname' => '`',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 77,
-                    'macro' => ''
+                    'line_nr' => 77
                   }
                 },
                 {
@@ -1917,8 +1868,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'cmdname' => '\'',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 78,
-                    'macro' => ''
+                    'line_nr' => 78
                   }
                 },
                 {
@@ -1938,8 +1888,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'cmdname' => '`',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 78,
-                    'macro' => ''
+                    'line_nr' => 78
                   }
                 },
                 {
@@ -1977,8 +1926,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                           'cmdname' => '\'',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 80,
-                            'macro' => ''
+                            'line_nr' => 80
                           }
                         },
                         {
@@ -1998,8 +1946,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                           'cmdname' => '`',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 80,
-                            'macro' => ''
+                            'line_nr' => 80
                           }
                         },
                         {
@@ -2018,8 +1965,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 80,
-                'macro' => ''
+                'line_nr' => 80
               }
             },
             {
@@ -2055,8 +2001,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 81,
-                'macro' => ''
+                'line_nr' => 81
               }
             }
           ],
@@ -2074,8 +2019,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 77,
-            'macro' => ''
+            'line_nr' => 77
           }
         },
         {
@@ -2141,8 +2085,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 86,
-                'macro' => ''
+                'line_nr' => 86
               }
             },
             {
@@ -2172,8 +2115,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 87,
-                'macro' => ''
+                'line_nr' => 87
               }
             },
             {
@@ -2209,8 +2151,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 88,
-                'macro' => ''
+                'line_nr' => 88
               }
             }
           ],
@@ -2229,8 +2170,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 83,
-            'macro' => ''
+            'line_nr' => 83
           }
         },
         {
@@ -2304,8 +2244,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 93,
-                'macro' => ''
+                'line_nr' => 93
               }
             },
             {
@@ -2335,8 +2274,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 94,
-                'macro' => ''
+                'line_nr' => 94
               }
             },
             {
@@ -2372,8 +2310,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 95,
-                'macro' => ''
+                'line_nr' => 95
               }
             }
           ],
@@ -2392,8 +2329,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 90,
-            'macro' => ''
+            'line_nr' => 90
           }
         },
         {
@@ -2458,8 +2394,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 98,
-                'macro' => ''
+                'line_nr' => 98
               },
               'type' => 'menu_entry'
             },
@@ -2491,15 +2426,13 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 99,
-                'macro' => ''
+                'line_nr' => 99
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 97,
-            'macro' => ''
+            'line_nr' => 97
           }
         },
         {
@@ -2518,8 +2451,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 65,
-        'macro' => ''
+        'line_nr' => 65
       }
     },
     {
@@ -2551,8 +2483,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 101,
-        'macro' => ''
+        'line_nr' => 101
       }
     },
     {
@@ -2656,8 +2587,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 108,
-                'macro' => ''
+                'line_nr' => 108
               }
             }
           ],
@@ -2674,8 +2604,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 104,
-            'macro' => ''
+            'line_nr' => 104
           }
         },
         {
@@ -2694,8 +2623,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 102,
-        'macro' => ''
+        'line_nr' => 102
       }
     },
     {
@@ -2727,8 +2655,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 110,
-        'macro' => ''
+        'line_nr' => 110
       }
     },
     {
@@ -2812,8 +2739,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 114,
-                'macro' => ''
+                'line_nr' => 114
               },
               'type' => 'menu_entry'
             },
@@ -2845,15 +2771,13 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 115,
-                'macro' => ''
+                'line_nr' => 115
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 113,
-            'macro' => ''
+            'line_nr' => 113
           }
         },
         {
@@ -2917,8 +2841,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 118,
-                'macro' => ''
+                'line_nr' => 118
               }
             },
             {
@@ -2948,8 +2871,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 119,
-                'macro' => ''
+                'line_nr' => 119
               }
             },
             {
@@ -2985,8 +2907,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 120,
-                'macro' => ''
+                'line_nr' => 120
               }
             }
           ],
@@ -3005,8 +2926,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 116,
-            'macro' => ''
+            'line_nr' => 116
           }
         },
         {
@@ -3067,8 +2987,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 124,
-                'macro' => ''
+                'line_nr' => 124
               }
             },
             {
@@ -3098,8 +3017,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 125,
-                'macro' => ''
+                'line_nr' => 125
               }
             },
             {
@@ -3135,8 +3053,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 126,
-                'macro' => ''
+                'line_nr' => 126
               }
             }
           ],
@@ -3155,8 +3072,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 121,
-            'macro' => ''
+            'line_nr' => 121
           }
         },
         {
@@ -3178,8 +3094,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 111,
-        'macro' => ''
+        'line_nr' => 111
       }
     },
     {
@@ -3211,8 +3126,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 129,
-        'macro' => ''
+        'line_nr' => 129
       }
     },
     {
@@ -3305,8 +3219,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 135,
-                'macro' => ''
+                'line_nr' => 135
               }
             },
             {
@@ -3336,8 +3249,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 136,
-                'macro' => ''
+                'line_nr' => 136
               }
             },
             {
@@ -3373,8 +3285,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 137,
-                'macro' => ''
+                'line_nr' => 137
               }
             }
           ],
@@ -3393,8 +3304,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 133,
-            'macro' => ''
+            'line_nr' => 133
           }
         },
         {
@@ -3411,8 +3321,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 130,
-        'macro' => ''
+        'line_nr' => 130
       }
     },
     {
@@ -3444,8 +3353,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 139,
-        'macro' => ''
+        'line_nr' => 139
       }
     },
     {
@@ -3529,8 +3437,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 143,
-                'macro' => ''
+                'line_nr' => 143
               },
               'type' => 'menu_entry'
             },
@@ -3562,15 +3469,13 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 144,
-                'macro' => ''
+                'line_nr' => 144
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 142,
-            'macro' => ''
+            'line_nr' => 142
           }
         },
         {
@@ -3634,8 +3539,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 147,
-                'macro' => ''
+                'line_nr' => 147
               }
             },
             {
@@ -3665,8 +3569,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 148,
-                'macro' => ''
+                'line_nr' => 148
               }
             },
             {
@@ -3702,8 +3605,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 149,
-                'macro' => ''
+                'line_nr' => 149
               }
             }
           ],
@@ -3722,8 +3624,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 145,
-            'macro' => ''
+            'line_nr' => 145
           }
         },
         {
@@ -3742,8 +3643,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 140,
-        'macro' => ''
+        'line_nr' => 140
       }
     },
     {
@@ -3775,8 +3675,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 151,
-        'macro' => ''
+        'line_nr' => 151
       }
     },
     {
@@ -3864,8 +3763,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 156,
-                'macro' => ''
+                'line_nr' => 156
               }
             },
             {
@@ -3895,8 +3793,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 157,
-                'macro' => ''
+                'line_nr' => 157
               }
             },
             {
@@ -3932,8 +3829,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 158,
-                'macro' => ''
+                'line_nr' => 158
               }
             }
           ],
@@ -3952,8 +3848,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 154,
-            'macro' => ''
+            'line_nr' => 154
           }
         },
         {
@@ -4019,8 +3914,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 163,
-                'macro' => ''
+                'line_nr' => 163
               }
             },
             {
@@ -4050,8 +3944,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 164,
-                'macro' => ''
+                'line_nr' => 164
               }
             },
             {
@@ -4087,8 +3980,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 165,
-                'macro' => ''
+                'line_nr' => 165
               }
             }
           ],
@@ -4107,8 +3999,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 160,
-            'macro' => ''
+            'line_nr' => 160
           }
         },
         {
@@ -4125,8 +4016,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 152,
-        'macro' => ''
+        'line_nr' => 152
       }
     },
     {
@@ -4158,8 +4048,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 167,
-        'macro' => ''
+        'line_nr' => 167
       }
     },
     {
@@ -4252,8 +4141,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 173,
-                'macro' => ''
+                'line_nr' => 173
               }
             },
             {
@@ -4283,8 +4171,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 174,
-                'macro' => ''
+                'line_nr' => 174
               }
             },
             {
@@ -4320,8 +4207,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 175,
-                'macro' => ''
+                'line_nr' => 175
               }
             }
           ],
@@ -4340,8 +4226,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 170,
-            'macro' => ''
+            'line_nr' => 170
           }
         },
         {
@@ -4360,8 +4245,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 168,
-        'macro' => ''
+        'line_nr' => 168
       }
     },
     {
@@ -4393,8 +4277,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 177,
-        'macro' => ''
+        'line_nr' => 177
       }
     },
     {
@@ -4448,8 +4331,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 180,
-                'macro' => ''
+                'line_nr' => 180
               }
             },
             {
@@ -4481,8 +4363,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'cmdname' => 'pxref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 181,
-                'macro' => ''
+                'line_nr' => 181
               }
             },
             {
@@ -4511,8 +4392,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 182,
-                'macro' => ''
+                'line_nr' => 182
               }
             },
             {
@@ -4581,8 +4461,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 185,
-                'macro' => ''
+                'line_nr' => 185
               }
             },
             {
@@ -4663,8 +4542,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 188,
-                'macro' => ''
+                'line_nr' => 188
               }
             },
             {
@@ -4748,8 +4626,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 191,
-                'macro' => ''
+                'line_nr' => 191
               }
             },
             {
@@ -4791,8 +4668,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 193,
-                'macro' => ''
+                'line_nr' => 193
               }
             },
             {
@@ -4835,8 +4711,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 195,
-            'macro' => ''
+            'line_nr' => 195
           }
         },
         {
@@ -4860,8 +4735,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'cmdname' => '\'',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 196,
-                    'macro' => ''
+                    'line_nr' => 196
                   }
                 },
                 {
@@ -4881,8 +4755,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'cmdname' => '`',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 196,
-                    'macro' => ''
+                    'line_nr' => 196
                   }
                 },
                 {
@@ -4909,8 +4782,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 196,
-            'macro' => ''
+            'line_nr' => 196
           }
         },
         {
@@ -4927,8 +4799,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 178,
-        'macro' => ''
+        'line_nr' => 178
       }
     },
     {
diff --git a/tp/t/results/float/ref_to_float.pl 
b/tp/t/results/float/ref_to_float.pl
index 74e33d1c2e..5b6170cca7 100644
--- a/tp/t/results/float/ref_to_float.pl
+++ b/tp/t/results/float/ref_to_float.pl
@@ -79,8 +79,7 @@ $result_trees{'ref_to_float'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -96,8 +95,7 @@ $result_trees{'ref_to_float'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -167,8 +165,7 @@ $result_trees{'ref_to_float'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -184,8 +181,7 @@ $result_trees{'ref_to_float'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -217,8 +213,7 @@ $result_trees{'ref_to_float'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -257,8 +252,7 @@ $result_trees{'ref_to_float'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
diff --git a/tp/t/results/float/simple.pl b/tp/t/results/float/simple.pl
index abc79df419..ab4857dd45 100644
--- a/tp/t/results/float/simple.pl
+++ b/tp/t/results/float/simple.pl
@@ -78,8 +78,7 @@ $result_trees{'simple'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -109,8 +108,7 @@ $result_trees{'simple'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -127,8 +125,7 @@ $result_trees{'simple'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/float/special_characters_in_float_type.pl 
b/tp/t/results/float/special_characters_in_float_type.pl
index 4e1226f5f8..a9d006ae6a 100644
--- a/tp/t/results/float/special_characters_in_float_type.pl
+++ b/tp/t/results/float/special_characters_in_float_type.pl
@@ -44,8 +44,7 @@ $result_trees{'special_characters_in_float_type'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -81,8 +80,7 @@ $result_trees{'special_characters_in_float_type'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -114,8 +112,7 @@ $result_trees{'special_characters_in_float_type'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -169,8 +166,7 @@ $result_trees{'special_characters_in_float_type'} = {
                   'cmdname' => 'var',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
@@ -201,8 +197,7 @@ $result_trees{'special_characters_in_float_type'} = {
                   'cmdname' => 'var',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
@@ -258,8 +253,7 @@ $result_trees{'special_characters_in_float_type'} = {
                           'cmdname' => 'var',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 9,
-                            'macro' => ''
+                            'line_nr' => 9
                           }
                         }
                       ],
@@ -275,8 +269,7 @@ $result_trees{'special_characters_in_float_type'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -312,8 +305,7 @@ $result_trees{'special_characters_in_float_type'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
@@ -331,8 +323,7 @@ $result_trees{'special_characters_in_float_type'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -367,8 +358,7 @@ $result_trees{'special_characters_in_float_type'} = {
                   'cmdname' => 'var',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 12,
-                    'macro' => ''
+                    'line_nr' => 12
                   }
                 }
               ],
@@ -392,8 +382,7 @@ $result_trees{'special_characters_in_float_type'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           }
         }
       ],
@@ -407,8 +396,7 @@ $result_trees{'special_characters_in_float_type'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
diff --git a/tp/t/results/formats_encodings/accent.pl 
b/tp/t/results/formats_encodings/accent.pl
index 74db69c8a8..e573837d1f 100644
--- a/tp/t/results/formats_encodings/accent.pl
+++ b/tp/t/results/formats_encodings/accent.pl
@@ -44,8 +44,7 @@ $result_trees{'accent'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -91,8 +90,7 @@ $result_trees{'accent'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -112,8 +110,7 @@ $result_trees{'accent'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -147,8 +144,7 @@ $result_trees{'accent'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -168,8 +164,7 @@ $result_trees{'accent'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -203,8 +198,7 @@ $result_trees{'accent'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -224,8 +218,7 @@ $result_trees{'accent'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -259,8 +252,7 @@ $result_trees{'accent'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -280,8 +272,7 @@ $result_trees{'accent'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -315,8 +306,7 @@ $result_trees{'accent'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -336,8 +326,7 @@ $result_trees{'accent'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -371,8 +360,7 @@ $result_trees{'accent'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -392,8 +380,7 @@ $result_trees{'accent'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -427,8 +414,7 @@ $result_trees{'accent'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -448,8 +434,7 @@ $result_trees{'accent'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -483,8 +468,7 @@ $result_trees{'accent'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -504,8 +488,7 @@ $result_trees{'accent'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -539,8 +522,7 @@ $result_trees{'accent'} = {
               'cmdname' => ',',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -560,8 +542,7 @@ $result_trees{'accent'} = {
               'cmdname' => ',',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -595,8 +576,7 @@ $result_trees{'accent'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -616,8 +596,7 @@ $result_trees{'accent'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -651,8 +630,7 @@ $result_trees{'accent'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -672,8 +650,7 @@ $result_trees{'accent'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -707,8 +684,7 @@ $result_trees{'accent'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             },
             {
@@ -728,8 +704,7 @@ $result_trees{'accent'} = {
               'cmdname' => 'H',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             },
             {
@@ -754,8 +729,7 @@ $result_trees{'accent'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             },
             {
@@ -789,8 +763,7 @@ $result_trees{'accent'} = {
               'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             },
             {
@@ -815,8 +788,7 @@ $result_trees{'accent'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             },
             {
@@ -850,8 +822,7 @@ $result_trees{'accent'} = {
               'cmdname' => 'ringaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -876,8 +847,7 @@ $result_trees{'accent'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -911,8 +881,7 @@ $result_trees{'accent'} = {
               'cmdname' => 'tieaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               }
             },
             {
@@ -946,8 +915,7 @@ $result_trees{'accent'} = {
               'cmdname' => 'u',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             },
             {
@@ -972,8 +940,7 @@ $result_trees{'accent'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             },
             {
@@ -1007,8 +974,7 @@ $result_trees{'accent'} = {
               'cmdname' => 'ubaraccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               }
             },
             {
@@ -1033,8 +999,7 @@ $result_trees{'accent'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               }
             },
             {
@@ -1068,8 +1033,7 @@ $result_trees{'accent'} = {
               'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               }
             },
             {
@@ -1094,8 +1058,7 @@ $result_trees{'accent'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               }
             },
             {
@@ -1129,8 +1092,7 @@ $result_trees{'accent'} = {
               'cmdname' => 'v',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               }
             },
             {
@@ -1155,8 +1117,7 @@ $result_trees{'accent'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               }
             },
             {
@@ -1190,8 +1151,7 @@ $result_trees{'accent'} = {
               'cmdname' => 'ogonek',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               }
             },
             {
@@ -1216,8 +1176,7 @@ $result_trees{'accent'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               }
             },
             {
@@ -1251,8 +1210,7 @@ $result_trees{'accent'} = {
               'cmdname' => 'ogonek',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             },
             {
@@ -1277,8 +1235,7 @@ $result_trees{'accent'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             },
             {
@@ -1307,8 +1264,7 @@ $result_trees{'accent'} = {
               'cmdname' => 'questiondown',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -1323,8 +1279,7 @@ $result_trees{'accent'} = {
               'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -1353,8 +1308,7 @@ $result_trees{'accent'} = {
               'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               }
             },
             {
@@ -1369,8 +1323,7 @@ $result_trees{'accent'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               }
             },
             {
@@ -1399,8 +1352,7 @@ $result_trees{'accent'} = {
               'cmdname' => 'ae',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             },
             {
@@ -1415,8 +1367,7 @@ $result_trees{'accent'} = {
               'cmdname' => 'AE',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             },
             {
@@ -1431,8 +1382,7 @@ $result_trees{'accent'} = {
               'cmdname' => 'oe',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             },
             {
@@ -1447,8 +1397,7 @@ $result_trees{'accent'} = {
               'cmdname' => 'OE',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             },
             {
@@ -1482,8 +1431,7 @@ $result_trees{'accent'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               }
             },
             {
@@ -1503,8 +1451,7 @@ $result_trees{'accent'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               }
             },
             {
@@ -1533,8 +1480,7 @@ $result_trees{'accent'} = {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 54,
-                'macro' => ''
+                'line_nr' => 54
               }
             },
             {
@@ -1549,8 +1495,7 @@ $result_trees{'accent'} = {
               'cmdname' => 'L',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 54,
-                'macro' => ''
+                'line_nr' => 54
               }
             },
             {
@@ -1579,8 +1524,7 @@ $result_trees{'accent'} = {
               'cmdname' => 'o',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -1595,8 +1539,7 @@ $result_trees{'accent'} = {
               'cmdname' => 'O',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -1625,8 +1568,7 @@ $result_trees{'accent'} = {
               'cmdname' => 'ss',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             },
             {
@@ -1655,8 +1597,7 @@ $result_trees{'accent'} = {
               'cmdname' => 'pounds',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 60,
-                'macro' => ''
+                'line_nr' => 60
               }
             },
             {
@@ -1704,8 +1645,7 @@ $result_trees{'accent'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 63,
-                        'macro' => ''
+                        'line_nr' => 63
                       }
                     }
                   ],
@@ -1715,8 +1655,7 @@ $result_trees{'accent'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 63,
-                'macro' => ''
+                'line_nr' => 63
               }
             },
             {
@@ -1754,8 +1693,7 @@ $result_trees{'accent'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
-                        'macro' => ''
+                        'line_nr' => 65
                       }
                     }
                   ],
@@ -1765,8 +1703,7 @@ $result_trees{'accent'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             },
             {
@@ -1804,8 +1741,7 @@ $result_trees{'accent'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 67,
-                        'macro' => ''
+                        'line_nr' => 67
                       }
                     }
                   ],
@@ -1815,8 +1751,7 @@ $result_trees{'accent'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 67,
-                'macro' => ''
+                'line_nr' => 67
               }
             },
             {
@@ -1854,8 +1789,7 @@ $result_trees{'accent'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 69,
-                        'macro' => ''
+                        'line_nr' => 69
                       }
                     }
                   ],
@@ -1865,8 +1799,7 @@ $result_trees{'accent'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 69,
-                'macro' => ''
+                'line_nr' => 69
               }
             },
             {
@@ -1914,8 +1847,7 @@ $result_trees{'accent'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 72,
-                        'macro' => ''
+                        'line_nr' => 72
                       }
                     }
                   ],
@@ -1925,8 +1857,7 @@ $result_trees{'accent'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 72,
-                'macro' => ''
+                'line_nr' => 72
               }
             },
             {
@@ -1964,8 +1895,7 @@ $result_trees{'accent'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 74,
-                        'macro' => ''
+                        'line_nr' => 74
                       }
                     }
                   ],
@@ -1975,8 +1905,7 @@ $result_trees{'accent'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 74,
-                'macro' => ''
+                'line_nr' => 74
               }
             },
             {
@@ -2014,8 +1943,7 @@ $result_trees{'accent'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 76,
-                        'macro' => ''
+                        'line_nr' => 76
                       }
                     }
                   ],
@@ -2025,8 +1953,7 @@ $result_trees{'accent'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 76,
-                'macro' => ''
+                'line_nr' => 76
               }
             },
             {
@@ -2064,8 +1991,7 @@ $result_trees{'accent'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 78,
-                        'macro' => ''
+                        'line_nr' => 78
                       }
                     }
                   ],
@@ -2075,8 +2001,7 @@ $result_trees{'accent'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 78,
-                'macro' => ''
+                'line_nr' => 78
               }
             },
             {
@@ -2095,8 +2020,7 @@ $result_trees{'accent'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
diff --git a/tp/t/results/formats_encodings/accent_argument_non_ascii.pl 
b/tp/t/results/formats_encodings/accent_argument_non_ascii.pl
index c08d450fb9..bb6a60a4d3 100644
--- a/tp/t/results/formats_encodings/accent_argument_non_ascii.pl
+++ b/tp/t/results/formats_encodings/accent_argument_non_ascii.pl
@@ -44,8 +44,7 @@ $result_trees{'accent_argument_non_ascii'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -81,8 +80,7 @@ $result_trees{'accent_argument_non_ascii'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -114,8 +112,7 @@ $result_trees{'accent_argument_non_ascii'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -153,8 +150,7 @@ $result_trees{'accent_argument_non_ascii'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -175,8 +171,7 @@ $result_trees{'accent_argument_non_ascii'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -197,8 +192,7 @@ $result_trees{'accent_argument_non_ascii'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
diff --git a/tp/t/results/formats_encodings/accent_enable_encoding.pl 
b/tp/t/results/formats_encodings/accent_enable_encoding.pl
index 7ae331978d..d0515509da 100644
--- a/tp/t/results/formats_encodings/accent_enable_encoding.pl
+++ b/tp/t/results/formats_encodings/accent_enable_encoding.pl
@@ -44,8 +44,7 @@ $result_trees{'accent_enable_encoding'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -91,8 +90,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -112,8 +110,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -147,8 +144,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -168,8 +164,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -203,8 +198,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -224,8 +218,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -259,8 +252,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -280,8 +272,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -315,8 +306,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -336,8 +326,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -371,8 +360,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -392,8 +380,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -427,8 +414,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -448,8 +434,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -483,8 +468,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -504,8 +488,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -539,8 +522,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => ',',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -560,8 +542,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => ',',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -595,8 +576,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -616,8 +596,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -651,8 +630,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -672,8 +650,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -707,8 +684,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             },
             {
@@ -728,8 +704,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => 'H',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             },
             {
@@ -754,8 +729,7 @@ $result_trees{'accent_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             },
             {
@@ -789,8 +763,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             },
             {
@@ -815,8 +788,7 @@ $result_trees{'accent_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             },
             {
@@ -850,8 +822,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => 'ringaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -876,8 +847,7 @@ $result_trees{'accent_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -911,8 +881,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => 'tieaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               }
             },
             {
@@ -946,8 +915,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => 'u',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             },
             {
@@ -972,8 +940,7 @@ $result_trees{'accent_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             },
             {
@@ -1007,8 +974,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => 'ubaraccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               }
             },
             {
@@ -1033,8 +999,7 @@ $result_trees{'accent_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               }
             },
             {
@@ -1068,8 +1033,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               }
             },
             {
@@ -1094,8 +1058,7 @@ $result_trees{'accent_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               }
             },
             {
@@ -1129,8 +1092,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => 'v',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               }
             },
             {
@@ -1155,8 +1117,7 @@ $result_trees{'accent_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               }
             },
             {
@@ -1190,8 +1151,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => 'ogonek',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               }
             },
             {
@@ -1216,8 +1176,7 @@ $result_trees{'accent_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               }
             },
             {
@@ -1251,8 +1210,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => 'ogonek',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             },
             {
@@ -1277,8 +1235,7 @@ $result_trees{'accent_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             },
             {
@@ -1307,8 +1264,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => 'questiondown',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -1323,8 +1279,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -1353,8 +1308,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               }
             },
             {
@@ -1369,8 +1323,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               }
             },
             {
@@ -1399,8 +1352,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => 'ae',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             },
             {
@@ -1415,8 +1367,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => 'AE',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             },
             {
@@ -1431,8 +1382,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => 'oe',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             },
             {
@@ -1447,8 +1397,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => 'OE',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             },
             {
@@ -1482,8 +1431,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               }
             },
             {
@@ -1503,8 +1451,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               }
             },
             {
@@ -1533,8 +1480,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 54,
-                'macro' => ''
+                'line_nr' => 54
               }
             },
             {
@@ -1549,8 +1495,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => 'L',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 54,
-                'macro' => ''
+                'line_nr' => 54
               }
             },
             {
@@ -1579,8 +1524,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => 'o',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -1595,8 +1539,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => 'O',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -1625,8 +1568,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => 'ss',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             },
             {
@@ -1655,8 +1597,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => 'pounds',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 60,
-                'macro' => ''
+                'line_nr' => 60
               }
             },
             {
@@ -1704,8 +1645,7 @@ $result_trees{'accent_enable_encoding'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 63,
-                        'macro' => ''
+                        'line_nr' => 63
                       }
                     }
                   ],
@@ -1715,8 +1655,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 63,
-                'macro' => ''
+                'line_nr' => 63
               }
             },
             {
@@ -1754,8 +1693,7 @@ $result_trees{'accent_enable_encoding'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
-                        'macro' => ''
+                        'line_nr' => 65
                       }
                     }
                   ],
@@ -1765,8 +1703,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             },
             {
@@ -1804,8 +1741,7 @@ $result_trees{'accent_enable_encoding'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 67,
-                        'macro' => ''
+                        'line_nr' => 67
                       }
                     }
                   ],
@@ -1815,8 +1751,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 67,
-                'macro' => ''
+                'line_nr' => 67
               }
             },
             {
@@ -1854,8 +1789,7 @@ $result_trees{'accent_enable_encoding'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 69,
-                        'macro' => ''
+                        'line_nr' => 69
                       }
                     }
                   ],
@@ -1865,8 +1799,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 69,
-                'macro' => ''
+                'line_nr' => 69
               }
             },
             {
@@ -1914,8 +1847,7 @@ $result_trees{'accent_enable_encoding'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 72,
-                        'macro' => ''
+                        'line_nr' => 72
                       }
                     }
                   ],
@@ -1925,8 +1857,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 72,
-                'macro' => ''
+                'line_nr' => 72
               }
             },
             {
@@ -1964,8 +1895,7 @@ $result_trees{'accent_enable_encoding'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 74,
-                        'macro' => ''
+                        'line_nr' => 74
                       }
                     }
                   ],
@@ -1975,8 +1905,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 74,
-                'macro' => ''
+                'line_nr' => 74
               }
             },
             {
@@ -2014,8 +1943,7 @@ $result_trees{'accent_enable_encoding'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 76,
-                        'macro' => ''
+                        'line_nr' => 76
                       }
                     }
                   ],
@@ -2025,8 +1953,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 76,
-                'macro' => ''
+                'line_nr' => 76
               }
             },
             {
@@ -2064,8 +1991,7 @@ $result_trees{'accent_enable_encoding'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 78,
-                        'macro' => ''
+                        'line_nr' => 78
                       }
                     }
                   ],
@@ -2075,8 +2001,7 @@ $result_trees{'accent_enable_encoding'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 78,
-                'macro' => ''
+                'line_nr' => 78
               }
             },
             {
@@ -2095,8 +2020,7 @@ $result_trees{'accent_enable_encoding'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
diff --git a/tp/t/results/formats_encodings/accentenc.pl 
b/tp/t/results/formats_encodings/accentenc.pl
index dd1db55aa9..f91b5f4a22 100644
--- a/tp/t/results/formats_encodings/accentenc.pl
+++ b/tp/t/results/formats_encodings/accentenc.pl
@@ -40,8 +40,7 @@ $result_trees{'accentenc'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -84,8 +83,7 @@ $result_trees{'accentenc'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -131,8 +129,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -152,8 +149,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -187,8 +183,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -208,8 +203,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -243,8 +237,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -264,8 +257,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -299,8 +291,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -320,8 +311,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -355,8 +345,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -376,8 +365,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -411,8 +399,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -432,8 +419,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -467,8 +453,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -488,8 +473,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -523,8 +507,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -544,8 +527,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -579,8 +561,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => ',',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -600,8 +581,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => ',',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -635,8 +615,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -656,8 +635,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -691,8 +669,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             },
             {
@@ -712,8 +689,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             },
             {
@@ -747,8 +723,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             },
             {
@@ -768,8 +743,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => 'H',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             },
             {
@@ -794,8 +768,7 @@ $result_trees{'accentenc'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             },
             {
@@ -829,8 +802,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -855,8 +827,7 @@ $result_trees{'accentenc'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -890,8 +861,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => 'ringaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               }
             },
             {
@@ -916,8 +886,7 @@ $result_trees{'accentenc'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               }
             },
             {
@@ -951,8 +920,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => 'tieaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             },
             {
@@ -986,8 +954,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => 'u',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               }
             },
             {
@@ -1012,8 +979,7 @@ $result_trees{'accentenc'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               }
             },
             {
@@ -1047,8 +1013,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => 'ubaraccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               }
             },
             {
@@ -1073,8 +1038,7 @@ $result_trees{'accentenc'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               }
             },
             {
@@ -1108,8 +1072,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               }
             },
             {
@@ -1134,8 +1097,7 @@ $result_trees{'accentenc'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               }
             },
             {
@@ -1169,8 +1131,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => 'v',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               }
             },
             {
@@ -1195,8 +1156,7 @@ $result_trees{'accentenc'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               }
             },
             {
@@ -1230,8 +1190,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => 'ogonek',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             },
             {
@@ -1256,8 +1215,7 @@ $result_trees{'accentenc'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             },
             {
@@ -1291,8 +1249,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => 'ogonek',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -1317,8 +1274,7 @@ $result_trees{'accentenc'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -1347,8 +1303,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => 'questiondown',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               }
             },
             {
@@ -1363,8 +1318,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               }
             },
             {
@@ -1393,8 +1347,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             },
             {
@@ -1409,8 +1362,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             },
             {
@@ -1439,8 +1391,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => 'ae',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               }
             },
             {
@@ -1455,8 +1406,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => 'AE',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               }
             },
             {
@@ -1471,8 +1421,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => 'oe',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               }
             },
             {
@@ -1487,8 +1436,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => 'OE',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               }
             },
             {
@@ -1522,8 +1470,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 54,
-                'macro' => ''
+                'line_nr' => 54
               }
             },
             {
@@ -1543,8 +1490,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 54,
-                'macro' => ''
+                'line_nr' => 54
               }
             },
             {
@@ -1573,8 +1519,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -1589,8 +1534,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => 'L',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -1619,8 +1563,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => 'o',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             },
             {
@@ -1635,8 +1578,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => 'O',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             },
             {
@@ -1665,8 +1607,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => 'ss',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 60,
-                'macro' => ''
+                'line_nr' => 60
               }
             },
             {
@@ -1695,8 +1636,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => 'pounds',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -1744,8 +1684,7 @@ $result_trees{'accentenc'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
-                        'macro' => ''
+                        'line_nr' => 65
                       }
                     }
                   ],
@@ -1755,8 +1694,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             },
             {
@@ -1794,8 +1732,7 @@ $result_trees{'accentenc'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 67,
-                        'macro' => ''
+                        'line_nr' => 67
                       }
                     }
                   ],
@@ -1805,8 +1742,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 67,
-                'macro' => ''
+                'line_nr' => 67
               }
             },
             {
@@ -1844,8 +1780,7 @@ $result_trees{'accentenc'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 69,
-                        'macro' => ''
+                        'line_nr' => 69
                       }
                     }
                   ],
@@ -1855,8 +1790,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 69,
-                'macro' => ''
+                'line_nr' => 69
               }
             },
             {
@@ -1894,8 +1828,7 @@ $result_trees{'accentenc'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 71,
-                        'macro' => ''
+                        'line_nr' => 71
                       }
                     }
                   ],
@@ -1905,8 +1838,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             },
             {
@@ -1954,8 +1886,7 @@ $result_trees{'accentenc'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 74,
-                        'macro' => ''
+                        'line_nr' => 74
                       }
                     }
                   ],
@@ -1965,8 +1896,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 74,
-                'macro' => ''
+                'line_nr' => 74
               }
             },
             {
@@ -2004,8 +1934,7 @@ $result_trees{'accentenc'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 76,
-                        'macro' => ''
+                        'line_nr' => 76
                       }
                     }
                   ],
@@ -2015,8 +1944,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 76,
-                'macro' => ''
+                'line_nr' => 76
               }
             },
             {
@@ -2054,8 +1982,7 @@ $result_trees{'accentenc'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 78,
-                        'macro' => ''
+                        'line_nr' => 78
                       }
                     }
                   ],
@@ -2065,8 +1992,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 78,
-                'macro' => ''
+                'line_nr' => 78
               }
             },
             {
@@ -2104,8 +2030,7 @@ $result_trees{'accentenc'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 80,
-                        'macro' => ''
+                        'line_nr' => 80
                       }
                     }
                   ],
@@ -2115,8 +2040,7 @@ $result_trees{'accentenc'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 80,
-                'macro' => ''
+                'line_nr' => 80
               }
             },
             {
@@ -2135,8 +2059,7 @@ $result_trees{'accentenc'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     }
   ],
diff --git a/tp/t/results/formats_encodings/accentenc_enable_encoding.pl 
b/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
index 05cdb274dd..43b5869fc5 100644
--- a/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
+++ b/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
@@ -38,8 +38,7 @@ $result_trees{'accentenc_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -79,8 +78,7 @@ $result_trees{'accentenc_enable_encoding'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -126,8 +124,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -147,8 +144,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -182,8 +178,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -203,8 +198,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -238,8 +232,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -259,8 +252,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -294,8 +286,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -315,8 +306,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -350,8 +340,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -371,8 +360,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -406,8 +394,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -427,8 +414,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -462,8 +448,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -483,8 +468,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -518,8 +502,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -539,8 +522,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -574,8 +556,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => ',',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -595,8 +576,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => ',',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -630,8 +610,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -651,8 +630,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -686,8 +664,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             },
             {
@@ -707,8 +684,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             },
             {
@@ -742,8 +718,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             },
             {
@@ -763,8 +738,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => 'H',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             },
             {
@@ -789,8 +763,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             },
             {
@@ -824,8 +797,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -850,8 +822,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -885,8 +856,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => 'ringaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               }
             },
             {
@@ -911,8 +881,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               }
             },
             {
@@ -946,8 +915,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => 'tieaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             },
             {
@@ -981,8 +949,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => 'u',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               }
             },
             {
@@ -1007,8 +974,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               }
             },
             {
@@ -1042,8 +1008,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => 'ubaraccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               }
             },
             {
@@ -1068,8 +1033,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               }
             },
             {
@@ -1103,8 +1067,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               }
             },
             {
@@ -1129,8 +1092,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               }
             },
             {
@@ -1164,8 +1126,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => 'v',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               }
             },
             {
@@ -1190,8 +1151,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               }
             },
             {
@@ -1225,8 +1185,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => 'ogonek',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             },
             {
@@ -1251,8 +1210,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             },
             {
@@ -1286,8 +1244,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => 'ogonek',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -1312,8 +1269,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -1342,8 +1298,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => 'questiondown',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               }
             },
             {
@@ -1358,8 +1313,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               }
             },
             {
@@ -1388,8 +1342,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             },
             {
@@ -1404,8 +1357,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             },
             {
@@ -1434,8 +1386,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => 'ae',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               }
             },
             {
@@ -1450,8 +1401,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => 'AE',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               }
             },
             {
@@ -1466,8 +1416,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => 'oe',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               }
             },
             {
@@ -1482,8 +1431,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => 'OE',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               }
             },
             {
@@ -1517,8 +1465,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 54,
-                'macro' => ''
+                'line_nr' => 54
               }
             },
             {
@@ -1538,8 +1485,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 54,
-                'macro' => ''
+                'line_nr' => 54
               }
             },
             {
@@ -1568,8 +1514,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -1584,8 +1529,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => 'L',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -1614,8 +1558,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => 'o',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             },
             {
@@ -1630,8 +1573,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => 'O',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             },
             {
@@ -1660,8 +1602,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => 'ss',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 60,
-                'macro' => ''
+                'line_nr' => 60
               }
             },
             {
@@ -1690,8 +1631,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => 'pounds',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -1739,8 +1679,7 @@ $result_trees{'accentenc_enable_encoding'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
-                        'macro' => ''
+                        'line_nr' => 65
                       }
                     }
                   ],
@@ -1750,8 +1689,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             },
             {
@@ -1789,8 +1727,7 @@ $result_trees{'accentenc_enable_encoding'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 67,
-                        'macro' => ''
+                        'line_nr' => 67
                       }
                     }
                   ],
@@ -1800,8 +1737,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 67,
-                'macro' => ''
+                'line_nr' => 67
               }
             },
             {
@@ -1839,8 +1775,7 @@ $result_trees{'accentenc_enable_encoding'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 69,
-                        'macro' => ''
+                        'line_nr' => 69
                       }
                     }
                   ],
@@ -1850,8 +1785,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 69,
-                'macro' => ''
+                'line_nr' => 69
               }
             },
             {
@@ -1889,8 +1823,7 @@ $result_trees{'accentenc_enable_encoding'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 71,
-                        'macro' => ''
+                        'line_nr' => 71
                       }
                     }
                   ],
@@ -1900,8 +1833,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             },
             {
@@ -1949,8 +1881,7 @@ $result_trees{'accentenc_enable_encoding'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 74,
-                        'macro' => ''
+                        'line_nr' => 74
                       }
                     }
                   ],
@@ -1960,8 +1891,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 74,
-                'macro' => ''
+                'line_nr' => 74
               }
             },
             {
@@ -1999,8 +1929,7 @@ $result_trees{'accentenc_enable_encoding'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 76,
-                        'macro' => ''
+                        'line_nr' => 76
                       }
                     }
                   ],
@@ -2010,8 +1939,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 76,
-                'macro' => ''
+                'line_nr' => 76
               }
             },
             {
@@ -2049,8 +1977,7 @@ $result_trees{'accentenc_enable_encoding'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 78,
-                        'macro' => ''
+                        'line_nr' => 78
                       }
                     }
                   ],
@@ -2060,8 +1987,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 78,
-                'macro' => ''
+                'line_nr' => 78
               }
             },
             {
@@ -2099,8 +2025,7 @@ $result_trees{'accentenc_enable_encoding'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 80,
-                        'macro' => ''
+                        'line_nr' => 80
                       }
                     }
                   ],
@@ -2110,8 +2035,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 80,
-                'macro' => ''
+                'line_nr' => 80
               }
             },
             {
@@ -2130,8 +2054,7 @@ $result_trees{'accentenc_enable_encoding'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     }
   ],
diff --git a/tp/t/results/formats_encodings/at_commands_in_refs.pl 
b/tp/t/results/formats_encodings/at_commands_in_refs.pl
index 2e1c372623..aa4a0f8b13 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs.pl
@@ -44,8 +44,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -145,8 +144,7 @@ $result_trees{'at_commands_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -257,8 +255,7 @@ $result_trees{'at_commands_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -279,8 +276,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'atchar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     },
                     {
@@ -295,8 +291,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'lbracechar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     },
                     {
@@ -311,8 +306,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'rbracechar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     },
                     {
@@ -327,8 +321,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'backslashchar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     },
                     {
@@ -343,8 +336,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'hashchar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     }
                   ],
@@ -387,8 +379,7 @@ $result_trees{'at_commands_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -409,8 +400,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'LaTeX',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     },
                     {
@@ -425,8 +415,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'TeX',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     },
                     {
@@ -441,8 +430,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'bullet',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     },
                     {
@@ -457,8 +445,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'comma',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     },
                     {
@@ -473,8 +460,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'copyright',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     },
                     {
@@ -489,8 +475,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'dots',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     },
                     {
@@ -505,8 +490,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'enddots',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     }
                   ],
@@ -553,8 +537,7 @@ $result_trees{'at_commands_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               },
               'type' => 'menu_entry'
             },
@@ -575,8 +558,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'equiv',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -591,8 +573,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'error',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -607,8 +588,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'euro',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -623,8 +603,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'exclamdown',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -639,8 +618,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'expansion',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -655,8 +633,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'minus',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     }
                   ],
@@ -701,8 +678,7 @@ $result_trees{'at_commands_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -723,8 +699,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'geq',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     },
                     {
@@ -739,8 +714,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'leq',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     },
                     {
@@ -755,8 +729,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'arrow',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     }
                   ],
@@ -795,8 +768,7 @@ $result_trees{'at_commands_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'menu_entry'
             },
@@ -817,8 +789,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'ordf',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     },
                     {
@@ -833,8 +804,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'ordm',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     },
                     {
@@ -849,8 +819,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'point',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     },
                     {
@@ -865,8 +834,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'pounds',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     },
                     {
@@ -881,8 +849,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'print',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     },
                     {
@@ -897,8 +864,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'questiondown',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     },
                     {
@@ -913,8 +879,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'registeredsymbol',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     }
                   ],
@@ -961,8 +926,7 @@ $result_trees{'at_commands_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -983,8 +947,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'result',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     },
                     {
@@ -999,8 +962,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'textdegree',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     },
                     {
@@ -1015,8 +977,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'tie',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     },
                     {
@@ -1031,8 +992,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'today',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     },
                     {
@@ -1047,8 +1007,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     }
                   ],
@@ -1091,8 +1050,7 @@ $result_trees{'at_commands_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               },
               'type' => 'menu_entry'
             },
@@ -1113,8 +1071,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     },
                     {
@@ -1129,8 +1086,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'ae',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     },
                     {
@@ -1145,8 +1101,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'oe',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     },
                     {
@@ -1161,8 +1116,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'AE',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     },
                     {
@@ -1177,8 +1131,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'OE',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     },
                     {
@@ -1193,8 +1146,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'o',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     },
                     {
@@ -1209,8 +1161,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'O',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     },
                     {
@@ -1225,8 +1176,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'ss',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     },
                     {
@@ -1241,8 +1191,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'l',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     },
                     {
@@ -1257,8 +1206,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'L',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     },
                     {
@@ -1273,8 +1221,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'DH',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     },
                     {
@@ -1289,8 +1236,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'dh',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     },
                     {
@@ -1305,8 +1251,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'TH',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     },
                     {
@@ -1321,8 +1266,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'th',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     }
                   ],
@@ -1383,8 +1327,7 @@ $result_trees{'at_commands_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               },
               'type' => 'menu_entry'
             },
@@ -1410,8 +1353,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => '"',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     },
                     {
@@ -1431,8 +1373,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     },
                     {
@@ -1456,8 +1397,7 @@ $result_trees{'at_commands_in_refs'} = {
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 14,
-                                'macro' => ''
+                                'line_nr' => 14
                               }
                             }
                           ],
@@ -1467,8 +1407,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     },
                     {
@@ -1488,8 +1427,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     },
                     {
@@ -1509,8 +1447,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => '`',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     },
                     {
@@ -1530,8 +1467,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     },
                     {
@@ -1551,8 +1487,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     },
                     {
@@ -1572,8 +1507,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     },
                     {
@@ -1593,8 +1527,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'ringaccent',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     },
                     {
@@ -1614,8 +1547,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'H',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     },
                     {
@@ -1635,8 +1567,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'ogonek',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     }
                   ],
@@ -1691,8 +1622,7 @@ $result_trees{'at_commands_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               },
               'type' => 'menu_entry'
             },
@@ -1718,8 +1648,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'dotaccent',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     },
                     {
@@ -1739,8 +1668,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'u',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     },
                     {
@@ -1760,8 +1688,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'ubaraccent',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     },
                     {
@@ -1781,8 +1708,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     },
                     {
@@ -1802,8 +1728,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     },
                     {
@@ -1823,8 +1748,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     },
                     {
@@ -1844,8 +1768,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'tieaccent',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     }
                   ],
@@ -1892,8 +1815,7 @@ $result_trees{'at_commands_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               },
               'type' => 'menu_entry'
             },
@@ -1919,8 +1841,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -1944,8 +1865,7 @@ $result_trees{'at_commands_in_refs'} = {
                               'cmdname' => '=',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 16,
-                                'macro' => ''
+                                'line_nr' => 16
                               }
                             }
                           ],
@@ -1955,8 +1875,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => '`',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -1980,8 +1899,7 @@ $result_trees{'at_commands_in_refs'} = {
                               'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 16,
-                                'macro' => ''
+                                'line_nr' => 16
                               }
                             }
                           ],
@@ -1991,8 +1909,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     }
                   ],
@@ -2031,8 +1948,7 @@ $result_trees{'at_commands_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               },
               'type' => 'menu_entry'
             },
@@ -2053,8 +1969,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'quotedblleft',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -2069,8 +1984,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'quotedblright',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -2085,8 +1999,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'quoteleft',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -2101,8 +2014,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'quoteright',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -2117,8 +2029,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'quotedblbase',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -2133,8 +2044,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'quotesinglbase',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     }
                   ],
@@ -2179,8 +2089,7 @@ $result_trees{'at_commands_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               },
               'type' => 'menu_entry'
             },
@@ -2201,8 +2110,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'guillemetleft',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       }
                     },
                     {
@@ -2217,8 +2125,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'guillemetright',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       }
                     },
                     {
@@ -2233,8 +2140,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'guillemotleft',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       }
                     },
                     {
@@ -2249,8 +2155,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'guillemotright',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       }
                     },
                     {
@@ -2265,8 +2170,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'guilsinglleft',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       }
                     },
                     {
@@ -2281,8 +2185,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'guilsinglright',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       }
                     }
                   ],
@@ -2327,8 +2230,7 @@ $result_trees{'at_commands_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               },
               'type' => 'menu_entry'
             },
@@ -2375,8 +2277,7 @@ $result_trees{'at_commands_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               },
               'type' => 'menu_entry'
             },
@@ -2415,8 +2316,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'acronym',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     },
                     {
@@ -2436,8 +2336,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'acronym',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     },
                     {
@@ -2457,8 +2356,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'acronym',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     }
                   ],
@@ -2497,8 +2395,7 @@ $result_trees{'at_commands_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               },
               'type' => 'menu_entry'
             },
@@ -2537,8 +2434,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'abbr',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 21,
-                        'macro' => ''
+                        'line_nr' => 21
                       }
                     },
                     {
@@ -2558,8 +2454,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'abbr',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 21,
-                        'macro' => ''
+                        'line_nr' => 21
                       }
                     },
                     {
@@ -2579,8 +2474,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'abbr',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 21,
-                        'macro' => ''
+                        'line_nr' => 21
                       }
                     }
                   ],
@@ -2619,8 +2513,7 @@ $result_trees{'at_commands_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               },
               'type' => 'menu_entry'
             },
@@ -2665,8 +2558,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'email',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -2692,8 +2584,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'email',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -2730,8 +2621,7 @@ $result_trees{'at_commands_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               },
               'type' => 'menu_entry'
             },
@@ -2760,8 +2650,7 @@ $result_trees{'at_commands_in_refs'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 23,
-                        'macro' => ''
+                        'line_nr' => 23
                       }
                     },
                     {
@@ -2816,8 +2705,7 @@ $result_trees{'at_commands_in_refs'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 23,
-                        'macro' => ''
+                        'line_nr' => 23
                       }
                     }
                   ],
@@ -2854,8 +2742,7 @@ $result_trees{'at_commands_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               },
               'type' => 'menu_entry'
             },
@@ -2885,8 +2772,7 @@ $result_trees{'at_commands_in_refs'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     }
                   ],
@@ -2921,8 +2807,7 @@ $result_trees{'at_commands_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               },
               'type' => 'menu_entry'
             },
@@ -2955,8 +2840,7 @@ $result_trees{'at_commands_in_refs'} = {
                               'cmdname' => 'asis',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 25,
-                                'macro' => ''
+                                'line_nr' => 25
                               }
                             }
                           ],
@@ -2966,8 +2850,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'cite',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 25,
-                        'macro' => ''
+                        'line_nr' => 25
                       }
                     },
                     {
@@ -3000,8 +2883,7 @@ $result_trees{'at_commands_in_refs'} = {
                               'cmdname' => 'b',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 25,
-                                'macro' => ''
+                                'line_nr' => 25
                               }
                             }
                           ],
@@ -3011,8 +2893,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'w',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 25,
-                        'macro' => ''
+                        'line_nr' => 25
                       }
                     },
                     {
@@ -3032,8 +2913,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'r',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 25,
-                        'macro' => ''
+                        'line_nr' => 25
                       }
                     },
                     {
@@ -3053,8 +2933,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'sc',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 25,
-                        'macro' => ''
+                        'line_nr' => 25
                       }
                     },
                     {
@@ -3074,8 +2953,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'strong',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 25,
-                        'macro' => ''
+                        'line_nr' => 25
                       }
                     },
                     {
@@ -3095,8 +2973,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 't',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 25,
-                        'macro' => ''
+                        'line_nr' => 25
                       }
                     },
                     {
@@ -3116,8 +2993,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'var',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 25,
-                        'macro' => ''
+                        'line_nr' => 25
                       }
                     },
                     {
@@ -3137,8 +3013,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'dfn',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 25,
-                        'macro' => ''
+                        'line_nr' => 25
                       }
                     },
                     {
@@ -3158,8 +3033,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'i',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 25,
-                        'macro' => ''
+                        'line_nr' => 25
                       }
                     }
                   ],
@@ -3210,8 +3084,7 @@ $result_trees{'at_commands_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               },
               'type' => 'menu_entry'
             },
@@ -3237,8 +3110,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'env',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 26,
-                        'macro' => ''
+                        'line_nr' => 26
                       }
                     },
                     {
@@ -3258,8 +3130,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 26,
-                        'macro' => ''
+                        'line_nr' => 26
                       }
                     },
                     {
@@ -3279,8 +3150,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'option',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 26,
-                        'macro' => ''
+                        'line_nr' => 26
                       }
                     },
                     {
@@ -3300,8 +3170,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'samp',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 26,
-                        'macro' => ''
+                        'line_nr' => 26
                       }
                     },
                     {
@@ -3321,8 +3190,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'command',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 26,
-                        'macro' => ''
+                        'line_nr' => 26
                       }
                     },
                     {
@@ -3342,8 +3210,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'file',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 26,
-                        'macro' => ''
+                        'line_nr' => 26
                       }
                     },
                     {
@@ -3370,8 +3237,7 @@ $result_trees{'at_commands_in_refs'} = {
                               'cmdname' => 'key',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 26,
-                                'macro' => ''
+                                'line_nr' => 26
                               }
                             }
                           ],
@@ -3381,8 +3247,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'kbd',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 26,
-                        'macro' => ''
+                        'line_nr' => 26
                       }
                     }
                   ],
@@ -3429,8 +3294,7 @@ $result_trees{'at_commands_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               },
               'type' => 'menu_entry'
             },
@@ -3459,8 +3323,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'dmn',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 27,
-                        'macro' => ''
+                        'line_nr' => 27
                       }
                     }
                   ],
@@ -3496,8 +3359,7 @@ $result_trees{'at_commands_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               },
               'type' => 'menu_entry'
             },
@@ -3523,8 +3385,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'sansserif',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       }
                     },
                     {
@@ -3544,8 +3405,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'slanted',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       }
                     }
                   ],
@@ -3582,8 +3442,7 @@ $result_trees{'at_commands_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               },
               'type' => 'menu_entry'
             },
@@ -3609,8 +3468,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'indicateurl',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 29,
-                        'macro' => ''
+                        'line_nr' => 29
                       }
                     }
                   ],
@@ -3645,8 +3503,7 @@ $result_trees{'at_commands_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               },
               'type' => 'menu_entry'
             },
@@ -3672,8 +3529,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'sub',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 30,
-                        'macro' => ''
+                        'line_nr' => 30
                       }
                     },
                     {
@@ -3693,8 +3549,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'sup',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 30,
-                        'macro' => ''
+                        'line_nr' => 30
                       }
                     }
                   ],
@@ -3731,8 +3586,7 @@ $result_trees{'at_commands_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               },
               'type' => 'menu_entry'
             },
@@ -3758,8 +3612,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'url',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 31,
-                        'macro' => ''
+                        'line_nr' => 31
                       }
                     },
                     {
@@ -3792,8 +3645,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'url',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 31,
-                        'macro' => ''
+                        'line_nr' => 31
                       }
                     },
                     {
@@ -3824,8 +3676,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'uref',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 31,
-                        'macro' => ''
+                        'line_nr' => 31
                       }
                     }
                   ],
@@ -3864,8 +3715,7 @@ $result_trees{'at_commands_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               },
               'type' => 'menu_entry'
             },
@@ -3897,15 +3747,13 @@ $result_trees{'at_commands_in_refs'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -3922,8 +3770,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -3967,8 +3814,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 34,
-        'macro' => ''
+        'line_nr' => 34
       }
     },
     {
@@ -4018,8 +3864,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 35,
-        'macro' => ''
+        'line_nr' => 35
       }
     },
     {
@@ -4099,8 +3944,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 37,
-        'macro' => ''
+        'line_nr' => 37
       }
     },
     {
@@ -4186,8 +4030,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 38,
-        'macro' => ''
+        'line_nr' => 38
       }
     },
     {
@@ -4203,8 +4046,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'atchar',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               }
             },
             {
@@ -4219,8 +4061,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'lbracechar',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               }
             },
             {
@@ -4235,8 +4076,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'rbracechar',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               }
             },
             {
@@ -4251,8 +4091,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'backslashchar',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               }
             },
             {
@@ -4267,8 +4106,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'hashchar',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               }
             }
           ],
@@ -4293,8 +4131,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 40,
-        'macro' => ''
+        'line_nr' => 40
       }
     },
     {
@@ -4310,8 +4147,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'atchar',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 41,
-                'macro' => ''
+                'line_nr' => 41
               }
             },
             {
@@ -4326,8 +4162,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'lbracechar',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 41,
-                'macro' => ''
+                'line_nr' => 41
               }
             },
             {
@@ -4342,8 +4177,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'rbracechar',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 41,
-                'macro' => ''
+                'line_nr' => 41
               }
             },
             {
@@ -4358,8 +4192,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'backslashchar',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 41,
-                'macro' => ''
+                'line_nr' => 41
               }
             },
             {
@@ -4374,8 +4207,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'hashchar',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 41,
-                'macro' => ''
+                'line_nr' => 41
               }
             }
           ],
@@ -4406,8 +4238,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 41,
-        'macro' => ''
+        'line_nr' => 41
       }
     },
     {
@@ -4423,8 +4254,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'LaTeX',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               }
             },
             {
@@ -4439,8 +4269,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'TeX',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               }
             },
             {
@@ -4455,8 +4284,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'bullet',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               }
             },
             {
@@ -4471,8 +4299,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               }
             },
             {
@@ -4487,8 +4314,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               }
             },
             {
@@ -4503,8 +4329,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               }
             },
             {
@@ -4519,8 +4344,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               }
             }
           ],
@@ -4545,8 +4369,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 43,
-        'macro' => ''
+        'line_nr' => 43
       }
     },
     {
@@ -4562,8 +4385,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'LaTeX',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             },
             {
@@ -4578,8 +4400,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'TeX',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             },
             {
@@ -4594,8 +4415,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'bullet',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             },
             {
@@ -4610,8 +4430,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             },
             {
@@ -4626,8 +4445,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             },
             {
@@ -4642,8 +4460,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             },
             {
@@ -4658,8 +4475,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             }
           ],
@@ -4690,8 +4506,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 44,
-        'macro' => ''
+        'line_nr' => 44
       }
     },
     {
@@ -4707,8 +4522,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -4723,8 +4537,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -4739,8 +4552,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'euro',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -4755,8 +4567,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -4771,8 +4582,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -4787,8 +4597,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             }
           ],
@@ -4813,8 +4622,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 46,
-        'macro' => ''
+        'line_nr' => 46
       }
     },
     {
@@ -4830,8 +4638,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               }
             },
             {
@@ -4846,8 +4653,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               }
             },
             {
@@ -4862,8 +4668,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'euro',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               }
             },
             {
@@ -4878,8 +4683,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               }
             },
             {
@@ -4894,8 +4698,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               }
             },
             {
@@ -4910,8 +4713,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               }
             }
           ],
@@ -4942,8 +4744,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 47,
-        'macro' => ''
+        'line_nr' => 47
       }
     },
     {
@@ -4959,8 +4760,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             },
             {
@@ -4975,8 +4775,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'leq',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             },
             {
@@ -4991,8 +4790,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'arrow',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             }
           ],
@@ -5017,8 +4815,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 49,
-        'macro' => ''
+        'line_nr' => 49
       }
     },
     {
@@ -5034,8 +4831,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             },
             {
@@ -5050,8 +4846,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'leq',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             },
             {
@@ -5066,8 +4861,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'arrow',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             }
           ],
@@ -5098,8 +4892,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 50,
-        'macro' => ''
+        'line_nr' => 50
       }
     },
     {
@@ -5115,8 +4908,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ordf',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               }
             },
             {
@@ -5131,8 +4923,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ordm',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               }
             },
             {
@@ -5147,8 +4938,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'point',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               }
             },
             {
@@ -5163,8 +4953,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'pounds',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               }
             },
             {
@@ -5179,8 +4968,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'print',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               }
             },
             {
@@ -5195,8 +4983,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'questiondown',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               }
             },
             {
@@ -5211,8 +4998,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               }
             }
           ],
@@ -5237,8 +5023,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 52,
-        'macro' => ''
+        'line_nr' => 52
       }
     },
     {
@@ -5254,8 +5039,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ordf',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               }
             },
             {
@@ -5270,8 +5054,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ordm',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               }
             },
             {
@@ -5286,8 +5069,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'point',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               }
             },
             {
@@ -5302,8 +5084,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'pounds',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               }
             },
             {
@@ -5318,8 +5099,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'print',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               }
             },
             {
@@ -5334,8 +5114,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'questiondown',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               }
             },
             {
@@ -5350,8 +5129,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               }
             }
           ],
@@ -5382,8 +5160,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 53,
-        'macro' => ''
+        'line_nr' => 53
       }
     },
     {
@@ -5399,8 +5176,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'result',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 55,
-                'macro' => ''
+                'line_nr' => 55
               }
             },
             {
@@ -5415,8 +5191,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'textdegree',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 55,
-                'macro' => ''
+                'line_nr' => 55
               }
             },
             {
@@ -5431,8 +5206,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'tie',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 55,
-                'macro' => ''
+                'line_nr' => 55
               }
             },
             {
@@ -5447,8 +5221,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'today',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 55,
-                'macro' => ''
+                'line_nr' => 55
               }
             },
             {
@@ -5463,8 +5236,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 55,
-                'macro' => ''
+                'line_nr' => 55
               }
             }
           ],
@@ -5489,8 +5261,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 55,
-        'macro' => ''
+        'line_nr' => 55
       }
     },
     {
@@ -5506,8 +5277,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'result',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -5522,8 +5292,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'textdegree',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -5538,8 +5307,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'tie',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -5554,8 +5322,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'today',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -5570,8 +5337,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             }
           ],
@@ -5602,8 +5368,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 56,
-        'macro' => ''
+        'line_nr' => 56
       }
     },
     {
@@ -5619,8 +5384,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             },
             {
@@ -5635,8 +5399,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ae',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             },
             {
@@ -5651,8 +5414,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'oe',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             },
             {
@@ -5667,8 +5429,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'AE',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             },
             {
@@ -5683,8 +5444,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'OE',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             },
             {
@@ -5699,8 +5459,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'o',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             },
             {
@@ -5715,8 +5474,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'O',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             },
             {
@@ -5731,8 +5489,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ss',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             },
             {
@@ -5747,8 +5504,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             },
             {
@@ -5763,8 +5519,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'L',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             },
             {
@@ -5779,8 +5534,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'DH',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             },
             {
@@ -5795,8 +5549,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'dh',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             },
             {
@@ -5811,8 +5564,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'TH',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             },
             {
@@ -5827,8 +5579,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'th',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             }
           ],
@@ -5853,8 +5604,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 58,
-        'macro' => ''
+        'line_nr' => 58
       }
     },
     {
@@ -5870,8 +5620,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             },
             {
@@ -5886,8 +5635,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ae',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             },
             {
@@ -5902,8 +5650,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'oe',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             },
             {
@@ -5918,8 +5665,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'AE',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             },
             {
@@ -5934,8 +5680,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'OE',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             },
             {
@@ -5950,8 +5695,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'o',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             },
             {
@@ -5966,8 +5710,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'O',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             },
             {
@@ -5982,8 +5725,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ss',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             },
             {
@@ -5998,8 +5740,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             },
             {
@@ -6014,8 +5755,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'L',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             },
             {
@@ -6030,8 +5770,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'DH',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             },
             {
@@ -6046,8 +5785,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'dh',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             },
             {
@@ -6062,8 +5800,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'TH',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             },
             {
@@ -6078,8 +5815,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'th',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             }
           ],
@@ -6110,8 +5846,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 59,
-        'macro' => ''
+        'line_nr' => 59
       }
     },
     {
@@ -6132,8 +5867,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -6153,8 +5887,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -6178,8 +5911,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 61,
-                        'macro' => ''
+                        'line_nr' => 61
                       }
                     }
                   ],
@@ -6189,8 +5921,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -6210,8 +5941,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -6231,8 +5961,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -6252,8 +5981,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -6273,8 +6001,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => ',',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -6294,8 +6021,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -6315,8 +6041,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ringaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -6336,8 +6061,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'H',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -6357,8 +6081,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ogonek',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             }
           ],
@@ -6383,8 +6106,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 61,
-        'macro' => ''
+        'line_nr' => 61
       }
     },
     {
@@ -6405,8 +6127,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -6426,8 +6147,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -6451,8 +6171,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 62,
-                        'macro' => ''
+                        'line_nr' => 62
                       }
                     }
                   ],
@@ -6462,8 +6181,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -6483,8 +6201,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -6504,8 +6221,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -6525,8 +6241,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -6546,8 +6261,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => ',',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -6567,8 +6281,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -6588,8 +6301,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ringaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -6609,8 +6321,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'H',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -6630,8 +6341,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ogonek',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             }
           ],
@@ -6662,8 +6372,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 62,
-        'macro' => ''
+        'line_nr' => 62
       }
     },
     {
@@ -6684,8 +6393,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             },
             {
@@ -6705,8 +6413,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'u',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             },
             {
@@ -6726,8 +6433,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ubaraccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             },
             {
@@ -6747,8 +6453,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             },
             {
@@ -6768,8 +6473,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'v',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             },
             {
@@ -6789,8 +6493,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             },
             {
@@ -6810,8 +6513,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'tieaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             }
           ],
@@ -6836,8 +6538,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 64,
-        'macro' => ''
+        'line_nr' => 64
       }
     },
     {
@@ -6858,8 +6559,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             },
             {
@@ -6879,8 +6579,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'u',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             },
             {
@@ -6900,8 +6599,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ubaraccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             },
             {
@@ -6921,8 +6619,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             },
             {
@@ -6942,8 +6639,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'v',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             },
             {
@@ -6963,8 +6659,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             },
             {
@@ -6984,8 +6679,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'tieaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             }
           ],
@@ -7016,8 +6710,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 65,
-        'macro' => ''
+        'line_nr' => 65
       }
     },
     {
@@ -7038,8 +6731,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 67,
-                'macro' => ''
+                'line_nr' => 67
               }
             },
             {
@@ -7063,8 +6755,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 67,
-                        'macro' => ''
+                        'line_nr' => 67
                       }
                     }
                   ],
@@ -7074,8 +6765,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 67,
-                'macro' => ''
+                'line_nr' => 67
               }
             },
             {
@@ -7099,8 +6789,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 67,
-                        'macro' => ''
+                        'line_nr' => 67
                       }
                     }
                   ],
@@ -7110,8 +6799,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => ',',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 67,
-                'macro' => ''
+                'line_nr' => 67
               }
             }
           ],
@@ -7136,8 +6824,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 67,
-        'macro' => ''
+        'line_nr' => 67
       }
     },
     {
@@ -7158,8 +6845,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 68,
-                'macro' => ''
+                'line_nr' => 68
               }
             },
             {
@@ -7183,8 +6869,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 68,
-                        'macro' => ''
+                        'line_nr' => 68
                       }
                     }
                   ],
@@ -7194,8 +6879,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 68,
-                'macro' => ''
+                'line_nr' => 68
               }
             },
             {
@@ -7219,8 +6903,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 68,
-                        'macro' => ''
+                        'line_nr' => 68
                       }
                     }
                   ],
@@ -7230,8 +6913,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => ',',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 68,
-                'macro' => ''
+                'line_nr' => 68
               }
             }
           ],
@@ -7262,8 +6944,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 68,
-        'macro' => ''
+        'line_nr' => 68
       }
     },
     {
@@ -7279,8 +6960,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 70,
-                'macro' => ''
+                'line_nr' => 70
               }
             },
             {
@@ -7295,8 +6975,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 70,
-                'macro' => ''
+                'line_nr' => 70
               }
             },
             {
@@ -7311,8 +6990,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'quoteleft',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 70,
-                'macro' => ''
+                'line_nr' => 70
               }
             },
             {
@@ -7327,8 +7005,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'quoteright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 70,
-                'macro' => ''
+                'line_nr' => 70
               }
             },
             {
@@ -7343,8 +7020,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'quotedblbase',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 70,
-                'macro' => ''
+                'line_nr' => 70
               }
             },
             {
@@ -7359,8 +7035,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'quotesinglbase',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 70,
-                'macro' => ''
+                'line_nr' => 70
               }
             }
           ],
@@ -7385,8 +7060,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 70,
-        'macro' => ''
+        'line_nr' => 70
       }
     },
     {
@@ -7402,8 +7076,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             },
             {
@@ -7418,8 +7091,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             },
             {
@@ -7434,8 +7106,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'quoteleft',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             },
             {
@@ -7450,8 +7121,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'quoteright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             },
             {
@@ -7466,8 +7136,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'quotedblbase',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             },
             {
@@ -7482,8 +7151,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'quotesinglbase',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             }
           ],
@@ -7514,8 +7182,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 71,
-        'macro' => ''
+        'line_nr' => 71
       }
     },
     {
@@ -7531,8 +7198,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'guillemetleft',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 73,
-                'macro' => ''
+                'line_nr' => 73
               }
             },
             {
@@ -7547,8 +7213,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'guillemetright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 73,
-                'macro' => ''
+                'line_nr' => 73
               }
             },
             {
@@ -7563,8 +7228,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'guillemotleft',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 73,
-                'macro' => ''
+                'line_nr' => 73
               }
             },
             {
@@ -7579,8 +7243,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'guillemotright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 73,
-                'macro' => ''
+                'line_nr' => 73
               }
             },
             {
@@ -7595,8 +7258,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'guilsinglleft',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 73,
-                'macro' => ''
+                'line_nr' => 73
               }
             },
             {
@@ -7611,8 +7273,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'guilsinglright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 73,
-                'macro' => ''
+                'line_nr' => 73
               }
             }
           ],
@@ -7637,8 +7298,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 73,
-        'macro' => ''
+        'line_nr' => 73
       }
     },
     {
@@ -7654,8 +7314,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'guillemetleft',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 74,
-                'macro' => ''
+                'line_nr' => 74
               }
             },
             {
@@ -7670,8 +7329,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'guillemetright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 74,
-                'macro' => ''
+                'line_nr' => 74
               }
             },
             {
@@ -7686,8 +7344,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'guillemotleft',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 74,
-                'macro' => ''
+                'line_nr' => 74
               }
             },
             {
@@ -7702,8 +7359,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'guillemotright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 74,
-                'macro' => ''
+                'line_nr' => 74
               }
             },
             {
@@ -7718,8 +7374,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'guilsinglleft',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 74,
-                'macro' => ''
+                'line_nr' => 74
               }
             },
             {
@@ -7734,8 +7389,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'guilsinglright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 74,
-                'macro' => ''
+                'line_nr' => 74
               }
             }
           ],
@@ -7766,8 +7420,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 74,
-        'macro' => ''
+        'line_nr' => 74
       }
     },
     {
@@ -7799,8 +7452,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 76,
-        'macro' => ''
+        'line_nr' => 76
       }
     },
     {
@@ -7838,8 +7490,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 77,
-        'macro' => ''
+        'line_nr' => 77
       }
     },
     {
@@ -7873,8 +7524,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 79,
-                'macro' => ''
+                'line_nr' => 79
               }
             },
             {
@@ -7894,8 +7544,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 79,
-                'macro' => ''
+                'line_nr' => 79
               }
             },
             {
@@ -7915,8 +7564,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 79,
-                'macro' => ''
+                'line_nr' => 79
               }
             }
           ],
@@ -7941,8 +7589,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 79,
-        'macro' => ''
+        'line_nr' => 79
       }
     },
     {
@@ -7976,8 +7623,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 80,
-                'macro' => ''
+                'line_nr' => 80
               }
             },
             {
@@ -7997,8 +7643,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 80,
-                'macro' => ''
+                'line_nr' => 80
               }
             },
             {
@@ -8018,8 +7663,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 80,
-                'macro' => ''
+                'line_nr' => 80
               }
             }
           ],
@@ -8050,8 +7694,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 80,
-        'macro' => ''
+        'line_nr' => 80
       }
     },
     {
@@ -8085,8 +7728,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'abbr',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 82,
-                'macro' => ''
+                'line_nr' => 82
               }
             },
             {
@@ -8106,8 +7748,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'abbr',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 82,
-                'macro' => ''
+                'line_nr' => 82
               }
             },
             {
@@ -8127,8 +7768,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'abbr',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 82,
-                'macro' => ''
+                'line_nr' => 82
               }
             }
           ],
@@ -8162,8 +7802,7 @@ $result_trees{'at_commands_in_refs'} = {
                 'cmdname' => 'ifnottex',
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 83,
-                  'macro' => ''
+                  'line_nr' => 83
                 }
               },
               'sourcemark_type' => 'expanded_conditional_command',
@@ -8184,8 +7823,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 82,
-        'macro' => ''
+        'line_nr' => 82
       }
     },
     {
@@ -8219,8 +7857,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'abbr',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 84,
-                'macro' => ''
+                'line_nr' => 84
               }
             },
             {
@@ -8240,8 +7877,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'abbr',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 84,
-                'macro' => ''
+                'line_nr' => 84
               }
             },
             {
@@ -8261,8 +7897,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'abbr',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 84,
-                'macro' => ''
+                'line_nr' => 84
               }
             }
           ],
@@ -8309,8 +7944,7 @@ $result_trees{'at_commands_in_refs'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 85,
-                  'macro' => ''
+                  'line_nr' => 85
                 }
               },
               'sourcemark_type' => 'expanded_conditional_command',
@@ -8335,8 +7969,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 84,
-        'macro' => ''
+        'line_nr' => 84
       }
     },
     {
@@ -8376,8 +8009,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 87,
-                'macro' => ''
+                'line_nr' => 87
               }
             },
             {
@@ -8403,8 +8035,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 87,
-                'macro' => ''
+                'line_nr' => 87
               }
             }
           ],
@@ -8429,8 +8060,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 87,
-        'macro' => ''
+        'line_nr' => 87
       }
     },
     {
@@ -8470,8 +8100,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 88,
-                'macro' => ''
+                'line_nr' => 88
               }
             },
             {
@@ -8497,8 +8126,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 88,
-                'macro' => ''
+                'line_nr' => 88
               }
             }
           ],
@@ -8529,8 +8157,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 88,
-        'macro' => ''
+        'line_nr' => 88
       }
     },
     {
@@ -8554,8 +8181,7 @@ $result_trees{'at_commands_in_refs'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 90,
-                'macro' => ''
+                'line_nr' => 90
               }
             },
             {
@@ -8610,8 +8236,7 @@ $result_trees{'at_commands_in_refs'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 90,
-                'macro' => ''
+                'line_nr' => 90
               }
             }
           ],
@@ -8645,8 +8270,7 @@ $result_trees{'at_commands_in_refs'} = {
                 'cmdname' => 'ifnottex',
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 91,
-                  'macro' => ''
+                  'line_nr' => 91
                 }
               },
               'sourcemark_type' => 'expanded_conditional_command',
@@ -8667,8 +8291,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 90,
-        'macro' => ''
+        'line_nr' => 90
       }
     },
     {
@@ -8692,8 +8315,7 @@ $result_trees{'at_commands_in_refs'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 92,
-                'macro' => ''
+                'line_nr' => 92
               }
             },
             {
@@ -8748,8 +8370,7 @@ $result_trees{'at_commands_in_refs'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 92,
-                'macro' => ''
+                'line_nr' => 92
               }
             }
           ],
@@ -8796,8 +8417,7 @@ $result_trees{'at_commands_in_refs'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 93,
-                  'macro' => ''
+                  'line_nr' => 93
                 }
               },
               'sourcemark_type' => 'expanded_conditional_command',
@@ -8822,8 +8442,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 92,
-        'macro' => ''
+        'line_nr' => 92
       }
     },
     {
@@ -8848,8 +8467,7 @@ $result_trees{'at_commands_in_refs'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 95,
-                'macro' => ''
+                'line_nr' => 95
               }
             }
           ],
@@ -8883,8 +8501,7 @@ $result_trees{'at_commands_in_refs'} = {
                 'cmdname' => 'ifnottex',
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 96,
-                  'macro' => ''
+                  'line_nr' => 96
                 }
               },
               'sourcemark_type' => 'expanded_conditional_command',
@@ -8905,8 +8522,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 95,
-        'macro' => ''
+        'line_nr' => 95
       }
     },
     {
@@ -8931,8 +8547,7 @@ $result_trees{'at_commands_in_refs'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 97,
-                'macro' => ''
+                'line_nr' => 97
               }
             }
           ],
@@ -8979,8 +8594,7 @@ $result_trees{'at_commands_in_refs'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 98,
-                  'macro' => ''
+                  'line_nr' => 98
                 }
               },
               'sourcemark_type' => 'expanded_conditional_command',
@@ -9005,8 +8619,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 97,
-        'macro' => ''
+        'line_nr' => 97
       }
     },
     {
@@ -9034,8 +8647,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 100,
-                        'macro' => ''
+                        'line_nr' => 100
                       }
                     }
                   ],
@@ -9045,8 +8657,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'cite',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 100,
-                'macro' => ''
+                'line_nr' => 100
               }
             },
             {
@@ -9079,8 +8690,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'b',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 100,
-                        'macro' => ''
+                        'line_nr' => 100
                       }
                     }
                   ],
@@ -9090,8 +8700,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 100,
-                'macro' => ''
+                'line_nr' => 100
               }
             },
             {
@@ -9111,8 +8720,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'r',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 100,
-                'macro' => ''
+                'line_nr' => 100
               }
             },
             {
@@ -9132,8 +8740,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 100,
-                'macro' => ''
+                'line_nr' => 100
               }
             },
             {
@@ -9153,8 +8760,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'strong',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 100,
-                'macro' => ''
+                'line_nr' => 100
               }
             },
             {
@@ -9174,8 +8780,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 't',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 100,
-                'macro' => ''
+                'line_nr' => 100
               }
             },
             {
@@ -9195,8 +8800,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 100,
-                'macro' => ''
+                'line_nr' => 100
               }
             },
             {
@@ -9216,8 +8820,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 100,
-                'macro' => ''
+                'line_nr' => 100
               }
             },
             {
@@ -9237,8 +8840,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'i',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 100,
-                'macro' => ''
+                'line_nr' => 100
               }
             }
           ],
@@ -9263,8 +8865,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 100,
-        'macro' => ''
+        'line_nr' => 100
       }
     },
     {
@@ -9292,8 +8893,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 101,
-                        'macro' => ''
+                        'line_nr' => 101
                       }
                     }
                   ],
@@ -9303,8 +8903,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'cite',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 101,
-                'macro' => ''
+                'line_nr' => 101
               }
             },
             {
@@ -9337,8 +8936,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'b',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 101,
-                        'macro' => ''
+                        'line_nr' => 101
                       }
                     }
                   ],
@@ -9348,8 +8946,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 101,
-                'macro' => ''
+                'line_nr' => 101
               }
             },
             {
@@ -9369,8 +8966,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'r',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 101,
-                'macro' => ''
+                'line_nr' => 101
               }
             },
             {
@@ -9390,8 +8986,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 101,
-                'macro' => ''
+                'line_nr' => 101
               }
             },
             {
@@ -9411,8 +9006,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'strong',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 101,
-                'macro' => ''
+                'line_nr' => 101
               }
             },
             {
@@ -9432,8 +9026,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 't',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 101,
-                'macro' => ''
+                'line_nr' => 101
               }
             },
             {
@@ -9453,8 +9046,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 101,
-                'macro' => ''
+                'line_nr' => 101
               }
             },
             {
@@ -9474,8 +9066,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 101,
-                'macro' => ''
+                'line_nr' => 101
               }
             },
             {
@@ -9495,8 +9086,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'i',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 101,
-                'macro' => ''
+                'line_nr' => 101
               }
             }
           ],
@@ -9527,8 +9117,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 101,
-        'macro' => ''
+        'line_nr' => 101
       }
     },
     {
@@ -9549,8 +9138,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'env',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 103,
-                'macro' => ''
+                'line_nr' => 103
               }
             },
             {
@@ -9570,8 +9158,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 103,
-                'macro' => ''
+                'line_nr' => 103
               }
             },
             {
@@ -9591,8 +9178,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'option',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 103,
-                'macro' => ''
+                'line_nr' => 103
               }
             },
             {
@@ -9612,8 +9198,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 103,
-                'macro' => ''
+                'line_nr' => 103
               }
             },
             {
@@ -9633,8 +9218,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'command',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 103,
-                'macro' => ''
+                'line_nr' => 103
               }
             },
             {
@@ -9654,8 +9238,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'file',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 103,
-                'macro' => ''
+                'line_nr' => 103
               }
             },
             {
@@ -9682,8 +9265,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'key',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 103,
-                        'macro' => ''
+                        'line_nr' => 103
                       }
                     }
                   ],
@@ -9693,8 +9275,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'kbd',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 103,
-                'macro' => ''
+                'line_nr' => 103
               }
             }
           ],
@@ -9719,8 +9300,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 103,
-        'macro' => ''
+        'line_nr' => 103
       }
     },
     {
@@ -9741,8 +9321,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'env',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 104,
-                'macro' => ''
+                'line_nr' => 104
               }
             },
             {
@@ -9762,8 +9341,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 104,
-                'macro' => ''
+                'line_nr' => 104
               }
             },
             {
@@ -9783,8 +9361,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'option',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 104,
-                'macro' => ''
+                'line_nr' => 104
               }
             },
             {
@@ -9804,8 +9381,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 104,
-                'macro' => ''
+                'line_nr' => 104
               }
             },
             {
@@ -9825,8 +9401,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'command',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 104,
-                'macro' => ''
+                'line_nr' => 104
               }
             },
             {
@@ -9846,8 +9421,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'file',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 104,
-                'macro' => ''
+                'line_nr' => 104
               }
             },
             {
@@ -9874,8 +9448,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'key',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 104,
-                        'macro' => ''
+                        'line_nr' => 104
                       }
                     }
                   ],
@@ -9885,8 +9458,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'kbd',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 104,
-                'macro' => ''
+                'line_nr' => 104
               }
             }
           ],
@@ -9917,8 +9489,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 104,
-        'macro' => ''
+        'line_nr' => 104
       }
     },
     {
@@ -9942,8 +9513,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'dmn',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 106,
-                'macro' => ''
+                'line_nr' => 106
               }
             }
           ],
@@ -9968,8 +9538,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 106,
-        'macro' => ''
+        'line_nr' => 106
       }
     },
     {
@@ -9993,8 +9562,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'dmn',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 107,
-                'macro' => ''
+                'line_nr' => 107
               }
             }
           ],
@@ -10025,8 +9593,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 107,
-        'macro' => ''
+        'line_nr' => 107
       }
     },
     {
@@ -10047,8 +9614,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'sansserif',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 109,
-                'macro' => ''
+                'line_nr' => 109
               }
             },
             {
@@ -10068,8 +9634,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'slanted',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 109,
-                'macro' => ''
+                'line_nr' => 109
               }
             }
           ],
@@ -10094,8 +9659,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 109,
-        'macro' => ''
+        'line_nr' => 109
       }
     },
     {
@@ -10116,8 +9680,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'sansserif',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 110,
-                'macro' => ''
+                'line_nr' => 110
               }
             },
             {
@@ -10137,8 +9700,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'slanted',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 110,
-                'macro' => ''
+                'line_nr' => 110
               }
             }
           ],
@@ -10169,8 +9731,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 110,
-        'macro' => ''
+        'line_nr' => 110
       }
     },
     {
@@ -10191,8 +9752,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'indicateurl',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 112,
-                'macro' => ''
+                'line_nr' => 112
               }
             }
           ],
@@ -10217,8 +9777,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 112,
-        'macro' => ''
+        'line_nr' => 112
       }
     },
     {
@@ -10239,8 +9798,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'indicateurl',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 113,
-                'macro' => ''
+                'line_nr' => 113
               }
             }
           ],
@@ -10271,8 +9829,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 113,
-        'macro' => ''
+        'line_nr' => 113
       }
     },
     {
@@ -10293,8 +9850,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'sub',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 115,
-                'macro' => ''
+                'line_nr' => 115
               }
             },
             {
@@ -10314,8 +9870,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'sup',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 115,
-                'macro' => ''
+                'line_nr' => 115
               }
             }
           ],
@@ -10340,8 +9895,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 115,
-        'macro' => ''
+        'line_nr' => 115
       }
     },
     {
@@ -10362,8 +9916,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'sub',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 116,
-                'macro' => ''
+                'line_nr' => 116
               }
             },
             {
@@ -10383,8 +9936,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'sup',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 116,
-                'macro' => ''
+                'line_nr' => 116
               }
             }
           ],
@@ -10415,8 +9967,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 116,
-        'macro' => ''
+        'line_nr' => 116
       }
     },
     {
@@ -10437,8 +9988,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'url',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 118,
-                'macro' => ''
+                'line_nr' => 118
               }
             },
             {
@@ -10471,8 +10021,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'url',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 118,
-                'macro' => ''
+                'line_nr' => 118
               }
             },
             {
@@ -10503,8 +10052,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'uref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 118,
-                'macro' => ''
+                'line_nr' => 118
               }
             }
           ],
@@ -10529,8 +10077,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 118,
-        'macro' => ''
+        'line_nr' => 118
       }
     },
     {
@@ -10551,8 +10098,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'url',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 119,
-                'macro' => ''
+                'line_nr' => 119
               }
             },
             {
@@ -10585,8 +10131,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'url',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 119,
-                'macro' => ''
+                'line_nr' => 119
               }
             },
             {
@@ -10617,8 +10162,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'uref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 119,
-                'macro' => ''
+                'line_nr' => 119
               }
             }
           ],
@@ -10678,8 +10222,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 121,
-                'macro' => ''
+                'line_nr' => 121
               }
             },
             {
@@ -10782,8 +10325,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 123,
-                'macro' => ''
+                'line_nr' => 123
               }
             },
             {
@@ -10813,8 +10355,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'atchar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 125,
-                        'macro' => ''
+                        'line_nr' => 125
                       }
                     },
                     {
@@ -10829,8 +10370,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'lbracechar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 125,
-                        'macro' => ''
+                        'line_nr' => 125
                       }
                     },
                     {
@@ -10845,8 +10385,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'rbracechar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 125,
-                        'macro' => ''
+                        'line_nr' => 125
                       }
                     },
                     {
@@ -10861,8 +10400,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'backslashchar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 125,
-                        'macro' => ''
+                        'line_nr' => 125
                       }
                     },
                     {
@@ -10877,8 +10415,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'hashchar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 125,
-                        'macro' => ''
+                        'line_nr' => 125
                       }
                     }
                   ],
@@ -10904,8 +10441,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 125,
-                'macro' => ''
+                'line_nr' => 125
               }
             },
             {
@@ -10935,8 +10471,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'LaTeX',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 127,
-                        'macro' => ''
+                        'line_nr' => 127
                       }
                     },
                     {
@@ -10951,8 +10486,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'TeX',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 127,
-                        'macro' => ''
+                        'line_nr' => 127
                       }
                     },
                     {
@@ -10967,8 +10501,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'bullet',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 127,
-                        'macro' => ''
+                        'line_nr' => 127
                       }
                     },
                     {
@@ -10983,8 +10516,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'comma',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 127,
-                        'macro' => ''
+                        'line_nr' => 127
                       }
                     },
                     {
@@ -10999,8 +10531,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'copyright',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 127,
-                        'macro' => ''
+                        'line_nr' => 127
                       }
                     },
                     {
@@ -11015,8 +10546,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'dots',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 127,
-                        'macro' => ''
+                        'line_nr' => 127
                       }
                     },
                     {
@@ -11031,8 +10561,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'enddots',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 127,
-                        'macro' => ''
+                        'line_nr' => 127
                       }
                     }
                   ],
@@ -11062,8 +10591,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 127,
-                'macro' => ''
+                'line_nr' => 127
               }
             },
             {
@@ -11093,8 +10621,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'equiv',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 129,
-                        'macro' => ''
+                        'line_nr' => 129
                       }
                     },
                     {
@@ -11109,8 +10636,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'error',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 129,
-                        'macro' => ''
+                        'line_nr' => 129
                       }
                     },
                     {
@@ -11125,8 +10651,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'euro',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 129,
-                        'macro' => ''
+                        'line_nr' => 129
                       }
                     },
                     {
@@ -11141,8 +10666,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'exclamdown',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 129,
-                        'macro' => ''
+                        'line_nr' => 129
                       }
                     },
                     {
@@ -11157,8 +10681,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'expansion',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 129,
-                        'macro' => ''
+                        'line_nr' => 129
                       }
                     },
                     {
@@ -11173,8 +10696,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'minus',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 129,
-                        'macro' => ''
+                        'line_nr' => 129
                       }
                     }
                   ],
@@ -11202,8 +10724,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 129,
-                'macro' => ''
+                'line_nr' => 129
               }
             },
             {
@@ -11233,8 +10754,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'geq',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 131,
-                        'macro' => ''
+                        'line_nr' => 131
                       }
                     },
                     {
@@ -11249,8 +10769,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'leq',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 131,
-                        'macro' => ''
+                        'line_nr' => 131
                       }
                     },
                     {
@@ -11265,8 +10784,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'arrow',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 131,
-                        'macro' => ''
+                        'line_nr' => 131
                       }
                     }
                   ],
@@ -11288,8 +10806,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 131,
-                'macro' => ''
+                'line_nr' => 131
               }
             },
             {
@@ -11319,8 +10836,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'ordf',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 133,
-                        'macro' => ''
+                        'line_nr' => 133
                       }
                     },
                     {
@@ -11335,8 +10851,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'ordm',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 133,
-                        'macro' => ''
+                        'line_nr' => 133
                       }
                     },
                     {
@@ -11351,8 +10866,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'point',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 133,
-                        'macro' => ''
+                        'line_nr' => 133
                       }
                     },
                     {
@@ -11367,8 +10881,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'pounds',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 133,
-                        'macro' => ''
+                        'line_nr' => 133
                       }
                     },
                     {
@@ -11383,8 +10896,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'print',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 133,
-                        'macro' => ''
+                        'line_nr' => 133
                       }
                     },
                     {
@@ -11399,8 +10911,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'questiondown',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 133,
-                        'macro' => ''
+                        'line_nr' => 133
                       }
                     },
                     {
@@ -11415,8 +10926,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'registeredsymbol',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 133,
-                        'macro' => ''
+                        'line_nr' => 133
                       }
                     }
                   ],
@@ -11446,8 +10956,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 133,
-                'macro' => ''
+                'line_nr' => 133
               }
             },
             {
@@ -11477,8 +10986,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'result',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 135,
-                        'macro' => ''
+                        'line_nr' => 135
                       }
                     },
                     {
@@ -11493,8 +11001,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'textdegree',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 135,
-                        'macro' => ''
+                        'line_nr' => 135
                       }
                     },
                     {
@@ -11509,8 +11016,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'tie',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 135,
-                        'macro' => ''
+                        'line_nr' => 135
                       }
                     },
                     {
@@ -11525,8 +11031,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'today',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 135,
-                        'macro' => ''
+                        'line_nr' => 135
                       }
                     },
                     {
@@ -11541,8 +11046,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 135,
-                        'macro' => ''
+                        'line_nr' => 135
                       }
                     }
                   ],
@@ -11568,8 +11072,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 135,
-                'macro' => ''
+                'line_nr' => 135
               }
             },
             {
@@ -11599,8 +11102,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 137,
-                        'macro' => ''
+                        'line_nr' => 137
                       }
                     },
                     {
@@ -11615,8 +11117,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'ae',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 137,
-                        'macro' => ''
+                        'line_nr' => 137
                       }
                     },
                     {
@@ -11631,8 +11132,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'oe',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 137,
-                        'macro' => ''
+                        'line_nr' => 137
                       }
                     },
                     {
@@ -11647,8 +11147,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'AE',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 137,
-                        'macro' => ''
+                        'line_nr' => 137
                       }
                     },
                     {
@@ -11663,8 +11162,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'OE',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 137,
-                        'macro' => ''
+                        'line_nr' => 137
                       }
                     },
                     {
@@ -11679,8 +11177,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'o',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 137,
-                        'macro' => ''
+                        'line_nr' => 137
                       }
                     },
                     {
@@ -11695,8 +11192,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'O',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 137,
-                        'macro' => ''
+                        'line_nr' => 137
                       }
                     },
                     {
@@ -11711,8 +11207,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'ss',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 137,
-                        'macro' => ''
+                        'line_nr' => 137
                       }
                     },
                     {
@@ -11727,8 +11222,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'l',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 137,
-                        'macro' => ''
+                        'line_nr' => 137
                       }
                     },
                     {
@@ -11743,8 +11237,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'L',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 137,
-                        'macro' => ''
+                        'line_nr' => 137
                       }
                     },
                     {
@@ -11759,8 +11252,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'DH',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 137,
-                        'macro' => ''
+                        'line_nr' => 137
                       }
                     },
                     {
@@ -11775,8 +11267,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'dh',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 137,
-                        'macro' => ''
+                        'line_nr' => 137
                       }
                     },
                     {
@@ -11791,8 +11282,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'TH',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 137,
-                        'macro' => ''
+                        'line_nr' => 137
                       }
                     },
                     {
@@ -11807,8 +11297,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'th',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 137,
-                        'macro' => ''
+                        'line_nr' => 137
                       }
                     }
                   ],
@@ -11852,8 +11341,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 137,
-                'macro' => ''
+                'line_nr' => 137
               }
             },
             {
@@ -11888,8 +11376,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => '"',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 139,
-                        'macro' => ''
+                        'line_nr' => 139
                       }
                     },
                     {
@@ -11909,8 +11396,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 139,
-                        'macro' => ''
+                        'line_nr' => 139
                       }
                     },
                     {
@@ -11934,8 +11420,7 @@ $result_trees{'at_commands_in_refs'} = {
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 139,
-                                'macro' => ''
+                                'line_nr' => 139
                               }
                             }
                           ],
@@ -11945,8 +11430,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 139,
-                        'macro' => ''
+                        'line_nr' => 139
                       }
                     },
                     {
@@ -11966,8 +11450,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 139,
-                        'macro' => ''
+                        'line_nr' => 139
                       }
                     },
                     {
@@ -11987,8 +11470,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => '`',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 139,
-                        'macro' => ''
+                        'line_nr' => 139
                       }
                     },
                     {
@@ -12008,8 +11490,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 139,
-                        'macro' => ''
+                        'line_nr' => 139
                       }
                     },
                     {
@@ -12029,8 +11510,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 139,
-                        'macro' => ''
+                        'line_nr' => 139
                       }
                     },
                     {
@@ -12050,8 +11530,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 139,
-                        'macro' => ''
+                        'line_nr' => 139
                       }
                     },
                     {
@@ -12071,8 +11550,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'ringaccent',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 139,
-                        'macro' => ''
+                        'line_nr' => 139
                       }
                     },
                     {
@@ -12092,8 +11570,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'H',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 139,
-                        'macro' => ''
+                        'line_nr' => 139
                       }
                     },
                     {
@@ -12113,8 +11590,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'ogonek',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 139,
-                        'macro' => ''
+                        'line_nr' => 139
                       }
                     }
                   ],
@@ -12152,8 +11628,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 139,
-                'macro' => ''
+                'line_nr' => 139
               }
             },
             {
@@ -12188,8 +11663,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'dotaccent',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 141,
-                        'macro' => ''
+                        'line_nr' => 141
                       }
                     },
                     {
@@ -12209,8 +11683,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'u',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 141,
-                        'macro' => ''
+                        'line_nr' => 141
                       }
                     },
                     {
@@ -12230,8 +11703,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'ubaraccent',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 141,
-                        'macro' => ''
+                        'line_nr' => 141
                       }
                     },
                     {
@@ -12251,8 +11723,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 141,
-                        'macro' => ''
+                        'line_nr' => 141
                       }
                     },
                     {
@@ -12272,8 +11743,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 141,
-                        'macro' => ''
+                        'line_nr' => 141
                       }
                     },
                     {
@@ -12293,8 +11763,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 141,
-                        'macro' => ''
+                        'line_nr' => 141
                       }
                     },
                     {
@@ -12314,8 +11783,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'tieaccent',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 141,
-                        'macro' => ''
+                        'line_nr' => 141
                       }
                     }
                   ],
@@ -12345,8 +11813,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 141,
-                'macro' => ''
+                'line_nr' => 141
               }
             },
             {
@@ -12381,8 +11848,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 143,
-                        'macro' => ''
+                        'line_nr' => 143
                       }
                     },
                     {
@@ -12406,8 +11872,7 @@ $result_trees{'at_commands_in_refs'} = {
                               'cmdname' => '=',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 143,
-                                'macro' => ''
+                                'line_nr' => 143
                               }
                             }
                           ],
@@ -12417,8 +11882,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => '`',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 143,
-                        'macro' => ''
+                        'line_nr' => 143
                       }
                     },
                     {
@@ -12442,8 +11906,7 @@ $result_trees{'at_commands_in_refs'} = {
                               'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 143,
-                                'macro' => ''
+                                'line_nr' => 143
                               }
                             }
                           ],
@@ -12453,8 +11916,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 143,
-                        'macro' => ''
+                        'line_nr' => 143
                       }
                     }
                   ],
@@ -12476,8 +11938,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 143,
-                'macro' => ''
+                'line_nr' => 143
               }
             },
             {
@@ -12507,8 +11968,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'quotedblleft',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 145,
-                        'macro' => ''
+                        'line_nr' => 145
                       }
                     },
                     {
@@ -12523,8 +11983,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'quotedblright',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 145,
-                        'macro' => ''
+                        'line_nr' => 145
                       }
                     },
                     {
@@ -12539,8 +11998,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'quoteleft',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 145,
-                        'macro' => ''
+                        'line_nr' => 145
                       }
                     },
                     {
@@ -12555,8 +12013,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'quoteright',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 145,
-                        'macro' => ''
+                        'line_nr' => 145
                       }
                     },
                     {
@@ -12571,8 +12028,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'quotedblbase',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 145,
-                        'macro' => ''
+                        'line_nr' => 145
                       }
                     },
                     {
@@ -12587,8 +12043,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'quotesinglbase',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 145,
-                        'macro' => ''
+                        'line_nr' => 145
                       }
                     }
                   ],
@@ -12616,8 +12071,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 145,
-                'macro' => ''
+                'line_nr' => 145
               }
             },
             {
@@ -12647,8 +12101,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'guillemetleft',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 147,
-                        'macro' => ''
+                        'line_nr' => 147
                       }
                     },
                     {
@@ -12663,8 +12116,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'guillemetright',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 147,
-                        'macro' => ''
+                        'line_nr' => 147
                       }
                     },
                     {
@@ -12679,8 +12131,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'guillemotleft',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 147,
-                        'macro' => ''
+                        'line_nr' => 147
                       }
                     },
                     {
@@ -12695,8 +12146,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'guillemotright',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 147,
-                        'macro' => ''
+                        'line_nr' => 147
                       }
                     },
                     {
@@ -12711,8 +12161,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'guilsinglleft',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 147,
-                        'macro' => ''
+                        'line_nr' => 147
                       }
                     },
                     {
@@ -12727,8 +12176,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'guilsinglright',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 147,
-                        'macro' => ''
+                        'line_nr' => 147
                       }
                     }
                   ],
@@ -12756,8 +12204,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 147,
-                'macro' => ''
+                'line_nr' => 147
               }
             },
             {
@@ -12796,8 +12243,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 149,
-                'macro' => ''
+                'line_nr' => 149
               }
             },
             {
@@ -12845,8 +12291,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'acronym',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 151,
-                        'macro' => ''
+                        'line_nr' => 151
                       }
                     },
                     {
@@ -12866,8 +12311,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'acronym',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 151,
-                        'macro' => ''
+                        'line_nr' => 151
                       }
                     },
                     {
@@ -12887,8 +12331,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'acronym',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 151,
-                        'macro' => ''
+                        'line_nr' => 151
                       }
                     }
                   ],
@@ -12910,8 +12353,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 151,
-                'macro' => ''
+                'line_nr' => 151
               }
             },
             {
@@ -12940,8 +12382,7 @@ $result_trees{'at_commands_in_refs'} = {
                 'cmdname' => 'ifnottex',
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 153,
-                  'macro' => ''
+                  'line_nr' => 153
                 }
               },
               'position' => 1,
@@ -12986,8 +12427,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'abbr',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 154,
-                        'macro' => ''
+                        'line_nr' => 154
                       }
                     },
                     {
@@ -13007,8 +12447,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'abbr',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 154,
-                        'macro' => ''
+                        'line_nr' => 154
                       }
                     },
                     {
@@ -13028,8 +12467,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'abbr',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 154,
-                        'macro' => ''
+                        'line_nr' => 154
                       }
                     }
                   ],
@@ -13051,8 +12489,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 154,
-                'macro' => ''
+                'line_nr' => 154
               }
             },
             {
@@ -13087,8 +12524,7 @@ $result_trees{'at_commands_in_refs'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 155,
-                      'macro' => ''
+                      'line_nr' => 155
                     }
                   },
                   'position' => 1,
@@ -13146,8 +12582,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'email',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 157,
-                        'macro' => ''
+                        'line_nr' => 157
                       }
                     },
                     {
@@ -13173,8 +12608,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'email',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 157,
-                        'macro' => ''
+                        'line_nr' => 157
                       }
                     }
                   ],
@@ -13194,8 +12628,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 157,
-                'macro' => ''
+                'line_nr' => 157
               }
             },
             {
@@ -13224,8 +12657,7 @@ $result_trees{'at_commands_in_refs'} = {
                 'cmdname' => 'ifnottex',
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 159,
-                  'macro' => ''
+                  'line_nr' => 159
                 }
               },
               'position' => 1,
@@ -13260,8 +12692,7 @@ $result_trees{'at_commands_in_refs'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 160,
-                        'macro' => ''
+                        'line_nr' => 160
                       }
                     },
                     {
@@ -13316,8 +12747,7 @@ $result_trees{'at_commands_in_refs'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 160,
-                        'macro' => ''
+                        'line_nr' => 160
                       }
                     }
                   ],
@@ -13337,8 +12767,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 160,
-                'macro' => ''
+                'line_nr' => 160
               }
             },
             {
@@ -13377,8 +12806,7 @@ $result_trees{'at_commands_in_refs'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 162,
-                        'macro' => ''
+                        'line_nr' => 162
                       }
                     }
                   ],
@@ -13396,8 +12824,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 162,
-                'macro' => ''
+                'line_nr' => 162
               }
             },
             {
@@ -13432,8 +12859,7 @@ $result_trees{'at_commands_in_refs'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 163,
-                      'macro' => ''
+                      'line_nr' => 163
                     }
                   },
                   'position' => 1,
@@ -13479,8 +12905,7 @@ $result_trees{'at_commands_in_refs'} = {
                               'cmdname' => 'asis',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 165,
-                                'macro' => ''
+                                'line_nr' => 165
                               }
                             }
                           ],
@@ -13490,8 +12915,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'cite',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 165,
-                        'macro' => ''
+                        'line_nr' => 165
                       }
                     },
                     {
@@ -13524,8 +12948,7 @@ $result_trees{'at_commands_in_refs'} = {
                               'cmdname' => 'b',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 165,
-                                'macro' => ''
+                                'line_nr' => 165
                               }
                             }
                           ],
@@ -13535,8 +12958,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'w',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 165,
-                        'macro' => ''
+                        'line_nr' => 165
                       }
                     },
                     {
@@ -13556,8 +12978,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'r',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 165,
-                        'macro' => ''
+                        'line_nr' => 165
                       }
                     },
                     {
@@ -13577,8 +12998,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'sc',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 165,
-                        'macro' => ''
+                        'line_nr' => 165
                       }
                     },
                     {
@@ -13598,8 +13018,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'strong',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 165,
-                        'macro' => ''
+                        'line_nr' => 165
                       }
                     },
                     {
@@ -13619,8 +13038,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 't',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 165,
-                        'macro' => ''
+                        'line_nr' => 165
                       }
                     },
                     {
@@ -13640,8 +13058,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'var',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 165,
-                        'macro' => ''
+                        'line_nr' => 165
                       }
                     },
                     {
@@ -13661,8 +13078,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'dfn',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 165,
-                        'macro' => ''
+                        'line_nr' => 165
                       }
                     },
                     {
@@ -13682,8 +13098,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'i',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 165,
-                        'macro' => ''
+                        'line_nr' => 165
                       }
                     }
                   ],
@@ -13717,8 +13132,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 165,
-                'macro' => ''
+                'line_nr' => 165
               }
             },
             {
@@ -13753,8 +13167,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'env',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 167,
-                        'macro' => ''
+                        'line_nr' => 167
                       }
                     },
                     {
@@ -13774,8 +13187,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 167,
-                        'macro' => ''
+                        'line_nr' => 167
                       }
                     },
                     {
@@ -13795,8 +13207,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'option',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 167,
-                        'macro' => ''
+                        'line_nr' => 167
                       }
                     },
                     {
@@ -13816,8 +13227,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'samp',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 167,
-                        'macro' => ''
+                        'line_nr' => 167
                       }
                     },
                     {
@@ -13837,8 +13247,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'command',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 167,
-                        'macro' => ''
+                        'line_nr' => 167
                       }
                     },
                     {
@@ -13858,8 +13267,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'file',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 167,
-                        'macro' => ''
+                        'line_nr' => 167
                       }
                     },
                     {
@@ -13886,8 +13294,7 @@ $result_trees{'at_commands_in_refs'} = {
                               'cmdname' => 'key',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 167,
-                                'macro' => ''
+                                'line_nr' => 167
                               }
                             }
                           ],
@@ -13897,8 +13304,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'kbd',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 167,
-                        'macro' => ''
+                        'line_nr' => 167
                       }
                     }
                   ],
@@ -13928,8 +13334,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 167,
-                'macro' => ''
+                'line_nr' => 167
               }
             },
             {
@@ -13967,8 +13372,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'dmn',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 169,
-                        'macro' => ''
+                        'line_nr' => 169
                       }
                     }
                   ],
@@ -13987,8 +13391,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 169,
-                'macro' => ''
+                'line_nr' => 169
               }
             },
             {
@@ -14023,8 +13426,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'sansserif',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 171,
-                        'macro' => ''
+                        'line_nr' => 171
                       }
                     },
                     {
@@ -14044,8 +13446,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'slanted',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 171,
-                        'macro' => ''
+                        'line_nr' => 171
                       }
                     }
                   ],
@@ -14065,8 +13466,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 171,
-                'macro' => ''
+                'line_nr' => 171
               }
             },
             {
@@ -14101,8 +13501,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'indicateurl',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 173,
-                        'macro' => ''
+                        'line_nr' => 173
                       }
                     }
                   ],
@@ -14120,8 +13519,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 173,
-                'macro' => ''
+                'line_nr' => 173
               }
             },
             {
@@ -14156,8 +13554,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'sub',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 175,
-                        'macro' => ''
+                        'line_nr' => 175
                       }
                     },
                     {
@@ -14177,8 +13574,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'sup',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 175,
-                        'macro' => ''
+                        'line_nr' => 175
                       }
                     }
                   ],
@@ -14198,8 +13594,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 175,
-                'macro' => ''
+                'line_nr' => 175
               }
             },
             {
@@ -14234,8 +13629,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'url',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 177,
-                        'macro' => ''
+                        'line_nr' => 177
                       }
                     },
                     {
@@ -14268,8 +13662,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'url',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 177,
-                        'macro' => ''
+                        'line_nr' => 177
                       }
                     },
                     {
@@ -14300,8 +13693,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => 'uref',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 177,
-                        'macro' => ''
+                        'line_nr' => 177
                       }
                     }
                   ],
@@ -14323,8 +13715,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 177,
-                'macro' => ''
+                'line_nr' => 177
               }
             },
             {
@@ -14350,8 +13741,7 @@ $result_trees{'at_commands_in_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 119,
-        'macro' => ''
+        'line_nr' => 119
       }
     },
     {
@@ -16792,7 +16182,6 @@ $result_errors{'at_commands_in_refs'} = [
 ',
     'file_name' => '',
     'line_nr' => 95,
-    'macro' => '',
     'text' => '@verb should not appear on @node line',
     'type' => 'warning'
   },
@@ -16801,7 +16190,6 @@ $result_errors{'at_commands_in_refs'} = [
 ',
     'file_name' => '',
     'line_nr' => 97,
-    'macro' => '',
     'text' => '@verb should not appear on @chapter line',
     'type' => 'warning'
   },
@@ -16810,7 +16198,6 @@ $result_errors{'at_commands_in_refs'} = [
 ',
     'file_name' => '',
     'line_nr' => 162,
-    'macro' => '',
     'text' => '@verb should not appear anywhere inside @ref',
     'type' => 'warning'
   }
@@ -16970,7 +16357,6 @@ 
$result_converted_errors{'plaintext'}->{'at_commands_in_refs'} = [
 ',
     'file_name' => '',
     'line_nr' => 92,
-    'macro' => '',
     'text' => 'could not find @image file `f--ile1.txt\' nor alternate text',
     'type' => 'warning'
   },
@@ -16979,7 +16365,6 @@ 
$result_converted_errors{'plaintext'}->{'at_commands_in_refs'} = [
 ',
     'file_name' => '',
     'line_nr' => 90,
-    'macro' => '',
     'text' => 'could not find @image file `f--ile1.txt\' nor alternate text',
     'type' => 'warning'
   },
@@ -16988,7 +16373,6 @@ 
$result_converted_errors{'plaintext'}->{'at_commands_in_refs'} = [
 ',
     'file_name' => '',
     'line_nr' => 177,
-    'macro' => '',
     'text' => '@ref node name should not contain `:\'',
     'type' => 'warning'
   }
@@ -17373,7 +16757,6 @@ 
$result_converted_errors{'html'}->{'at_commands_in_refs'} = [
 ',
     'file_name' => '',
     'line_nr' => 92,
-    'macro' => '',
     'text' => '@image file `f--ile1\' (for HTML) not found, using 
`f--ile1.jpg\'',
     'type' => 'warning'
   },
@@ -17382,7 +16765,6 @@ 
$result_converted_errors{'html'}->{'at_commands_in_refs'} = [
 ',
     'file_name' => '',
     'line_nr' => 90,
-    'macro' => '',
     'text' => '@image file `f--ile1\' (for HTML) not found, using 
`f--ile1.jpg\'',
     'type' => 'warning'
   },
@@ -17391,7 +16773,6 @@ 
$result_converted_errors{'html'}->{'at_commands_in_refs'} = [
 ',
     'file_name' => '',
     'line_nr' => 92,
-    'macro' => '',
     'text' => '@image file `f--ile1\' (for HTML) not found, using 
`f--ile1.jpg\'',
     'type' => 'warning'
   },
@@ -17400,7 +16781,6 @@ 
$result_converted_errors{'html'}->{'at_commands_in_refs'} = [
 ',
     'file_name' => '',
     'line_nr' => 160,
-    'macro' => '',
     'text' => '@image file `f--ile1\' (for HTML) not found, using 
`f--ile1.jpg\'',
     'type' => 'warning'
   }
@@ -17780,7 +17160,6 @@ 
$result_converted_errors{'docbook'}->{'at_commands_in_refs'} = [
 ',
     'file_name' => '',
     'line_nr' => 92,
-    'macro' => '',
     'text' => '@image file `f--ile1\' not found, using `f--ile1.jpg\'',
     'type' => 'warning'
   },
@@ -17789,7 +17168,6 @@ 
$result_converted_errors{'docbook'}->{'at_commands_in_refs'} = [
 ',
     'file_name' => '',
     'line_nr' => 160,
-    'macro' => '',
     'text' => '@image file `f--ile1\' not found, using `f--ile1.jpg\'',
     'type' => 'warning'
   }
@@ -17942,7 +17320,6 @@ 
$result_converted_errors{'latex_text'}->{'at_commands_in_refs'} = [
 ',
     'file_name' => '',
     'line_nr' => 92,
-    'macro' => '',
     'text' => '@image file `f--ile1\' (for LaTeX) not found',
     'type' => 'warning'
   },
@@ -17951,7 +17328,6 @@ 
$result_converted_errors{'latex_text'}->{'at_commands_in_refs'} = [
 ',
     'file_name' => '',
     'line_nr' => 90,
-    'macro' => '',
     'text' => '@image file `f--ile1\' (for LaTeX) not found',
     'type' => 'warning'
   }
@@ -18262,7 +17638,6 @@ 
$result_converted_errors{'info'}->{'at_commands_in_refs'} = [
 ',
     'file_name' => '',
     'line_nr' => 23,
-    'macro' => '',
     'text' => 'could not find @image file `f--ile1.txt\' nor alternate text',
     'type' => 'warning'
   },
@@ -18271,7 +17646,6 @@ 
$result_converted_errors{'info'}->{'at_commands_in_refs'} = [
 ',
     'file_name' => '',
     'line_nr' => 31,
-    'macro' => '',
     'text' => 'menu entry node name should not contain `:\'',
     'type' => 'warning'
   },
@@ -18280,7 +17654,6 @@ 
$result_converted_errors{'info'}->{'at_commands_in_refs'} = [
 ",
     'file_name' => '',
     'line_nr' => 43,
-    'macro' => '',
     'text' => "\@node name should not contain `,': LaTeX TeX \x{2022} , \x{a9} 
... ...",
     'type' => 'warning'
   },
@@ -18289,7 +17662,6 @@ 
$result_converted_errors{'info'}->{'at_commands_in_refs'} = [
 ',
     'file_name' => '',
     'line_nr' => 90,
-    'macro' => '',
     'text' => 'could not find @image file `f--ile1.txt\' nor alternate text',
     'type' => 'warning'
   },
@@ -18298,7 +17670,6 @@ 
$result_converted_errors{'info'}->{'at_commands_in_refs'} = [
 ',
     'file_name' => '',
     'line_nr' => 92,
-    'macro' => '',
     'text' => 'could not find @image file `f--ile1.txt\' nor alternate text',
     'type' => 'warning'
   },
@@ -18307,7 +17678,6 @@ 
$result_converted_errors{'info'}->{'at_commands_in_refs'} = [
 ',
     'file_name' => '',
     'line_nr' => 90,
-    'macro' => '',
     'text' => 'could not find @image file `f--ile1.txt\' nor alternate text',
     'type' => 'warning'
   },
@@ -18316,7 +17686,6 @@ 
$result_converted_errors{'info'}->{'at_commands_in_refs'} = [
 ',
     'file_name' => '',
     'line_nr' => 177,
-    'macro' => '',
     'text' => '@ref node name should not contain `:\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/formats_encodings/at_commands_in_refs_latin1.pl 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1.pl
index 2e1c9f2b09..e490db204a 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs_latin1.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs_latin1.pl
@@ -39,8 +39,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -72,8 +71,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -116,8 +114,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -217,8 +214,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               },
               'type' => 'menu_entry'
             },
@@ -329,8 +325,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -351,8 +346,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'atchar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     },
                     {
@@ -367,8 +361,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'lbracechar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     },
                     {
@@ -383,8 +376,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'rbracechar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     },
                     {
@@ -399,8 +391,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'backslashchar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     },
                     {
@@ -415,8 +406,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'hashchar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     }
                   ],
@@ -459,8 +449,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'menu_entry'
             },
@@ -481,8 +470,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'LaTeX',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     },
                     {
@@ -497,8 +485,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'TeX',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     },
                     {
@@ -513,8 +500,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'bullet',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     },
                     {
@@ -529,8 +515,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'comma',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     },
                     {
@@ -545,8 +530,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'copyright',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     },
                     {
@@ -561,8 +545,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'dots',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     },
                     {
@@ -577,8 +560,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'enddots',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     }
                   ],
@@ -625,8 +607,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -647,8 +628,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'equiv',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     },
                     {
@@ -663,8 +643,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'error',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     },
                     {
@@ -679,8 +658,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'euro',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     },
                     {
@@ -695,8 +673,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'exclamdown',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     },
                     {
@@ -711,8 +688,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'expansion',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     },
                     {
@@ -727,8 +703,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'minus',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     }
                   ],
@@ -773,8 +748,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               },
               'type' => 'menu_entry'
             },
@@ -795,8 +769,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'geq',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     },
                     {
@@ -811,8 +784,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'leq',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     },
                     {
@@ -827,8 +799,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'arrow',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     }
                   ],
@@ -867,8 +838,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               },
               'type' => 'menu_entry'
             },
@@ -889,8 +859,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'ordf',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     },
                     {
@@ -905,8 +874,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'ordm',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     },
                     {
@@ -921,8 +889,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'point',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     },
                     {
@@ -937,8 +904,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'pounds',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     },
                     {
@@ -953,8 +919,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'print',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     },
                     {
@@ -969,8 +934,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'questiondown',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     },
                     {
@@ -985,8 +949,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'registeredsymbol',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     }
                   ],
@@ -1033,8 +996,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               },
               'type' => 'menu_entry'
             },
@@ -1055,8 +1017,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'result',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     },
                     {
@@ -1071,8 +1032,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'textdegree',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     },
                     {
@@ -1087,8 +1047,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'tie',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     },
                     {
@@ -1103,8 +1062,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'today',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     },
                     {
@@ -1119,8 +1077,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     }
                   ],
@@ -1163,8 +1120,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               },
               'type' => 'menu_entry'
             },
@@ -1185,8 +1141,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -1201,8 +1156,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'ae',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -1217,8 +1171,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'oe',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -1233,8 +1186,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'AE',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -1249,8 +1201,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'OE',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -1265,8 +1216,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'o',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -1281,8 +1231,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'O',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -1297,8 +1246,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'ss',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -1313,8 +1261,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'l',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -1329,8 +1276,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'L',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -1345,8 +1291,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'DH',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -1361,8 +1306,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'dh',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -1377,8 +1321,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'TH',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -1393,8 +1336,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'th',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     }
                   ],
@@ -1455,8 +1397,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               },
               'type' => 'menu_entry'
             },
@@ -1482,8 +1423,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => '"',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -1503,8 +1443,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -1528,8 +1467,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 17,
-                                'macro' => ''
+                                'line_nr' => 17
                               }
                             }
                           ],
@@ -1539,8 +1477,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -1560,8 +1497,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -1581,8 +1517,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => '`',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -1602,8 +1537,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -1623,8 +1557,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -1644,8 +1577,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -1665,8 +1597,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'ringaccent',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -1686,8 +1617,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'H',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -1707,8 +1637,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'ogonek',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     }
                   ],
@@ -1763,8 +1692,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               },
               'type' => 'menu_entry'
             },
@@ -1790,8 +1718,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'dotaccent',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       }
                     },
                     {
@@ -1811,8 +1738,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'u',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       }
                     },
                     {
@@ -1832,8 +1758,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'ubaraccent',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       }
                     },
                     {
@@ -1853,8 +1778,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       }
                     },
                     {
@@ -1874,8 +1798,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       }
                     },
                     {
@@ -1895,8 +1818,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       }
                     },
                     {
@@ -1916,8 +1838,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'tieaccent',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       }
                     }
                   ],
@@ -1964,8 +1885,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               },
               'type' => 'menu_entry'
             },
@@ -1991,8 +1911,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 19,
-                        'macro' => ''
+                        'line_nr' => 19
                       }
                     },
                     {
@@ -2016,8 +1935,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                               'cmdname' => '=',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 19,
-                                'macro' => ''
+                                'line_nr' => 19
                               }
                             }
                           ],
@@ -2027,8 +1945,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => '`',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 19,
-                        'macro' => ''
+                        'line_nr' => 19
                       }
                     },
                     {
@@ -2052,8 +1969,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                               'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 19,
-                                'macro' => ''
+                                'line_nr' => 19
                               }
                             }
                           ],
@@ -2063,8 +1979,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 19,
-                        'macro' => ''
+                        'line_nr' => 19
                       }
                     }
                   ],
@@ -2103,8 +2018,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               },
               'type' => 'menu_entry'
             },
@@ -2125,8 +2039,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'quotedblleft',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     },
                     {
@@ -2141,8 +2054,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'quotedblright',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     },
                     {
@@ -2157,8 +2069,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'quoteleft',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     },
                     {
@@ -2173,8 +2084,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'quoteright',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     },
                     {
@@ -2189,8 +2099,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'quotedblbase',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     },
                     {
@@ -2205,8 +2114,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'quotesinglbase',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     }
                   ],
@@ -2251,8 +2159,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               },
               'type' => 'menu_entry'
             },
@@ -2273,8 +2180,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'guillemetleft',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 21,
-                        'macro' => ''
+                        'line_nr' => 21
                       }
                     },
                     {
@@ -2289,8 +2195,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'guillemetright',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 21,
-                        'macro' => ''
+                        'line_nr' => 21
                       }
                     },
                     {
@@ -2305,8 +2210,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'guillemotleft',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 21,
-                        'macro' => ''
+                        'line_nr' => 21
                       }
                     },
                     {
@@ -2321,8 +2225,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'guillemotright',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 21,
-                        'macro' => ''
+                        'line_nr' => 21
                       }
                     },
                     {
@@ -2337,8 +2240,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'guilsinglleft',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 21,
-                        'macro' => ''
+                        'line_nr' => 21
                       }
                     },
                     {
@@ -2353,8 +2255,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'guilsinglright',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 21,
-                        'macro' => ''
+                        'line_nr' => 21
                       }
                     }
                   ],
@@ -2399,8 +2300,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               },
               'type' => 'menu_entry'
             },
@@ -2447,8 +2347,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               },
               'type' => 'menu_entry'
             },
@@ -2487,8 +2386,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'acronym',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 23,
-                        'macro' => ''
+                        'line_nr' => 23
                       }
                     },
                     {
@@ -2508,8 +2406,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'acronym',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 23,
-                        'macro' => ''
+                        'line_nr' => 23
                       }
                     },
                     {
@@ -2529,8 +2426,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'acronym',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 23,
-                        'macro' => ''
+                        'line_nr' => 23
                       }
                     }
                   ],
@@ -2569,8 +2465,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               },
               'type' => 'menu_entry'
             },
@@ -2609,8 +2504,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'abbr',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -2630,8 +2524,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'abbr',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -2651,8 +2544,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'abbr',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     }
                   ],
@@ -2691,8 +2583,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               },
               'type' => 'menu_entry'
             },
@@ -2737,8 +2628,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'email',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 25,
-                        'macro' => ''
+                        'line_nr' => 25
                       }
                     },
                     {
@@ -2764,8 +2654,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'email',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 25,
-                        'macro' => ''
+                        'line_nr' => 25
                       }
                     }
                   ],
@@ -2802,8 +2691,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               },
               'type' => 'menu_entry'
             },
@@ -2832,8 +2720,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 26,
-                        'macro' => ''
+                        'line_nr' => 26
                       }
                     },
                     {
@@ -2888,8 +2775,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 26,
-                        'macro' => ''
+                        'line_nr' => 26
                       }
                     }
                   ],
@@ -2926,8 +2812,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               },
               'type' => 'menu_entry'
             },
@@ -2957,8 +2842,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 27,
-                        'macro' => ''
+                        'line_nr' => 27
                       }
                     }
                   ],
@@ -2993,8 +2877,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               },
               'type' => 'menu_entry'
             },
@@ -3027,8 +2910,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                               'cmdname' => 'asis',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 28,
-                                'macro' => ''
+                                'line_nr' => 28
                               }
                             }
                           ],
@@ -3038,8 +2920,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'cite',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       }
                     },
                     {
@@ -3072,8 +2953,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                               'cmdname' => 'b',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 28,
-                                'macro' => ''
+                                'line_nr' => 28
                               }
                             }
                           ],
@@ -3083,8 +2963,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'w',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       }
                     },
                     {
@@ -3104,8 +2983,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'r',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       }
                     },
                     {
@@ -3125,8 +3003,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'sc',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       }
                     },
                     {
@@ -3146,8 +3023,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'strong',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       }
                     },
                     {
@@ -3167,8 +3043,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 't',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       }
                     },
                     {
@@ -3188,8 +3063,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'var',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       }
                     },
                     {
@@ -3209,8 +3083,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'dfn',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       }
                     },
                     {
@@ -3230,8 +3103,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'i',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       }
                     }
                   ],
@@ -3282,8 +3154,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               },
               'type' => 'menu_entry'
             },
@@ -3309,8 +3180,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'env',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 29,
-                        'macro' => ''
+                        'line_nr' => 29
                       }
                     },
                     {
@@ -3330,8 +3200,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 29,
-                        'macro' => ''
+                        'line_nr' => 29
                       }
                     },
                     {
@@ -3351,8 +3220,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'option',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 29,
-                        'macro' => ''
+                        'line_nr' => 29
                       }
                     },
                     {
@@ -3372,8 +3240,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'samp',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 29,
-                        'macro' => ''
+                        'line_nr' => 29
                       }
                     },
                     {
@@ -3393,8 +3260,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'command',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 29,
-                        'macro' => ''
+                        'line_nr' => 29
                       }
                     },
                     {
@@ -3414,8 +3280,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'file',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 29,
-                        'macro' => ''
+                        'line_nr' => 29
                       }
                     },
                     {
@@ -3442,8 +3307,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                               'cmdname' => 'key',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 29,
-                                'macro' => ''
+                                'line_nr' => 29
                               }
                             }
                           ],
@@ -3453,8 +3317,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'kbd',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 29,
-                        'macro' => ''
+                        'line_nr' => 29
                       }
                     }
                   ],
@@ -3501,8 +3364,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               },
               'type' => 'menu_entry'
             },
@@ -3531,8 +3393,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'dmn',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 30,
-                        'macro' => ''
+                        'line_nr' => 30
                       }
                     }
                   ],
@@ -3568,8 +3429,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               },
               'type' => 'menu_entry'
             },
@@ -3595,8 +3455,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'sansserif',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 31,
-                        'macro' => ''
+                        'line_nr' => 31
                       }
                     },
                     {
@@ -3616,8 +3475,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'slanted',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 31,
-                        'macro' => ''
+                        'line_nr' => 31
                       }
                     }
                   ],
@@ -3654,8 +3512,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               },
               'type' => 'menu_entry'
             },
@@ -3681,8 +3538,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'indicateurl',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 32,
-                        'macro' => ''
+                        'line_nr' => 32
                       }
                     }
                   ],
@@ -3717,8 +3573,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               },
               'type' => 'menu_entry'
             },
@@ -3744,8 +3599,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'sub',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 33,
-                        'macro' => ''
+                        'line_nr' => 33
                       }
                     },
                     {
@@ -3765,8 +3619,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'sup',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 33,
-                        'macro' => ''
+                        'line_nr' => 33
                       }
                     }
                   ],
@@ -3803,8 +3656,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               },
               'type' => 'menu_entry'
             },
@@ -3830,8 +3682,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'url',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 34,
-                        'macro' => ''
+                        'line_nr' => 34
                       }
                     },
                     {
@@ -3864,8 +3715,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'url',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 34,
-                        'macro' => ''
+                        'line_nr' => 34
                       }
                     },
                     {
@@ -3896,8 +3746,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'uref',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 34,
-                        'macro' => ''
+                        'line_nr' => 34
                       }
                     }
                   ],
@@ -3936,8 +3785,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               },
               'type' => 'menu_entry'
             },
@@ -3969,15 +3817,13 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -3994,8 +3840,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -4039,8 +3884,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 37,
-        'macro' => ''
+        'line_nr' => 37
       }
     },
     {
@@ -4090,8 +3934,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 38,
-        'macro' => ''
+        'line_nr' => 38
       }
     },
     {
@@ -4171,8 +4014,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 40,
-        'macro' => ''
+        'line_nr' => 40
       }
     },
     {
@@ -4258,8 +4100,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 41,
-        'macro' => ''
+        'line_nr' => 41
       }
     },
     {
@@ -4275,8 +4116,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'atchar',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               }
             },
             {
@@ -4291,8 +4131,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'lbracechar',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               }
             },
             {
@@ -4307,8 +4146,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'rbracechar',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               }
             },
             {
@@ -4323,8 +4161,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'backslashchar',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               }
             },
             {
@@ -4339,8 +4176,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'hashchar',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               }
             }
           ],
@@ -4365,8 +4201,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 43,
-        'macro' => ''
+        'line_nr' => 43
       }
     },
     {
@@ -4382,8 +4217,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'atchar',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             },
             {
@@ -4398,8 +4232,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'lbracechar',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             },
             {
@@ -4414,8 +4247,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'rbracechar',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             },
             {
@@ -4430,8 +4262,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'backslashchar',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             },
             {
@@ -4446,8 +4277,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'hashchar',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             }
           ],
@@ -4478,8 +4308,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 44,
-        'macro' => ''
+        'line_nr' => 44
       }
     },
     {
@@ -4495,8 +4324,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'LaTeX',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -4511,8 +4339,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'TeX',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -4527,8 +4354,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'bullet',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -4543,8 +4369,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -4559,8 +4384,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -4575,8 +4399,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -4591,8 +4414,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             }
           ],
@@ -4617,8 +4439,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 46,
-        'macro' => ''
+        'line_nr' => 46
       }
     },
     {
@@ -4634,8 +4455,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'LaTeX',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               }
             },
             {
@@ -4650,8 +4470,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'TeX',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               }
             },
             {
@@ -4666,8 +4485,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'bullet',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               }
             },
             {
@@ -4682,8 +4500,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               }
             },
             {
@@ -4698,8 +4515,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               }
             },
             {
@@ -4714,8 +4530,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               }
             },
             {
@@ -4730,8 +4545,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               }
             }
           ],
@@ -4762,8 +4576,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 47,
-        'macro' => ''
+        'line_nr' => 47
       }
     },
     {
@@ -4779,8 +4592,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             },
             {
@@ -4795,8 +4607,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             },
             {
@@ -4811,8 +4622,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'euro',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             },
             {
@@ -4827,8 +4637,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             },
             {
@@ -4843,8 +4652,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             },
             {
@@ -4859,8 +4667,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             }
           ],
@@ -4885,8 +4692,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 49,
-        'macro' => ''
+        'line_nr' => 49
       }
     },
     {
@@ -4902,8 +4708,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             },
             {
@@ -4918,8 +4723,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             },
             {
@@ -4934,8 +4738,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'euro',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             },
             {
@@ -4950,8 +4753,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             },
             {
@@ -4966,8 +4768,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             },
             {
@@ -4982,8 +4783,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             }
           ],
@@ -5014,8 +4814,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 50,
-        'macro' => ''
+        'line_nr' => 50
       }
     },
     {
@@ -5031,8 +4830,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               }
             },
             {
@@ -5047,8 +4845,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'leq',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               }
             },
             {
@@ -5063,8 +4860,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'arrow',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               }
             }
           ],
@@ -5089,8 +4885,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 52,
-        'macro' => ''
+        'line_nr' => 52
       }
     },
     {
@@ -5106,8 +4901,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               }
             },
             {
@@ -5122,8 +4916,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'leq',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               }
             },
             {
@@ -5138,8 +4931,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'arrow',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               }
             }
           ],
@@ -5170,8 +4962,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 53,
-        'macro' => ''
+        'line_nr' => 53
       }
     },
     {
@@ -5187,8 +4978,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ordf',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 55,
-                'macro' => ''
+                'line_nr' => 55
               }
             },
             {
@@ -5203,8 +4993,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ordm',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 55,
-                'macro' => ''
+                'line_nr' => 55
               }
             },
             {
@@ -5219,8 +5008,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'point',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 55,
-                'macro' => ''
+                'line_nr' => 55
               }
             },
             {
@@ -5235,8 +5023,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'pounds',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 55,
-                'macro' => ''
+                'line_nr' => 55
               }
             },
             {
@@ -5251,8 +5038,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'print',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 55,
-                'macro' => ''
+                'line_nr' => 55
               }
             },
             {
@@ -5267,8 +5053,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'questiondown',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 55,
-                'macro' => ''
+                'line_nr' => 55
               }
             },
             {
@@ -5283,8 +5068,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 55,
-                'macro' => ''
+                'line_nr' => 55
               }
             }
           ],
@@ -5309,8 +5093,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 55,
-        'macro' => ''
+        'line_nr' => 55
       }
     },
     {
@@ -5326,8 +5109,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ordf',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -5342,8 +5124,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ordm',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -5358,8 +5139,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'point',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -5374,8 +5154,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'pounds',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -5390,8 +5169,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'print',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -5406,8 +5184,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'questiondown',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -5422,8 +5199,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             }
           ],
@@ -5454,8 +5230,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 56,
-        'macro' => ''
+        'line_nr' => 56
       }
     },
     {
@@ -5471,8 +5246,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'result',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             },
             {
@@ -5487,8 +5261,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'textdegree',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             },
             {
@@ -5503,8 +5276,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'tie',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             },
             {
@@ -5519,8 +5291,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'today',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             },
             {
@@ -5535,8 +5306,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             }
           ],
@@ -5561,8 +5331,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 58,
-        'macro' => ''
+        'line_nr' => 58
       }
     },
     {
@@ -5578,8 +5347,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'result',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             },
             {
@@ -5594,8 +5362,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'textdegree',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             },
             {
@@ -5610,8 +5377,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'tie',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             },
             {
@@ -5626,8 +5392,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'today',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             },
             {
@@ -5642,8 +5407,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             }
           ],
@@ -5674,8 +5438,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 59,
-        'macro' => ''
+        'line_nr' => 59
       }
     },
     {
@@ -5691,8 +5454,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -5707,8 +5469,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ae',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -5723,8 +5484,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'oe',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -5739,8 +5499,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'AE',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -5755,8 +5514,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'OE',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -5771,8 +5529,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'o',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -5787,8 +5544,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'O',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -5803,8 +5559,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ss',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -5819,8 +5574,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -5835,8 +5589,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'L',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -5851,8 +5604,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'DH',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -5867,8 +5619,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'dh',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -5883,8 +5634,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'TH',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -5899,8 +5649,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'th',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             }
           ],
@@ -5925,8 +5674,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 61,
-        'macro' => ''
+        'line_nr' => 61
       }
     },
     {
@@ -5942,8 +5690,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -5958,8 +5705,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ae',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -5974,8 +5720,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'oe',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -5990,8 +5735,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'AE',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -6006,8 +5750,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'OE',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -6022,8 +5765,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'o',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -6038,8 +5780,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'O',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -6054,8 +5795,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ss',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -6070,8 +5810,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -6086,8 +5825,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'L',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -6102,8 +5840,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'DH',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -6118,8 +5855,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'dh',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -6134,8 +5870,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'TH',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -6150,8 +5885,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'th',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             }
           ],
@@ -6182,8 +5916,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 62,
-        'macro' => ''
+        'line_nr' => 62
       }
     },
     {
@@ -6204,8 +5937,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             },
             {
@@ -6225,8 +5957,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             },
             {
@@ -6250,8 +5981,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 64,
-                        'macro' => ''
+                        'line_nr' => 64
                       }
                     }
                   ],
@@ -6261,8 +5991,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             },
             {
@@ -6282,8 +6011,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             },
             {
@@ -6303,8 +6031,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             },
             {
@@ -6324,8 +6051,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             },
             {
@@ -6345,8 +6071,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => ',',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             },
             {
@@ -6366,8 +6091,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             },
             {
@@ -6387,8 +6111,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ringaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             },
             {
@@ -6408,8 +6131,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'H',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             },
             {
@@ -6429,8 +6151,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ogonek',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             }
           ],
@@ -6455,8 +6176,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 64,
-        'macro' => ''
+        'line_nr' => 64
       }
     },
     {
@@ -6477,8 +6197,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             },
             {
@@ -6498,8 +6217,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             },
             {
@@ -6523,8 +6241,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
-                        'macro' => ''
+                        'line_nr' => 65
                       }
                     }
                   ],
@@ -6534,8 +6251,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             },
             {
@@ -6555,8 +6271,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             },
             {
@@ -6576,8 +6291,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             },
             {
@@ -6597,8 +6311,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             },
             {
@@ -6618,8 +6331,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => ',',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             },
             {
@@ -6639,8 +6351,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             },
             {
@@ -6660,8 +6371,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ringaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             },
             {
@@ -6681,8 +6391,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'H',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             },
             {
@@ -6702,8 +6411,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ogonek',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             }
           ],
@@ -6734,8 +6442,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 65,
-        'macro' => ''
+        'line_nr' => 65
       }
     },
     {
@@ -6756,8 +6463,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 67,
-                'macro' => ''
+                'line_nr' => 67
               }
             },
             {
@@ -6777,8 +6483,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'u',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 67,
-                'macro' => ''
+                'line_nr' => 67
               }
             },
             {
@@ -6798,8 +6503,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ubaraccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 67,
-                'macro' => ''
+                'line_nr' => 67
               }
             },
             {
@@ -6819,8 +6523,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 67,
-                'macro' => ''
+                'line_nr' => 67
               }
             },
             {
@@ -6840,8 +6543,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'v',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 67,
-                'macro' => ''
+                'line_nr' => 67
               }
             },
             {
@@ -6861,8 +6563,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 67,
-                'macro' => ''
+                'line_nr' => 67
               }
             },
             {
@@ -6882,8 +6583,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'tieaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 67,
-                'macro' => ''
+                'line_nr' => 67
               }
             }
           ],
@@ -6908,8 +6608,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 67,
-        'macro' => ''
+        'line_nr' => 67
       }
     },
     {
@@ -6930,8 +6629,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 68,
-                'macro' => ''
+                'line_nr' => 68
               }
             },
             {
@@ -6951,8 +6649,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'u',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 68,
-                'macro' => ''
+                'line_nr' => 68
               }
             },
             {
@@ -6972,8 +6669,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ubaraccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 68,
-                'macro' => ''
+                'line_nr' => 68
               }
             },
             {
@@ -6993,8 +6689,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 68,
-                'macro' => ''
+                'line_nr' => 68
               }
             },
             {
@@ -7014,8 +6709,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'v',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 68,
-                'macro' => ''
+                'line_nr' => 68
               }
             },
             {
@@ -7035,8 +6729,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 68,
-                'macro' => ''
+                'line_nr' => 68
               }
             },
             {
@@ -7056,8 +6749,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'tieaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 68,
-                'macro' => ''
+                'line_nr' => 68
               }
             }
           ],
@@ -7088,8 +6780,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 68,
-        'macro' => ''
+        'line_nr' => 68
       }
     },
     {
@@ -7110,8 +6801,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 70,
-                'macro' => ''
+                'line_nr' => 70
               }
             },
             {
@@ -7135,8 +6825,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 70,
-                        'macro' => ''
+                        'line_nr' => 70
                       }
                     }
                   ],
@@ -7146,8 +6835,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 70,
-                'macro' => ''
+                'line_nr' => 70
               }
             },
             {
@@ -7171,8 +6859,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 70,
-                        'macro' => ''
+                        'line_nr' => 70
                       }
                     }
                   ],
@@ -7182,8 +6869,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => ',',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 70,
-                'macro' => ''
+                'line_nr' => 70
               }
             }
           ],
@@ -7208,8 +6894,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 70,
-        'macro' => ''
+        'line_nr' => 70
       }
     },
     {
@@ -7230,8 +6915,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             },
             {
@@ -7255,8 +6939,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 71,
-                        'macro' => ''
+                        'line_nr' => 71
                       }
                     }
                   ],
@@ -7266,8 +6949,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             },
             {
@@ -7291,8 +6973,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 71,
-                        'macro' => ''
+                        'line_nr' => 71
                       }
                     }
                   ],
@@ -7302,8 +6983,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => ',',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             }
           ],
@@ -7334,8 +7014,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 71,
-        'macro' => ''
+        'line_nr' => 71
       }
     },
     {
@@ -7351,8 +7030,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 73,
-                'macro' => ''
+                'line_nr' => 73
               }
             },
             {
@@ -7367,8 +7045,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 73,
-                'macro' => ''
+                'line_nr' => 73
               }
             },
             {
@@ -7383,8 +7060,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'quoteleft',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 73,
-                'macro' => ''
+                'line_nr' => 73
               }
             },
             {
@@ -7399,8 +7075,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'quoteright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 73,
-                'macro' => ''
+                'line_nr' => 73
               }
             },
             {
@@ -7415,8 +7090,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'quotedblbase',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 73,
-                'macro' => ''
+                'line_nr' => 73
               }
             },
             {
@@ -7431,8 +7105,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'quotesinglbase',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 73,
-                'macro' => ''
+                'line_nr' => 73
               }
             }
           ],
@@ -7457,8 +7130,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 73,
-        'macro' => ''
+        'line_nr' => 73
       }
     },
     {
@@ -7474,8 +7146,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 74,
-                'macro' => ''
+                'line_nr' => 74
               }
             },
             {
@@ -7490,8 +7161,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 74,
-                'macro' => ''
+                'line_nr' => 74
               }
             },
             {
@@ -7506,8 +7176,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'quoteleft',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 74,
-                'macro' => ''
+                'line_nr' => 74
               }
             },
             {
@@ -7522,8 +7191,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'quoteright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 74,
-                'macro' => ''
+                'line_nr' => 74
               }
             },
             {
@@ -7538,8 +7206,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'quotedblbase',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 74,
-                'macro' => ''
+                'line_nr' => 74
               }
             },
             {
@@ -7554,8 +7221,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'quotesinglbase',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 74,
-                'macro' => ''
+                'line_nr' => 74
               }
             }
           ],
@@ -7586,8 +7252,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 74,
-        'macro' => ''
+        'line_nr' => 74
       }
     },
     {
@@ -7603,8 +7268,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'guillemetleft',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 76,
-                'macro' => ''
+                'line_nr' => 76
               }
             },
             {
@@ -7619,8 +7283,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'guillemetright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 76,
-                'macro' => ''
+                'line_nr' => 76
               }
             },
             {
@@ -7635,8 +7298,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'guillemotleft',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 76,
-                'macro' => ''
+                'line_nr' => 76
               }
             },
             {
@@ -7651,8 +7313,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'guillemotright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 76,
-                'macro' => ''
+                'line_nr' => 76
               }
             },
             {
@@ -7667,8 +7328,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'guilsinglleft',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 76,
-                'macro' => ''
+                'line_nr' => 76
               }
             },
             {
@@ -7683,8 +7343,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'guilsinglright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 76,
-                'macro' => ''
+                'line_nr' => 76
               }
             }
           ],
@@ -7709,8 +7368,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 76,
-        'macro' => ''
+        'line_nr' => 76
       }
     },
     {
@@ -7726,8 +7384,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'guillemetleft',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 77,
-                'macro' => ''
+                'line_nr' => 77
               }
             },
             {
@@ -7742,8 +7399,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'guillemetright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 77,
-                'macro' => ''
+                'line_nr' => 77
               }
             },
             {
@@ -7758,8 +7414,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'guillemotleft',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 77,
-                'macro' => ''
+                'line_nr' => 77
               }
             },
             {
@@ -7774,8 +7429,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'guillemotright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 77,
-                'macro' => ''
+                'line_nr' => 77
               }
             },
             {
@@ -7790,8 +7444,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'guilsinglleft',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 77,
-                'macro' => ''
+                'line_nr' => 77
               }
             },
             {
@@ -7806,8 +7459,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'guilsinglright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 77,
-                'macro' => ''
+                'line_nr' => 77
               }
             }
           ],
@@ -7838,8 +7490,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 77,
-        'macro' => ''
+        'line_nr' => 77
       }
     },
     {
@@ -7871,8 +7522,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 79,
-        'macro' => ''
+        'line_nr' => 79
       }
     },
     {
@@ -7910,8 +7560,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 80,
-        'macro' => ''
+        'line_nr' => 80
       }
     },
     {
@@ -7945,8 +7594,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 82,
-                'macro' => ''
+                'line_nr' => 82
               }
             },
             {
@@ -7966,8 +7614,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 82,
-                'macro' => ''
+                'line_nr' => 82
               }
             },
             {
@@ -7987,8 +7634,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 82,
-                'macro' => ''
+                'line_nr' => 82
               }
             }
           ],
@@ -8013,8 +7659,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 82,
-        'macro' => ''
+        'line_nr' => 82
       }
     },
     {
@@ -8048,8 +7693,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 83,
-                'macro' => ''
+                'line_nr' => 83
               }
             },
             {
@@ -8069,8 +7713,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 83,
-                'macro' => ''
+                'line_nr' => 83
               }
             },
             {
@@ -8090,8 +7733,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 83,
-                'macro' => ''
+                'line_nr' => 83
               }
             }
           ],
@@ -8122,8 +7764,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 83,
-        'macro' => ''
+        'line_nr' => 83
       }
     },
     {
@@ -8157,8 +7798,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'abbr',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 85,
-                'macro' => ''
+                'line_nr' => 85
               }
             },
             {
@@ -8178,8 +7818,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'abbr',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 85,
-                'macro' => ''
+                'line_nr' => 85
               }
             },
             {
@@ -8199,8 +7838,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'abbr',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 85,
-                'macro' => ''
+                'line_nr' => 85
               }
             }
           ],
@@ -8234,8 +7872,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                 'cmdname' => 'ifnottex',
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 86,
-                  'macro' => ''
+                  'line_nr' => 86
                 }
               },
               'sourcemark_type' => 'expanded_conditional_command',
@@ -8256,8 +7893,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 85,
-        'macro' => ''
+        'line_nr' => 85
       }
     },
     {
@@ -8291,8 +7927,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'abbr',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 87,
-                'macro' => ''
+                'line_nr' => 87
               }
             },
             {
@@ -8312,8 +7947,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'abbr',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 87,
-                'macro' => ''
+                'line_nr' => 87
               }
             },
             {
@@ -8333,8 +7967,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'abbr',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 87,
-                'macro' => ''
+                'line_nr' => 87
               }
             }
           ],
@@ -8381,8 +8014,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 88,
-                  'macro' => ''
+                  'line_nr' => 88
                 }
               },
               'sourcemark_type' => 'expanded_conditional_command',
@@ -8407,8 +8039,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 87,
-        'macro' => ''
+        'line_nr' => 87
       }
     },
     {
@@ -8448,8 +8079,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 90,
-                'macro' => ''
+                'line_nr' => 90
               }
             },
             {
@@ -8475,8 +8105,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 90,
-                'macro' => ''
+                'line_nr' => 90
               }
             }
           ],
@@ -8501,8 +8130,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 90,
-        'macro' => ''
+        'line_nr' => 90
       }
     },
     {
@@ -8542,8 +8170,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 91,
-                'macro' => ''
+                'line_nr' => 91
               }
             },
             {
@@ -8569,8 +8196,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 91,
-                'macro' => ''
+                'line_nr' => 91
               }
             }
           ],
@@ -8601,8 +8227,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 91,
-        'macro' => ''
+        'line_nr' => 91
       }
     },
     {
@@ -8626,8 +8251,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 93,
-                'macro' => ''
+                'line_nr' => 93
               }
             },
             {
@@ -8682,8 +8306,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 93,
-                'macro' => ''
+                'line_nr' => 93
               }
             }
           ],
@@ -8717,8 +8340,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                 'cmdname' => 'ifnottex',
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 94,
-                  'macro' => ''
+                  'line_nr' => 94
                 }
               },
               'sourcemark_type' => 'expanded_conditional_command',
@@ -8739,8 +8361,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 93,
-        'macro' => ''
+        'line_nr' => 93
       }
     },
     {
@@ -8764,8 +8385,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 95,
-                'macro' => ''
+                'line_nr' => 95
               }
             },
             {
@@ -8820,8 +8440,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 95,
-                'macro' => ''
+                'line_nr' => 95
               }
             }
           ],
@@ -8868,8 +8487,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 96,
-                  'macro' => ''
+                  'line_nr' => 96
                 }
               },
               'sourcemark_type' => 'expanded_conditional_command',
@@ -8894,8 +8512,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 95,
-        'macro' => ''
+        'line_nr' => 95
       }
     },
     {
@@ -8920,8 +8537,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 98,
-                'macro' => ''
+                'line_nr' => 98
               }
             }
           ],
@@ -8955,8 +8571,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                 'cmdname' => 'ifnottex',
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 99,
-                  'macro' => ''
+                  'line_nr' => 99
                 }
               },
               'sourcemark_type' => 'expanded_conditional_command',
@@ -8977,8 +8592,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 98,
-        'macro' => ''
+        'line_nr' => 98
       }
     },
     {
@@ -9003,8 +8617,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 100,
-                'macro' => ''
+                'line_nr' => 100
               }
             }
           ],
@@ -9051,8 +8664,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 101,
-                  'macro' => ''
+                  'line_nr' => 101
                 }
               },
               'sourcemark_type' => 'expanded_conditional_command',
@@ -9077,8 +8689,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 100,
-        'macro' => ''
+        'line_nr' => 100
       }
     },
     {
@@ -9106,8 +8717,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 103,
-                        'macro' => ''
+                        'line_nr' => 103
                       }
                     }
                   ],
@@ -9117,8 +8727,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'cite',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 103,
-                'macro' => ''
+                'line_nr' => 103
               }
             },
             {
@@ -9151,8 +8760,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'b',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 103,
-                        'macro' => ''
+                        'line_nr' => 103
                       }
                     }
                   ],
@@ -9162,8 +8770,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 103,
-                'macro' => ''
+                'line_nr' => 103
               }
             },
             {
@@ -9183,8 +8790,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'r',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 103,
-                'macro' => ''
+                'line_nr' => 103
               }
             },
             {
@@ -9204,8 +8810,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 103,
-                'macro' => ''
+                'line_nr' => 103
               }
             },
             {
@@ -9225,8 +8830,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'strong',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 103,
-                'macro' => ''
+                'line_nr' => 103
               }
             },
             {
@@ -9246,8 +8850,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 't',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 103,
-                'macro' => ''
+                'line_nr' => 103
               }
             },
             {
@@ -9267,8 +8870,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 103,
-                'macro' => ''
+                'line_nr' => 103
               }
             },
             {
@@ -9288,8 +8890,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 103,
-                'macro' => ''
+                'line_nr' => 103
               }
             },
             {
@@ -9309,8 +8910,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'i',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 103,
-                'macro' => ''
+                'line_nr' => 103
               }
             }
           ],
@@ -9335,8 +8935,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 103,
-        'macro' => ''
+        'line_nr' => 103
       }
     },
     {
@@ -9364,8 +8963,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 104,
-                        'macro' => ''
+                        'line_nr' => 104
                       }
                     }
                   ],
@@ -9375,8 +8973,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'cite',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 104,
-                'macro' => ''
+                'line_nr' => 104
               }
             },
             {
@@ -9409,8 +9006,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'b',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 104,
-                        'macro' => ''
+                        'line_nr' => 104
                       }
                     }
                   ],
@@ -9420,8 +9016,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 104,
-                'macro' => ''
+                'line_nr' => 104
               }
             },
             {
@@ -9441,8 +9036,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'r',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 104,
-                'macro' => ''
+                'line_nr' => 104
               }
             },
             {
@@ -9462,8 +9056,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 104,
-                'macro' => ''
+                'line_nr' => 104
               }
             },
             {
@@ -9483,8 +9076,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'strong',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 104,
-                'macro' => ''
+                'line_nr' => 104
               }
             },
             {
@@ -9504,8 +9096,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 't',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 104,
-                'macro' => ''
+                'line_nr' => 104
               }
             },
             {
@@ -9525,8 +9116,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 104,
-                'macro' => ''
+                'line_nr' => 104
               }
             },
             {
@@ -9546,8 +9136,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 104,
-                'macro' => ''
+                'line_nr' => 104
               }
             },
             {
@@ -9567,8 +9156,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'i',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 104,
-                'macro' => ''
+                'line_nr' => 104
               }
             }
           ],
@@ -9599,8 +9187,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 104,
-        'macro' => ''
+        'line_nr' => 104
       }
     },
     {
@@ -9621,8 +9208,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'env',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 106,
-                'macro' => ''
+                'line_nr' => 106
               }
             },
             {
@@ -9642,8 +9228,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 106,
-                'macro' => ''
+                'line_nr' => 106
               }
             },
             {
@@ -9663,8 +9248,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'option',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 106,
-                'macro' => ''
+                'line_nr' => 106
               }
             },
             {
@@ -9684,8 +9268,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 106,
-                'macro' => ''
+                'line_nr' => 106
               }
             },
             {
@@ -9705,8 +9288,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'command',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 106,
-                'macro' => ''
+                'line_nr' => 106
               }
             },
             {
@@ -9726,8 +9308,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'file',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 106,
-                'macro' => ''
+                'line_nr' => 106
               }
             },
             {
@@ -9754,8 +9335,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'key',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 106,
-                        'macro' => ''
+                        'line_nr' => 106
                       }
                     }
                   ],
@@ -9765,8 +9345,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'kbd',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 106,
-                'macro' => ''
+                'line_nr' => 106
               }
             }
           ],
@@ -9791,8 +9370,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 106,
-        'macro' => ''
+        'line_nr' => 106
       }
     },
     {
@@ -9813,8 +9391,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'env',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 107,
-                'macro' => ''
+                'line_nr' => 107
               }
             },
             {
@@ -9834,8 +9411,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 107,
-                'macro' => ''
+                'line_nr' => 107
               }
             },
             {
@@ -9855,8 +9431,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'option',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 107,
-                'macro' => ''
+                'line_nr' => 107
               }
             },
             {
@@ -9876,8 +9451,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 107,
-                'macro' => ''
+                'line_nr' => 107
               }
             },
             {
@@ -9897,8 +9471,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'command',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 107,
-                'macro' => ''
+                'line_nr' => 107
               }
             },
             {
@@ -9918,8 +9491,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'file',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 107,
-                'macro' => ''
+                'line_nr' => 107
               }
             },
             {
@@ -9946,8 +9518,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'key',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 107,
-                        'macro' => ''
+                        'line_nr' => 107
                       }
                     }
                   ],
@@ -9957,8 +9528,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'kbd',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 107,
-                'macro' => ''
+                'line_nr' => 107
               }
             }
           ],
@@ -9989,8 +9559,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 107,
-        'macro' => ''
+        'line_nr' => 107
       }
     },
     {
@@ -10014,8 +9583,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'dmn',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 109,
-                'macro' => ''
+                'line_nr' => 109
               }
             }
           ],
@@ -10040,8 +9608,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 109,
-        'macro' => ''
+        'line_nr' => 109
       }
     },
     {
@@ -10065,8 +9632,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'dmn',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 110,
-                'macro' => ''
+                'line_nr' => 110
               }
             }
           ],
@@ -10097,8 +9663,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 110,
-        'macro' => ''
+        'line_nr' => 110
       }
     },
     {
@@ -10119,8 +9684,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'sansserif',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 112,
-                'macro' => ''
+                'line_nr' => 112
               }
             },
             {
@@ -10140,8 +9704,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'slanted',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 112,
-                'macro' => ''
+                'line_nr' => 112
               }
             }
           ],
@@ -10166,8 +9729,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 112,
-        'macro' => ''
+        'line_nr' => 112
       }
     },
     {
@@ -10188,8 +9750,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'sansserif',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 113,
-                'macro' => ''
+                'line_nr' => 113
               }
             },
             {
@@ -10209,8 +9770,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'slanted',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 113,
-                'macro' => ''
+                'line_nr' => 113
               }
             }
           ],
@@ -10241,8 +9801,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 113,
-        'macro' => ''
+        'line_nr' => 113
       }
     },
     {
@@ -10263,8 +9822,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'indicateurl',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 115,
-                'macro' => ''
+                'line_nr' => 115
               }
             }
           ],
@@ -10289,8 +9847,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 115,
-        'macro' => ''
+        'line_nr' => 115
       }
     },
     {
@@ -10311,8 +9868,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'indicateurl',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 116,
-                'macro' => ''
+                'line_nr' => 116
               }
             }
           ],
@@ -10343,8 +9899,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 116,
-        'macro' => ''
+        'line_nr' => 116
       }
     },
     {
@@ -10365,8 +9920,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'sub',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 118,
-                'macro' => ''
+                'line_nr' => 118
               }
             },
             {
@@ -10386,8 +9940,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'sup',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 118,
-                'macro' => ''
+                'line_nr' => 118
               }
             }
           ],
@@ -10412,8 +9965,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 118,
-        'macro' => ''
+        'line_nr' => 118
       }
     },
     {
@@ -10434,8 +9986,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'sub',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 119,
-                'macro' => ''
+                'line_nr' => 119
               }
             },
             {
@@ -10455,8 +10006,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'sup',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 119,
-                'macro' => ''
+                'line_nr' => 119
               }
             }
           ],
@@ -10487,8 +10037,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 119,
-        'macro' => ''
+        'line_nr' => 119
       }
     },
     {
@@ -10509,8 +10058,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'url',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 121,
-                'macro' => ''
+                'line_nr' => 121
               }
             },
             {
@@ -10543,8 +10091,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'url',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 121,
-                'macro' => ''
+                'line_nr' => 121
               }
             },
             {
@@ -10575,8 +10122,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'uref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 121,
-                'macro' => ''
+                'line_nr' => 121
               }
             }
           ],
@@ -10601,8 +10147,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 121,
-        'macro' => ''
+        'line_nr' => 121
       }
     },
     {
@@ -10623,8 +10168,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'url',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 122,
-                'macro' => ''
+                'line_nr' => 122
               }
             },
             {
@@ -10657,8 +10201,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'url',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 122,
-                'macro' => ''
+                'line_nr' => 122
               }
             },
             {
@@ -10689,8 +10232,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'uref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 122,
-                'macro' => ''
+                'line_nr' => 122
               }
             }
           ],
@@ -10750,8 +10292,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 124,
-                'macro' => ''
+                'line_nr' => 124
               }
             },
             {
@@ -10854,8 +10395,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 126,
-                'macro' => ''
+                'line_nr' => 126
               }
             },
             {
@@ -10885,8 +10425,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'atchar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 128,
-                        'macro' => ''
+                        'line_nr' => 128
                       }
                     },
                     {
@@ -10901,8 +10440,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'lbracechar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 128,
-                        'macro' => ''
+                        'line_nr' => 128
                       }
                     },
                     {
@@ -10917,8 +10455,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'rbracechar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 128,
-                        'macro' => ''
+                        'line_nr' => 128
                       }
                     },
                     {
@@ -10933,8 +10470,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'backslashchar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 128,
-                        'macro' => ''
+                        'line_nr' => 128
                       }
                     },
                     {
@@ -10949,8 +10485,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'hashchar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 128,
-                        'macro' => ''
+                        'line_nr' => 128
                       }
                     }
                   ],
@@ -10976,8 +10511,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 128,
-                'macro' => ''
+                'line_nr' => 128
               }
             },
             {
@@ -11007,8 +10541,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'LaTeX',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 130,
-                        'macro' => ''
+                        'line_nr' => 130
                       }
                     },
                     {
@@ -11023,8 +10556,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'TeX',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 130,
-                        'macro' => ''
+                        'line_nr' => 130
                       }
                     },
                     {
@@ -11039,8 +10571,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'bullet',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 130,
-                        'macro' => ''
+                        'line_nr' => 130
                       }
                     },
                     {
@@ -11055,8 +10586,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'comma',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 130,
-                        'macro' => ''
+                        'line_nr' => 130
                       }
                     },
                     {
@@ -11071,8 +10601,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'copyright',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 130,
-                        'macro' => ''
+                        'line_nr' => 130
                       }
                     },
                     {
@@ -11087,8 +10616,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'dots',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 130,
-                        'macro' => ''
+                        'line_nr' => 130
                       }
                     },
                     {
@@ -11103,8 +10631,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'enddots',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 130,
-                        'macro' => ''
+                        'line_nr' => 130
                       }
                     }
                   ],
@@ -11134,8 +10661,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 130,
-                'macro' => ''
+                'line_nr' => 130
               }
             },
             {
@@ -11165,8 +10691,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'equiv',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 132,
-                        'macro' => ''
+                        'line_nr' => 132
                       }
                     },
                     {
@@ -11181,8 +10706,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'error',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 132,
-                        'macro' => ''
+                        'line_nr' => 132
                       }
                     },
                     {
@@ -11197,8 +10721,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'euro',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 132,
-                        'macro' => ''
+                        'line_nr' => 132
                       }
                     },
                     {
@@ -11213,8 +10736,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'exclamdown',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 132,
-                        'macro' => ''
+                        'line_nr' => 132
                       }
                     },
                     {
@@ -11229,8 +10751,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'expansion',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 132,
-                        'macro' => ''
+                        'line_nr' => 132
                       }
                     },
                     {
@@ -11245,8 +10766,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'minus',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 132,
-                        'macro' => ''
+                        'line_nr' => 132
                       }
                     }
                   ],
@@ -11274,8 +10794,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 132,
-                'macro' => ''
+                'line_nr' => 132
               }
             },
             {
@@ -11305,8 +10824,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'geq',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 134,
-                        'macro' => ''
+                        'line_nr' => 134
                       }
                     },
                     {
@@ -11321,8 +10839,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'leq',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 134,
-                        'macro' => ''
+                        'line_nr' => 134
                       }
                     },
                     {
@@ -11337,8 +10854,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'arrow',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 134,
-                        'macro' => ''
+                        'line_nr' => 134
                       }
                     }
                   ],
@@ -11360,8 +10876,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 134,
-                'macro' => ''
+                'line_nr' => 134
               }
             },
             {
@@ -11391,8 +10906,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'ordf',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 136,
-                        'macro' => ''
+                        'line_nr' => 136
                       }
                     },
                     {
@@ -11407,8 +10921,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'ordm',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 136,
-                        'macro' => ''
+                        'line_nr' => 136
                       }
                     },
                     {
@@ -11423,8 +10936,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'point',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 136,
-                        'macro' => ''
+                        'line_nr' => 136
                       }
                     },
                     {
@@ -11439,8 +10951,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'pounds',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 136,
-                        'macro' => ''
+                        'line_nr' => 136
                       }
                     },
                     {
@@ -11455,8 +10966,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'print',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 136,
-                        'macro' => ''
+                        'line_nr' => 136
                       }
                     },
                     {
@@ -11471,8 +10981,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'questiondown',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 136,
-                        'macro' => ''
+                        'line_nr' => 136
                       }
                     },
                     {
@@ -11487,8 +10996,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'registeredsymbol',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 136,
-                        'macro' => ''
+                        'line_nr' => 136
                       }
                     }
                   ],
@@ -11518,8 +11026,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 136,
-                'macro' => ''
+                'line_nr' => 136
               }
             },
             {
@@ -11549,8 +11056,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'result',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 138,
-                        'macro' => ''
+                        'line_nr' => 138
                       }
                     },
                     {
@@ -11565,8 +11071,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'textdegree',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 138,
-                        'macro' => ''
+                        'line_nr' => 138
                       }
                     },
                     {
@@ -11581,8 +11086,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'tie',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 138,
-                        'macro' => ''
+                        'line_nr' => 138
                       }
                     },
                     {
@@ -11597,8 +11101,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'today',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 138,
-                        'macro' => ''
+                        'line_nr' => 138
                       }
                     },
                     {
@@ -11613,8 +11116,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 138,
-                        'macro' => ''
+                        'line_nr' => 138
                       }
                     }
                   ],
@@ -11640,8 +11142,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 138,
-                'macro' => ''
+                'line_nr' => 138
               }
             },
             {
@@ -11671,8 +11172,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     },
                     {
@@ -11687,8 +11187,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'ae',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     },
                     {
@@ -11703,8 +11202,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'oe',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     },
                     {
@@ -11719,8 +11217,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'AE',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     },
                     {
@@ -11735,8 +11232,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'OE',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     },
                     {
@@ -11751,8 +11247,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'o',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     },
                     {
@@ -11767,8 +11262,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'O',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     },
                     {
@@ -11783,8 +11277,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'ss',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     },
                     {
@@ -11799,8 +11292,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'l',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     },
                     {
@@ -11815,8 +11307,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'L',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     },
                     {
@@ -11831,8 +11322,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'DH',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     },
                     {
@@ -11847,8 +11337,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'dh',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     },
                     {
@@ -11863,8 +11352,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'TH',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     },
                     {
@@ -11879,8 +11367,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'th',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     }
                   ],
@@ -11924,8 +11411,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 140,
-                'macro' => ''
+                'line_nr' => 140
               }
             },
             {
@@ -11960,8 +11446,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => '"',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 142,
-                        'macro' => ''
+                        'line_nr' => 142
                       }
                     },
                     {
@@ -11981,8 +11466,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 142,
-                        'macro' => ''
+                        'line_nr' => 142
                       }
                     },
                     {
@@ -12006,8 +11490,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 142,
-                                'macro' => ''
+                                'line_nr' => 142
                               }
                             }
                           ],
@@ -12017,8 +11500,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 142,
-                        'macro' => ''
+                        'line_nr' => 142
                       }
                     },
                     {
@@ -12038,8 +11520,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 142,
-                        'macro' => ''
+                        'line_nr' => 142
                       }
                     },
                     {
@@ -12059,8 +11540,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => '`',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 142,
-                        'macro' => ''
+                        'line_nr' => 142
                       }
                     },
                     {
@@ -12080,8 +11560,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 142,
-                        'macro' => ''
+                        'line_nr' => 142
                       }
                     },
                     {
@@ -12101,8 +11580,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 142,
-                        'macro' => ''
+                        'line_nr' => 142
                       }
                     },
                     {
@@ -12122,8 +11600,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 142,
-                        'macro' => ''
+                        'line_nr' => 142
                       }
                     },
                     {
@@ -12143,8 +11620,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'ringaccent',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 142,
-                        'macro' => ''
+                        'line_nr' => 142
                       }
                     },
                     {
@@ -12164,8 +11640,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'H',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 142,
-                        'macro' => ''
+                        'line_nr' => 142
                       }
                     },
                     {
@@ -12185,8 +11660,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'ogonek',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 142,
-                        'macro' => ''
+                        'line_nr' => 142
                       }
                     }
                   ],
@@ -12224,8 +11698,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 142,
-                'macro' => ''
+                'line_nr' => 142
               }
             },
             {
@@ -12260,8 +11733,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'dotaccent',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 144,
-                        'macro' => ''
+                        'line_nr' => 144
                       }
                     },
                     {
@@ -12281,8 +11753,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'u',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 144,
-                        'macro' => ''
+                        'line_nr' => 144
                       }
                     },
                     {
@@ -12302,8 +11773,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'ubaraccent',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 144,
-                        'macro' => ''
+                        'line_nr' => 144
                       }
                     },
                     {
@@ -12323,8 +11793,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 144,
-                        'macro' => ''
+                        'line_nr' => 144
                       }
                     },
                     {
@@ -12344,8 +11813,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 144,
-                        'macro' => ''
+                        'line_nr' => 144
                       }
                     },
                     {
@@ -12365,8 +11833,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 144,
-                        'macro' => ''
+                        'line_nr' => 144
                       }
                     },
                     {
@@ -12386,8 +11853,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'tieaccent',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 144,
-                        'macro' => ''
+                        'line_nr' => 144
                       }
                     }
                   ],
@@ -12417,8 +11883,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 144,
-                'macro' => ''
+                'line_nr' => 144
               }
             },
             {
@@ -12453,8 +11918,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 146,
-                        'macro' => ''
+                        'line_nr' => 146
                       }
                     },
                     {
@@ -12478,8 +11942,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                               'cmdname' => '=',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 146,
-                                'macro' => ''
+                                'line_nr' => 146
                               }
                             }
                           ],
@@ -12489,8 +11952,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => '`',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 146,
-                        'macro' => ''
+                        'line_nr' => 146
                       }
                     },
                     {
@@ -12514,8 +11976,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                               'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 146,
-                                'macro' => ''
+                                'line_nr' => 146
                               }
                             }
                           ],
@@ -12525,8 +11986,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 146,
-                        'macro' => ''
+                        'line_nr' => 146
                       }
                     }
                   ],
@@ -12548,8 +12008,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 146,
-                'macro' => ''
+                'line_nr' => 146
               }
             },
             {
@@ -12579,8 +12038,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'quotedblleft',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 148,
-                        'macro' => ''
+                        'line_nr' => 148
                       }
                     },
                     {
@@ -12595,8 +12053,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'quotedblright',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 148,
-                        'macro' => ''
+                        'line_nr' => 148
                       }
                     },
                     {
@@ -12611,8 +12068,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'quoteleft',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 148,
-                        'macro' => ''
+                        'line_nr' => 148
                       }
                     },
                     {
@@ -12627,8 +12083,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'quoteright',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 148,
-                        'macro' => ''
+                        'line_nr' => 148
                       }
                     },
                     {
@@ -12643,8 +12098,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'quotedblbase',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 148,
-                        'macro' => ''
+                        'line_nr' => 148
                       }
                     },
                     {
@@ -12659,8 +12113,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'quotesinglbase',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 148,
-                        'macro' => ''
+                        'line_nr' => 148
                       }
                     }
                   ],
@@ -12688,8 +12141,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 148,
-                'macro' => ''
+                'line_nr' => 148
               }
             },
             {
@@ -12719,8 +12171,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'guillemetleft',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 150,
-                        'macro' => ''
+                        'line_nr' => 150
                       }
                     },
                     {
@@ -12735,8 +12186,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'guillemetright',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 150,
-                        'macro' => ''
+                        'line_nr' => 150
                       }
                     },
                     {
@@ -12751,8 +12201,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'guillemotleft',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 150,
-                        'macro' => ''
+                        'line_nr' => 150
                       }
                     },
                     {
@@ -12767,8 +12216,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'guillemotright',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 150,
-                        'macro' => ''
+                        'line_nr' => 150
                       }
                     },
                     {
@@ -12783,8 +12231,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'guilsinglleft',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 150,
-                        'macro' => ''
+                        'line_nr' => 150
                       }
                     },
                     {
@@ -12799,8 +12246,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'guilsinglright',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 150,
-                        'macro' => ''
+                        'line_nr' => 150
                       }
                     }
                   ],
@@ -12828,8 +12274,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 150,
-                'macro' => ''
+                'line_nr' => 150
               }
             },
             {
@@ -12868,8 +12313,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 152,
-                'macro' => ''
+                'line_nr' => 152
               }
             },
             {
@@ -12917,8 +12361,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'acronym',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 154,
-                        'macro' => ''
+                        'line_nr' => 154
                       }
                     },
                     {
@@ -12938,8 +12381,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'acronym',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 154,
-                        'macro' => ''
+                        'line_nr' => 154
                       }
                     },
                     {
@@ -12959,8 +12401,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'acronym',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 154,
-                        'macro' => ''
+                        'line_nr' => 154
                       }
                     }
                   ],
@@ -12982,8 +12423,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 154,
-                'macro' => ''
+                'line_nr' => 154
               }
             },
             {
@@ -13012,8 +12452,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                 'cmdname' => 'ifnottex',
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 156,
-                  'macro' => ''
+                  'line_nr' => 156
                 }
               },
               'position' => 1,
@@ -13058,8 +12497,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'abbr',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 157,
-                        'macro' => ''
+                        'line_nr' => 157
                       }
                     },
                     {
@@ -13079,8 +12517,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'abbr',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 157,
-                        'macro' => ''
+                        'line_nr' => 157
                       }
                     },
                     {
@@ -13100,8 +12537,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'abbr',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 157,
-                        'macro' => ''
+                        'line_nr' => 157
                       }
                     }
                   ],
@@ -13123,8 +12559,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 157,
-                'macro' => ''
+                'line_nr' => 157
               }
             },
             {
@@ -13159,8 +12594,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 158,
-                      'macro' => ''
+                      'line_nr' => 158
                     }
                   },
                   'position' => 1,
@@ -13218,8 +12652,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'email',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 160,
-                        'macro' => ''
+                        'line_nr' => 160
                       }
                     },
                     {
@@ -13245,8 +12678,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'email',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 160,
-                        'macro' => ''
+                        'line_nr' => 160
                       }
                     }
                   ],
@@ -13266,8 +12698,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 160,
-                'macro' => ''
+                'line_nr' => 160
               }
             },
             {
@@ -13296,8 +12727,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                 'cmdname' => 'ifnottex',
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 162,
-                  'macro' => ''
+                  'line_nr' => 162
                 }
               },
               'position' => 1,
@@ -13332,8 +12762,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 163,
-                        'macro' => ''
+                        'line_nr' => 163
                       }
                     },
                     {
@@ -13388,8 +12817,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 163,
-                        'macro' => ''
+                        'line_nr' => 163
                       }
                     }
                   ],
@@ -13409,8 +12837,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 163,
-                'macro' => ''
+                'line_nr' => 163
               }
             },
             {
@@ -13449,8 +12876,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 165,
-                        'macro' => ''
+                        'line_nr' => 165
                       }
                     }
                   ],
@@ -13468,8 +12894,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 165,
-                'macro' => ''
+                'line_nr' => 165
               }
             },
             {
@@ -13504,8 +12929,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 166,
-                      'macro' => ''
+                      'line_nr' => 166
                     }
                   },
                   'position' => 1,
@@ -13551,8 +12975,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                               'cmdname' => 'asis',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 168,
-                                'macro' => ''
+                                'line_nr' => 168
                               }
                             }
                           ],
@@ -13562,8 +12985,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'cite',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 168,
-                        'macro' => ''
+                        'line_nr' => 168
                       }
                     },
                     {
@@ -13596,8 +13018,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                               'cmdname' => 'b',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 168,
-                                'macro' => ''
+                                'line_nr' => 168
                               }
                             }
                           ],
@@ -13607,8 +13028,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'w',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 168,
-                        'macro' => ''
+                        'line_nr' => 168
                       }
                     },
                     {
@@ -13628,8 +13048,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'r',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 168,
-                        'macro' => ''
+                        'line_nr' => 168
                       }
                     },
                     {
@@ -13649,8 +13068,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'sc',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 168,
-                        'macro' => ''
+                        'line_nr' => 168
                       }
                     },
                     {
@@ -13670,8 +13088,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'strong',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 168,
-                        'macro' => ''
+                        'line_nr' => 168
                       }
                     },
                     {
@@ -13691,8 +13108,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 't',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 168,
-                        'macro' => ''
+                        'line_nr' => 168
                       }
                     },
                     {
@@ -13712,8 +13128,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'var',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 168,
-                        'macro' => ''
+                        'line_nr' => 168
                       }
                     },
                     {
@@ -13733,8 +13148,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'dfn',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 168,
-                        'macro' => ''
+                        'line_nr' => 168
                       }
                     },
                     {
@@ -13754,8 +13168,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'i',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 168,
-                        'macro' => ''
+                        'line_nr' => 168
                       }
                     }
                   ],
@@ -13789,8 +13202,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 168,
-                'macro' => ''
+                'line_nr' => 168
               }
             },
             {
@@ -13825,8 +13237,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'env',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 170,
-                        'macro' => ''
+                        'line_nr' => 170
                       }
                     },
                     {
@@ -13846,8 +13257,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 170,
-                        'macro' => ''
+                        'line_nr' => 170
                       }
                     },
                     {
@@ -13867,8 +13277,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'option',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 170,
-                        'macro' => ''
+                        'line_nr' => 170
                       }
                     },
                     {
@@ -13888,8 +13297,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'samp',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 170,
-                        'macro' => ''
+                        'line_nr' => 170
                       }
                     },
                     {
@@ -13909,8 +13317,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'command',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 170,
-                        'macro' => ''
+                        'line_nr' => 170
                       }
                     },
                     {
@@ -13930,8 +13337,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'file',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 170,
-                        'macro' => ''
+                        'line_nr' => 170
                       }
                     },
                     {
@@ -13958,8 +13364,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                               'cmdname' => 'key',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 170,
-                                'macro' => ''
+                                'line_nr' => 170
                               }
                             }
                           ],
@@ -13969,8 +13374,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'kbd',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 170,
-                        'macro' => ''
+                        'line_nr' => 170
                       }
                     }
                   ],
@@ -14000,8 +13404,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 170,
-                'macro' => ''
+                'line_nr' => 170
               }
             },
             {
@@ -14039,8 +13442,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'dmn',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 172,
-                        'macro' => ''
+                        'line_nr' => 172
                       }
                     }
                   ],
@@ -14059,8 +13461,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 172,
-                'macro' => ''
+                'line_nr' => 172
               }
             },
             {
@@ -14095,8 +13496,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'sansserif',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 174,
-                        'macro' => ''
+                        'line_nr' => 174
                       }
                     },
                     {
@@ -14116,8 +13516,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'slanted',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 174,
-                        'macro' => ''
+                        'line_nr' => 174
                       }
                     }
                   ],
@@ -14137,8 +13536,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 174,
-                'macro' => ''
+                'line_nr' => 174
               }
             },
             {
@@ -14173,8 +13571,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'indicateurl',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 176,
-                        'macro' => ''
+                        'line_nr' => 176
                       }
                     }
                   ],
@@ -14192,8 +13589,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 176,
-                'macro' => ''
+                'line_nr' => 176
               }
             },
             {
@@ -14228,8 +13624,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'sub',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 178,
-                        'macro' => ''
+                        'line_nr' => 178
                       }
                     },
                     {
@@ -14249,8 +13644,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'sup',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 178,
-                        'macro' => ''
+                        'line_nr' => 178
                       }
                     }
                   ],
@@ -14270,8 +13664,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 178,
-                'macro' => ''
+                'line_nr' => 178
               }
             },
             {
@@ -14306,8 +13699,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'url',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 180,
-                        'macro' => ''
+                        'line_nr' => 180
                       }
                     },
                     {
@@ -14340,8 +13732,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'url',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 180,
-                        'macro' => ''
+                        'line_nr' => 180
                       }
                     },
                     {
@@ -14372,8 +13763,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'uref',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 180,
-                        'macro' => ''
+                        'line_nr' => 180
                       }
                     }
                   ],
@@ -14395,8 +13785,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 180,
-                'macro' => ''
+                'line_nr' => 180
               }
             },
             {
@@ -14422,8 +13811,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 122,
-        'macro' => ''
+        'line_nr' => 122
       }
     },
     {
@@ -16868,7 +16256,6 @@ $result_errors{'at_commands_in_refs_latin1'} = [
 ',
     'file_name' => '',
     'line_nr' => 98,
-    'macro' => '',
     'text' => '@verb should not appear on @node line',
     'type' => 'warning'
   },
@@ -16877,7 +16264,6 @@ $result_errors{'at_commands_in_refs_latin1'} = [
 ',
     'file_name' => '',
     'line_nr' => 100,
-    'macro' => '',
     'text' => '@verb should not appear on @chapter line',
     'type' => 'warning'
   },
@@ -16886,7 +16272,6 @@ $result_errors{'at_commands_in_refs_latin1'} = [
 ',
     'file_name' => '',
     'line_nr' => 165,
-    'macro' => '',
     'text' => '@verb should not appear anywhere inside @ref',
     'type' => 'warning'
   }
@@ -16902,7 +16287,6 @@ 
$result_converted_errors{'file_html'}->{'at_commands_in_refs_latin1'} = [
 ',
     'file_name' => '',
     'line_nr' => 95,
-    'macro' => '',
     'text' => '@image file `f--ile1\' (for HTML) not found, using 
`f--ile1.jpg\'',
     'type' => 'warning'
   },
@@ -16911,7 +16295,6 @@ 
$result_converted_errors{'file_html'}->{'at_commands_in_refs_latin1'} = [
 ',
     'file_name' => '',
     'line_nr' => 93,
-    'macro' => '',
     'text' => '@image file `f--ile1\' (for HTML) not found, using 
`f--ile1.jpg\'',
     'type' => 'warning'
   },
@@ -16920,7 +16303,6 @@ 
$result_converted_errors{'file_html'}->{'at_commands_in_refs_latin1'} = [
 ',
     'file_name' => '',
     'line_nr' => 95,
-    'macro' => '',
     'text' => '@image file `f--ile1\' (for HTML) not found, using 
`f--ile1.jpg\'',
     'type' => 'warning'
   },
@@ -16929,7 +16311,6 @@ 
$result_converted_errors{'file_html'}->{'at_commands_in_refs_latin1'} = [
 ',
     'file_name' => '',
     'line_nr' => 163,
-    'macro' => '',
     'text' => '@image file `f--ile1\' (for HTML) not found, using 
`f--ile1.jpg\'',
     'type' => 'warning'
   }
@@ -16942,7 +16323,6 @@ 
$result_converted_errors{'file_info'}->{'at_commands_in_refs_latin1'} = [
 ',
     'file_name' => '',
     'line_nr' => 26,
-    'macro' => '',
     'text' => 'could not find @image file `f--ile1.txt\' nor alternate text',
     'type' => 'warning'
   },
@@ -16951,7 +16331,6 @@ 
$result_converted_errors{'file_info'}->{'at_commands_in_refs_latin1'} = [
 ',
     'file_name' => '',
     'line_nr' => 34,
-    'macro' => '',
     'text' => 'menu entry node name should not contain `:\'',
     'type' => 'warning'
   },
@@ -16960,7 +16339,6 @@ 
$result_converted_errors{'file_info'}->{'at_commands_in_refs_latin1'} = [
 ",
     'file_name' => '',
     'line_nr' => 46,
-    'macro' => '',
     'text' => "\@node name should not contain `,': LaTeX TeX * , \x{a9} ... 
...",
     'type' => 'warning'
   },
@@ -16969,7 +16347,6 @@ 
$result_converted_errors{'file_info'}->{'at_commands_in_refs_latin1'} = [
 ',
     'file_name' => '',
     'line_nr' => 70,
-    'macro' => '',
     'text' => '@node name should not contain `,\': i E=` C\',',
     'type' => 'warning'
   },
@@ -16978,7 +16355,6 @@ 
$result_converted_errors{'file_info'}->{'at_commands_in_refs_latin1'} = [
 ',
     'file_name' => '',
     'line_nr' => 73,
-    'macro' => '',
     'text' => '@node name should not contain `,\': " " ` \' ,, ,',
     'type' => 'warning'
   },
@@ -16987,7 +16363,6 @@ 
$result_converted_errors{'file_info'}->{'at_commands_in_refs_latin1'} = [
 ',
     'file_name' => '',
     'line_nr' => 93,
-    'macro' => '',
     'text' => 'could not find @image file `f--ile1.txt\' nor alternate text',
     'type' => 'warning'
   },
@@ -16996,7 +16371,6 @@ 
$result_converted_errors{'file_info'}->{'at_commands_in_refs_latin1'} = [
 ',
     'file_name' => '',
     'line_nr' => 95,
-    'macro' => '',
     'text' => 'could not find @image file `f--ile1.txt\' nor alternate text',
     'type' => 'warning'
   },
@@ -17005,7 +16379,6 @@ 
$result_converted_errors{'file_info'}->{'at_commands_in_refs_latin1'} = [
 ',
     'file_name' => '',
     'line_nr' => 93,
-    'macro' => '',
     'text' => 'could not find @image file `f--ile1.txt\' nor alternate text',
     'type' => 'warning'
   },
@@ -17014,7 +16387,6 @@ 
$result_converted_errors{'file_info'}->{'at_commands_in_refs_latin1'} = [
 ',
     'file_name' => '',
     'line_nr' => 180,
-    'macro' => '',
     'text' => '@ref node name should not contain `:\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/formats_encodings/at_commands_in_refs_utf8.pl 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8.pl
index 0fa86573ba..3957a8282c 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs_utf8.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs_utf8.pl
@@ -39,8 +39,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -72,8 +71,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -116,8 +114,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -217,8 +214,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               },
               'type' => 'menu_entry'
             },
@@ -329,8 +325,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -351,8 +346,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'atchar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     },
                     {
@@ -367,8 +361,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'lbracechar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     },
                     {
@@ -383,8 +376,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'rbracechar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     },
                     {
@@ -399,8 +391,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'backslashchar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     },
                     {
@@ -415,8 +406,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'hashchar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     }
                   ],
@@ -459,8 +449,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'menu_entry'
             },
@@ -481,8 +470,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'LaTeX',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     },
                     {
@@ -497,8 +485,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'TeX',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     },
                     {
@@ -513,8 +500,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'bullet',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     },
                     {
@@ -529,8 +515,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'comma',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     },
                     {
@@ -545,8 +530,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'copyright',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     },
                     {
@@ -561,8 +545,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'dots',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     },
                     {
@@ -577,8 +560,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'enddots',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     }
                   ],
@@ -625,8 +607,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -647,8 +628,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'equiv',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     },
                     {
@@ -663,8 +643,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'error',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     },
                     {
@@ -679,8 +658,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'euro',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     },
                     {
@@ -695,8 +673,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'exclamdown',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     },
                     {
@@ -711,8 +688,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'expansion',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     },
                     {
@@ -727,8 +703,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'minus',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     }
                   ],
@@ -773,8 +748,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               },
               'type' => 'menu_entry'
             },
@@ -795,8 +769,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'geq',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     },
                     {
@@ -811,8 +784,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'leq',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     },
                     {
@@ -827,8 +799,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'arrow',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     }
                   ],
@@ -867,8 +838,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               },
               'type' => 'menu_entry'
             },
@@ -889,8 +859,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'ordf',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     },
                     {
@@ -905,8 +874,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'ordm',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     },
                     {
@@ -921,8 +889,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'point',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     },
                     {
@@ -937,8 +904,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'pounds',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     },
                     {
@@ -953,8 +919,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'print',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     },
                     {
@@ -969,8 +934,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'questiondown',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     },
                     {
@@ -985,8 +949,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'registeredsymbol',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     }
                   ],
@@ -1033,8 +996,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               },
               'type' => 'menu_entry'
             },
@@ -1055,8 +1017,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'result',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     },
                     {
@@ -1071,8 +1032,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'textdegree',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     },
                     {
@@ -1087,8 +1047,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'tie',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     },
                     {
@@ -1103,8 +1062,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'today',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     },
                     {
@@ -1119,8 +1077,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     }
                   ],
@@ -1163,8 +1120,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               },
               'type' => 'menu_entry'
             },
@@ -1185,8 +1141,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -1201,8 +1156,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'ae',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -1217,8 +1171,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'oe',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -1233,8 +1186,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'AE',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -1249,8 +1201,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'OE',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -1265,8 +1216,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'o',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -1281,8 +1231,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'O',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -1297,8 +1246,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'ss',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -1313,8 +1261,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'l',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -1329,8 +1276,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'L',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -1345,8 +1291,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'DH',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -1361,8 +1306,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'dh',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -1377,8 +1321,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'TH',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -1393,8 +1336,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'th',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     }
                   ],
@@ -1455,8 +1397,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               },
               'type' => 'menu_entry'
             },
@@ -1482,8 +1423,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => '"',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -1503,8 +1443,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -1528,8 +1467,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 17,
-                                'macro' => ''
+                                'line_nr' => 17
                               }
                             }
                           ],
@@ -1539,8 +1477,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -1560,8 +1497,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -1581,8 +1517,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => '`',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -1602,8 +1537,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -1623,8 +1557,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -1644,8 +1577,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -1665,8 +1597,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'ringaccent',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -1686,8 +1617,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'H',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -1707,8 +1637,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'ogonek',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     }
                   ],
@@ -1763,8 +1692,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               },
               'type' => 'menu_entry'
             },
@@ -1790,8 +1718,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'dotaccent',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       }
                     },
                     {
@@ -1811,8 +1738,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'u',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       }
                     },
                     {
@@ -1832,8 +1758,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'ubaraccent',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       }
                     },
                     {
@@ -1853,8 +1778,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       }
                     },
                     {
@@ -1874,8 +1798,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       }
                     },
                     {
@@ -1895,8 +1818,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       }
                     },
                     {
@@ -1916,8 +1838,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'tieaccent',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       }
                     }
                   ],
@@ -1964,8 +1885,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               },
               'type' => 'menu_entry'
             },
@@ -1991,8 +1911,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 19,
-                        'macro' => ''
+                        'line_nr' => 19
                       }
                     },
                     {
@@ -2016,8 +1935,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                               'cmdname' => '=',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 19,
-                                'macro' => ''
+                                'line_nr' => 19
                               }
                             }
                           ],
@@ -2027,8 +1945,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => '`',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 19,
-                        'macro' => ''
+                        'line_nr' => 19
                       }
                     },
                     {
@@ -2052,8 +1969,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                               'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 19,
-                                'macro' => ''
+                                'line_nr' => 19
                               }
                             }
                           ],
@@ -2063,8 +1979,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 19,
-                        'macro' => ''
+                        'line_nr' => 19
                       }
                     }
                   ],
@@ -2103,8 +2018,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               },
               'type' => 'menu_entry'
             },
@@ -2125,8 +2039,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'quotedblleft',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     },
                     {
@@ -2141,8 +2054,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'quotedblright',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     },
                     {
@@ -2157,8 +2069,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'quoteleft',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     },
                     {
@@ -2173,8 +2084,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'quoteright',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     },
                     {
@@ -2189,8 +2099,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'quotedblbase',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     },
                     {
@@ -2205,8 +2114,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'quotesinglbase',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     }
                   ],
@@ -2251,8 +2159,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               },
               'type' => 'menu_entry'
             },
@@ -2273,8 +2180,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'guillemetleft',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 21,
-                        'macro' => ''
+                        'line_nr' => 21
                       }
                     },
                     {
@@ -2289,8 +2195,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'guillemetright',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 21,
-                        'macro' => ''
+                        'line_nr' => 21
                       }
                     },
                     {
@@ -2305,8 +2210,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'guillemotleft',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 21,
-                        'macro' => ''
+                        'line_nr' => 21
                       }
                     },
                     {
@@ -2321,8 +2225,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'guillemotright',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 21,
-                        'macro' => ''
+                        'line_nr' => 21
                       }
                     },
                     {
@@ -2337,8 +2240,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'guilsinglleft',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 21,
-                        'macro' => ''
+                        'line_nr' => 21
                       }
                     },
                     {
@@ -2353,8 +2255,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'guilsinglright',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 21,
-                        'macro' => ''
+                        'line_nr' => 21
                       }
                     }
                   ],
@@ -2399,8 +2300,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               },
               'type' => 'menu_entry'
             },
@@ -2447,8 +2347,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               },
               'type' => 'menu_entry'
             },
@@ -2487,8 +2386,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'acronym',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 23,
-                        'macro' => ''
+                        'line_nr' => 23
                       }
                     },
                     {
@@ -2508,8 +2406,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'acronym',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 23,
-                        'macro' => ''
+                        'line_nr' => 23
                       }
                     },
                     {
@@ -2529,8 +2426,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'acronym',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 23,
-                        'macro' => ''
+                        'line_nr' => 23
                       }
                     }
                   ],
@@ -2569,8 +2465,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               },
               'type' => 'menu_entry'
             },
@@ -2609,8 +2504,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'abbr',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -2630,8 +2524,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'abbr',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -2651,8 +2544,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'abbr',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     }
                   ],
@@ -2691,8 +2583,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               },
               'type' => 'menu_entry'
             },
@@ -2737,8 +2628,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'email',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 25,
-                        'macro' => ''
+                        'line_nr' => 25
                       }
                     },
                     {
@@ -2764,8 +2654,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'email',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 25,
-                        'macro' => ''
+                        'line_nr' => 25
                       }
                     }
                   ],
@@ -2802,8 +2691,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               },
               'type' => 'menu_entry'
             },
@@ -2832,8 +2720,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 26,
-                        'macro' => ''
+                        'line_nr' => 26
                       }
                     },
                     {
@@ -2888,8 +2775,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 26,
-                        'macro' => ''
+                        'line_nr' => 26
                       }
                     }
                   ],
@@ -2926,8 +2812,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               },
               'type' => 'menu_entry'
             },
@@ -2957,8 +2842,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 27,
-                        'macro' => ''
+                        'line_nr' => 27
                       }
                     }
                   ],
@@ -2993,8 +2877,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               },
               'type' => 'menu_entry'
             },
@@ -3027,8 +2910,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                               'cmdname' => 'asis',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 28,
-                                'macro' => ''
+                                'line_nr' => 28
                               }
                             }
                           ],
@@ -3038,8 +2920,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'cite',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       }
                     },
                     {
@@ -3072,8 +2953,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                               'cmdname' => 'b',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 28,
-                                'macro' => ''
+                                'line_nr' => 28
                               }
                             }
                           ],
@@ -3083,8 +2963,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'w',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       }
                     },
                     {
@@ -3104,8 +2983,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'r',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       }
                     },
                     {
@@ -3125,8 +3003,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'sc',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       }
                     },
                     {
@@ -3146,8 +3023,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'strong',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       }
                     },
                     {
@@ -3167,8 +3043,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 't',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       }
                     },
                     {
@@ -3188,8 +3063,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'var',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       }
                     },
                     {
@@ -3209,8 +3083,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'dfn',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       }
                     },
                     {
@@ -3230,8 +3103,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'i',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       }
                     }
                   ],
@@ -3282,8 +3154,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               },
               'type' => 'menu_entry'
             },
@@ -3309,8 +3180,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'env',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 29,
-                        'macro' => ''
+                        'line_nr' => 29
                       }
                     },
                     {
@@ -3330,8 +3200,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 29,
-                        'macro' => ''
+                        'line_nr' => 29
                       }
                     },
                     {
@@ -3351,8 +3220,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'option',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 29,
-                        'macro' => ''
+                        'line_nr' => 29
                       }
                     },
                     {
@@ -3372,8 +3240,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'samp',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 29,
-                        'macro' => ''
+                        'line_nr' => 29
                       }
                     },
                     {
@@ -3393,8 +3260,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'command',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 29,
-                        'macro' => ''
+                        'line_nr' => 29
                       }
                     },
                     {
@@ -3414,8 +3280,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'file',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 29,
-                        'macro' => ''
+                        'line_nr' => 29
                       }
                     },
                     {
@@ -3442,8 +3307,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                               'cmdname' => 'key',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 29,
-                                'macro' => ''
+                                'line_nr' => 29
                               }
                             }
                           ],
@@ -3453,8 +3317,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'kbd',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 29,
-                        'macro' => ''
+                        'line_nr' => 29
                       }
                     }
                   ],
@@ -3501,8 +3364,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               },
               'type' => 'menu_entry'
             },
@@ -3531,8 +3393,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'dmn',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 30,
-                        'macro' => ''
+                        'line_nr' => 30
                       }
                     }
                   ],
@@ -3568,8 +3429,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               },
               'type' => 'menu_entry'
             },
@@ -3595,8 +3455,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'sansserif',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 31,
-                        'macro' => ''
+                        'line_nr' => 31
                       }
                     },
                     {
@@ -3616,8 +3475,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'slanted',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 31,
-                        'macro' => ''
+                        'line_nr' => 31
                       }
                     }
                   ],
@@ -3654,8 +3512,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               },
               'type' => 'menu_entry'
             },
@@ -3681,8 +3538,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'indicateurl',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 32,
-                        'macro' => ''
+                        'line_nr' => 32
                       }
                     }
                   ],
@@ -3717,8 +3573,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               },
               'type' => 'menu_entry'
             },
@@ -3744,8 +3599,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'sub',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 33,
-                        'macro' => ''
+                        'line_nr' => 33
                       }
                     },
                     {
@@ -3765,8 +3619,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'sup',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 33,
-                        'macro' => ''
+                        'line_nr' => 33
                       }
                     }
                   ],
@@ -3803,8 +3656,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               },
               'type' => 'menu_entry'
             },
@@ -3830,8 +3682,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'url',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 34,
-                        'macro' => ''
+                        'line_nr' => 34
                       }
                     },
                     {
@@ -3864,8 +3715,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'url',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 34,
-                        'macro' => ''
+                        'line_nr' => 34
                       }
                     },
                     {
@@ -3896,8 +3746,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'uref',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 34,
-                        'macro' => ''
+                        'line_nr' => 34
                       }
                     }
                   ],
@@ -3936,8 +3785,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               },
               'type' => 'menu_entry'
             },
@@ -3969,15 +3817,13 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -3994,8 +3840,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -4039,8 +3884,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 37,
-        'macro' => ''
+        'line_nr' => 37
       }
     },
     {
@@ -4090,8 +3934,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 38,
-        'macro' => ''
+        'line_nr' => 38
       }
     },
     {
@@ -4171,8 +4014,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 40,
-        'macro' => ''
+        'line_nr' => 40
       }
     },
     {
@@ -4258,8 +4100,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 41,
-        'macro' => ''
+        'line_nr' => 41
       }
     },
     {
@@ -4275,8 +4116,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'atchar',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               }
             },
             {
@@ -4291,8 +4131,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'lbracechar',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               }
             },
             {
@@ -4307,8 +4146,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'rbracechar',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               }
             },
             {
@@ -4323,8 +4161,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'backslashchar',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               }
             },
             {
@@ -4339,8 +4176,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'hashchar',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               }
             }
           ],
@@ -4365,8 +4201,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 43,
-        'macro' => ''
+        'line_nr' => 43
       }
     },
     {
@@ -4382,8 +4217,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'atchar',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             },
             {
@@ -4398,8 +4232,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'lbracechar',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             },
             {
@@ -4414,8 +4247,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'rbracechar',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             },
             {
@@ -4430,8 +4262,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'backslashchar',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             },
             {
@@ -4446,8 +4277,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'hashchar',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             }
           ],
@@ -4478,8 +4308,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 44,
-        'macro' => ''
+        'line_nr' => 44
       }
     },
     {
@@ -4495,8 +4324,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'LaTeX',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -4511,8 +4339,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'TeX',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -4527,8 +4354,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'bullet',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -4543,8 +4369,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -4559,8 +4384,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -4575,8 +4399,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -4591,8 +4414,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             }
           ],
@@ -4617,8 +4439,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 46,
-        'macro' => ''
+        'line_nr' => 46
       }
     },
     {
@@ -4634,8 +4455,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'LaTeX',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               }
             },
             {
@@ -4650,8 +4470,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'TeX',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               }
             },
             {
@@ -4666,8 +4485,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'bullet',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               }
             },
             {
@@ -4682,8 +4500,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               }
             },
             {
@@ -4698,8 +4515,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               }
             },
             {
@@ -4714,8 +4530,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               }
             },
             {
@@ -4730,8 +4545,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               }
             }
           ],
@@ -4762,8 +4576,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 47,
-        'macro' => ''
+        'line_nr' => 47
       }
     },
     {
@@ -4779,8 +4592,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             },
             {
@@ -4795,8 +4607,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             },
             {
@@ -4811,8 +4622,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'euro',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             },
             {
@@ -4827,8 +4637,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             },
             {
@@ -4843,8 +4652,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             },
             {
@@ -4859,8 +4667,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             }
           ],
@@ -4885,8 +4692,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 49,
-        'macro' => ''
+        'line_nr' => 49
       }
     },
     {
@@ -4902,8 +4708,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             },
             {
@@ -4918,8 +4723,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             },
             {
@@ -4934,8 +4738,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'euro',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             },
             {
@@ -4950,8 +4753,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             },
             {
@@ -4966,8 +4768,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             },
             {
@@ -4982,8 +4783,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             }
           ],
@@ -5014,8 +4814,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 50,
-        'macro' => ''
+        'line_nr' => 50
       }
     },
     {
@@ -5031,8 +4830,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               }
             },
             {
@@ -5047,8 +4845,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'leq',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               }
             },
             {
@@ -5063,8 +4860,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'arrow',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               }
             }
           ],
@@ -5089,8 +4885,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 52,
-        'macro' => ''
+        'line_nr' => 52
       }
     },
     {
@@ -5106,8 +4901,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               }
             },
             {
@@ -5122,8 +4916,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'leq',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               }
             },
             {
@@ -5138,8 +4931,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'arrow',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               }
             }
           ],
@@ -5170,8 +4962,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 53,
-        'macro' => ''
+        'line_nr' => 53
       }
     },
     {
@@ -5187,8 +4978,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ordf',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 55,
-                'macro' => ''
+                'line_nr' => 55
               }
             },
             {
@@ -5203,8 +4993,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ordm',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 55,
-                'macro' => ''
+                'line_nr' => 55
               }
             },
             {
@@ -5219,8 +5008,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'point',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 55,
-                'macro' => ''
+                'line_nr' => 55
               }
             },
             {
@@ -5235,8 +5023,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'pounds',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 55,
-                'macro' => ''
+                'line_nr' => 55
               }
             },
             {
@@ -5251,8 +5038,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'print',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 55,
-                'macro' => ''
+                'line_nr' => 55
               }
             },
             {
@@ -5267,8 +5053,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'questiondown',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 55,
-                'macro' => ''
+                'line_nr' => 55
               }
             },
             {
@@ -5283,8 +5068,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 55,
-                'macro' => ''
+                'line_nr' => 55
               }
             }
           ],
@@ -5309,8 +5093,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 55,
-        'macro' => ''
+        'line_nr' => 55
       }
     },
     {
@@ -5326,8 +5109,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ordf',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -5342,8 +5124,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ordm',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -5358,8 +5139,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'point',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -5374,8 +5154,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'pounds',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -5390,8 +5169,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'print',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -5406,8 +5184,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'questiondown',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -5422,8 +5199,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             }
           ],
@@ -5454,8 +5230,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 56,
-        'macro' => ''
+        'line_nr' => 56
       }
     },
     {
@@ -5471,8 +5246,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'result',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             },
             {
@@ -5487,8 +5261,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'textdegree',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             },
             {
@@ -5503,8 +5276,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'tie',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             },
             {
@@ -5519,8 +5291,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'today',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             },
             {
@@ -5535,8 +5306,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             }
           ],
@@ -5561,8 +5331,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 58,
-        'macro' => ''
+        'line_nr' => 58
       }
     },
     {
@@ -5578,8 +5347,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'result',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             },
             {
@@ -5594,8 +5362,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'textdegree',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             },
             {
@@ -5610,8 +5377,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'tie',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             },
             {
@@ -5626,8 +5392,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'today',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             },
             {
@@ -5642,8 +5407,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             }
           ],
@@ -5674,8 +5438,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 59,
-        'macro' => ''
+        'line_nr' => 59
       }
     },
     {
@@ -5691,8 +5454,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -5707,8 +5469,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ae',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -5723,8 +5484,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'oe',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -5739,8 +5499,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'AE',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -5755,8 +5514,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'OE',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -5771,8 +5529,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'o',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -5787,8 +5544,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'O',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -5803,8 +5559,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ss',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -5819,8 +5574,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -5835,8 +5589,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'L',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -5851,8 +5604,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'DH',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -5867,8 +5619,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'dh',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -5883,8 +5634,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'TH',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -5899,8 +5649,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'th',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             }
           ],
@@ -5925,8 +5674,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 61,
-        'macro' => ''
+        'line_nr' => 61
       }
     },
     {
@@ -5942,8 +5690,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -5958,8 +5705,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ae',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -5974,8 +5720,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'oe',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -5990,8 +5735,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'AE',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -6006,8 +5750,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'OE',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -6022,8 +5765,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'o',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -6038,8 +5780,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'O',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -6054,8 +5795,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ss',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -6070,8 +5810,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -6086,8 +5825,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'L',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -6102,8 +5840,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'DH',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -6118,8 +5855,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'dh',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -6134,8 +5870,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'TH',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -6150,8 +5885,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'th',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             }
           ],
@@ -6182,8 +5916,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 62,
-        'macro' => ''
+        'line_nr' => 62
       }
     },
     {
@@ -6204,8 +5937,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             },
             {
@@ -6225,8 +5957,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             },
             {
@@ -6250,8 +5981,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 64,
-                        'macro' => ''
+                        'line_nr' => 64
                       }
                     }
                   ],
@@ -6261,8 +5991,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             },
             {
@@ -6282,8 +6011,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             },
             {
@@ -6303,8 +6031,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             },
             {
@@ -6324,8 +6051,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             },
             {
@@ -6345,8 +6071,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => ',',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             },
             {
@@ -6366,8 +6091,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             },
             {
@@ -6387,8 +6111,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ringaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             },
             {
@@ -6408,8 +6131,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'H',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             },
             {
@@ -6429,8 +6151,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ogonek',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             }
           ],
@@ -6455,8 +6176,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 64,
-        'macro' => ''
+        'line_nr' => 64
       }
     },
     {
@@ -6477,8 +6197,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             },
             {
@@ -6498,8 +6217,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             },
             {
@@ -6523,8 +6241,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
-                        'macro' => ''
+                        'line_nr' => 65
                       }
                     }
                   ],
@@ -6534,8 +6251,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             },
             {
@@ -6555,8 +6271,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             },
             {
@@ -6576,8 +6291,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             },
             {
@@ -6597,8 +6311,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             },
             {
@@ -6618,8 +6331,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => ',',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             },
             {
@@ -6639,8 +6351,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             },
             {
@@ -6660,8 +6371,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ringaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             },
             {
@@ -6681,8 +6391,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'H',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             },
             {
@@ -6702,8 +6411,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ogonek',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             }
           ],
@@ -6734,8 +6442,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 65,
-        'macro' => ''
+        'line_nr' => 65
       }
     },
     {
@@ -6756,8 +6463,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 67,
-                'macro' => ''
+                'line_nr' => 67
               }
             },
             {
@@ -6777,8 +6483,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'u',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 67,
-                'macro' => ''
+                'line_nr' => 67
               }
             },
             {
@@ -6798,8 +6503,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ubaraccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 67,
-                'macro' => ''
+                'line_nr' => 67
               }
             },
             {
@@ -6819,8 +6523,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 67,
-                'macro' => ''
+                'line_nr' => 67
               }
             },
             {
@@ -6840,8 +6543,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'v',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 67,
-                'macro' => ''
+                'line_nr' => 67
               }
             },
             {
@@ -6861,8 +6563,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 67,
-                'macro' => ''
+                'line_nr' => 67
               }
             },
             {
@@ -6882,8 +6583,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'tieaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 67,
-                'macro' => ''
+                'line_nr' => 67
               }
             }
           ],
@@ -6908,8 +6608,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 67,
-        'macro' => ''
+        'line_nr' => 67
       }
     },
     {
@@ -6930,8 +6629,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 68,
-                'macro' => ''
+                'line_nr' => 68
               }
             },
             {
@@ -6951,8 +6649,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'u',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 68,
-                'macro' => ''
+                'line_nr' => 68
               }
             },
             {
@@ -6972,8 +6669,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ubaraccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 68,
-                'macro' => ''
+                'line_nr' => 68
               }
             },
             {
@@ -6993,8 +6689,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 68,
-                'macro' => ''
+                'line_nr' => 68
               }
             },
             {
@@ -7014,8 +6709,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'v',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 68,
-                'macro' => ''
+                'line_nr' => 68
               }
             },
             {
@@ -7035,8 +6729,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 68,
-                'macro' => ''
+                'line_nr' => 68
               }
             },
             {
@@ -7056,8 +6749,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'tieaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 68,
-                'macro' => ''
+                'line_nr' => 68
               }
             }
           ],
@@ -7088,8 +6780,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 68,
-        'macro' => ''
+        'line_nr' => 68
       }
     },
     {
@@ -7110,8 +6801,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 70,
-                'macro' => ''
+                'line_nr' => 70
               }
             },
             {
@@ -7135,8 +6825,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 70,
-                        'macro' => ''
+                        'line_nr' => 70
                       }
                     }
                   ],
@@ -7146,8 +6835,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 70,
-                'macro' => ''
+                'line_nr' => 70
               }
             },
             {
@@ -7171,8 +6859,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 70,
-                        'macro' => ''
+                        'line_nr' => 70
                       }
                     }
                   ],
@@ -7182,8 +6869,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => ',',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 70,
-                'macro' => ''
+                'line_nr' => 70
               }
             }
           ],
@@ -7208,8 +6894,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 70,
-        'macro' => ''
+        'line_nr' => 70
       }
     },
     {
@@ -7230,8 +6915,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             },
             {
@@ -7255,8 +6939,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 71,
-                        'macro' => ''
+                        'line_nr' => 71
                       }
                     }
                   ],
@@ -7266,8 +6949,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             },
             {
@@ -7291,8 +6973,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 71,
-                        'macro' => ''
+                        'line_nr' => 71
                       }
                     }
                   ],
@@ -7302,8 +6983,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => ',',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             }
           ],
@@ -7334,8 +7014,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 71,
-        'macro' => ''
+        'line_nr' => 71
       }
     },
     {
@@ -7351,8 +7030,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 73,
-                'macro' => ''
+                'line_nr' => 73
               }
             },
             {
@@ -7367,8 +7045,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 73,
-                'macro' => ''
+                'line_nr' => 73
               }
             },
             {
@@ -7383,8 +7060,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'quoteleft',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 73,
-                'macro' => ''
+                'line_nr' => 73
               }
             },
             {
@@ -7399,8 +7075,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'quoteright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 73,
-                'macro' => ''
+                'line_nr' => 73
               }
             },
             {
@@ -7415,8 +7090,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'quotedblbase',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 73,
-                'macro' => ''
+                'line_nr' => 73
               }
             },
             {
@@ -7431,8 +7105,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'quotesinglbase',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 73,
-                'macro' => ''
+                'line_nr' => 73
               }
             }
           ],
@@ -7457,8 +7130,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 73,
-        'macro' => ''
+        'line_nr' => 73
       }
     },
     {
@@ -7474,8 +7146,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 74,
-                'macro' => ''
+                'line_nr' => 74
               }
             },
             {
@@ -7490,8 +7161,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 74,
-                'macro' => ''
+                'line_nr' => 74
               }
             },
             {
@@ -7506,8 +7176,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'quoteleft',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 74,
-                'macro' => ''
+                'line_nr' => 74
               }
             },
             {
@@ -7522,8 +7191,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'quoteright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 74,
-                'macro' => ''
+                'line_nr' => 74
               }
             },
             {
@@ -7538,8 +7206,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'quotedblbase',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 74,
-                'macro' => ''
+                'line_nr' => 74
               }
             },
             {
@@ -7554,8 +7221,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'quotesinglbase',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 74,
-                'macro' => ''
+                'line_nr' => 74
               }
             }
           ],
@@ -7586,8 +7252,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 74,
-        'macro' => ''
+        'line_nr' => 74
       }
     },
     {
@@ -7603,8 +7268,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'guillemetleft',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 76,
-                'macro' => ''
+                'line_nr' => 76
               }
             },
             {
@@ -7619,8 +7283,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'guillemetright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 76,
-                'macro' => ''
+                'line_nr' => 76
               }
             },
             {
@@ -7635,8 +7298,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'guillemotleft',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 76,
-                'macro' => ''
+                'line_nr' => 76
               }
             },
             {
@@ -7651,8 +7313,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'guillemotright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 76,
-                'macro' => ''
+                'line_nr' => 76
               }
             },
             {
@@ -7667,8 +7328,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'guilsinglleft',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 76,
-                'macro' => ''
+                'line_nr' => 76
               }
             },
             {
@@ -7683,8 +7343,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'guilsinglright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 76,
-                'macro' => ''
+                'line_nr' => 76
               }
             }
           ],
@@ -7709,8 +7368,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 76,
-        'macro' => ''
+        'line_nr' => 76
       }
     },
     {
@@ -7726,8 +7384,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'guillemetleft',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 77,
-                'macro' => ''
+                'line_nr' => 77
               }
             },
             {
@@ -7742,8 +7399,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'guillemetright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 77,
-                'macro' => ''
+                'line_nr' => 77
               }
             },
             {
@@ -7758,8 +7414,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'guillemotleft',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 77,
-                'macro' => ''
+                'line_nr' => 77
               }
             },
             {
@@ -7774,8 +7429,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'guillemotright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 77,
-                'macro' => ''
+                'line_nr' => 77
               }
             },
             {
@@ -7790,8 +7444,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'guilsinglleft',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 77,
-                'macro' => ''
+                'line_nr' => 77
               }
             },
             {
@@ -7806,8 +7459,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'guilsinglright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 77,
-                'macro' => ''
+                'line_nr' => 77
               }
             }
           ],
@@ -7838,8 +7490,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 77,
-        'macro' => ''
+        'line_nr' => 77
       }
     },
     {
@@ -7871,8 +7522,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 79,
-        'macro' => ''
+        'line_nr' => 79
       }
     },
     {
@@ -7910,8 +7560,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 80,
-        'macro' => ''
+        'line_nr' => 80
       }
     },
     {
@@ -7945,8 +7594,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 82,
-                'macro' => ''
+                'line_nr' => 82
               }
             },
             {
@@ -7966,8 +7614,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 82,
-                'macro' => ''
+                'line_nr' => 82
               }
             },
             {
@@ -7987,8 +7634,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 82,
-                'macro' => ''
+                'line_nr' => 82
               }
             }
           ],
@@ -8013,8 +7659,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 82,
-        'macro' => ''
+        'line_nr' => 82
       }
     },
     {
@@ -8048,8 +7693,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 83,
-                'macro' => ''
+                'line_nr' => 83
               }
             },
             {
@@ -8069,8 +7713,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 83,
-                'macro' => ''
+                'line_nr' => 83
               }
             },
             {
@@ -8090,8 +7733,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 83,
-                'macro' => ''
+                'line_nr' => 83
               }
             }
           ],
@@ -8122,8 +7764,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 83,
-        'macro' => ''
+        'line_nr' => 83
       }
     },
     {
@@ -8157,8 +7798,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'abbr',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 85,
-                'macro' => ''
+                'line_nr' => 85
               }
             },
             {
@@ -8178,8 +7818,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'abbr',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 85,
-                'macro' => ''
+                'line_nr' => 85
               }
             },
             {
@@ -8199,8 +7838,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'abbr',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 85,
-                'macro' => ''
+                'line_nr' => 85
               }
             }
           ],
@@ -8234,8 +7872,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                 'cmdname' => 'ifnottex',
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 86,
-                  'macro' => ''
+                  'line_nr' => 86
                 }
               },
               'sourcemark_type' => 'expanded_conditional_command',
@@ -8256,8 +7893,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 85,
-        'macro' => ''
+        'line_nr' => 85
       }
     },
     {
@@ -8291,8 +7927,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'abbr',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 87,
-                'macro' => ''
+                'line_nr' => 87
               }
             },
             {
@@ -8312,8 +7947,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'abbr',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 87,
-                'macro' => ''
+                'line_nr' => 87
               }
             },
             {
@@ -8333,8 +7967,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'abbr',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 87,
-                'macro' => ''
+                'line_nr' => 87
               }
             }
           ],
@@ -8381,8 +8014,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 88,
-                  'macro' => ''
+                  'line_nr' => 88
                 }
               },
               'sourcemark_type' => 'expanded_conditional_command',
@@ -8407,8 +8039,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 87,
-        'macro' => ''
+        'line_nr' => 87
       }
     },
     {
@@ -8448,8 +8079,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 90,
-                'macro' => ''
+                'line_nr' => 90
               }
             },
             {
@@ -8475,8 +8105,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 90,
-                'macro' => ''
+                'line_nr' => 90
               }
             }
           ],
@@ -8501,8 +8130,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 90,
-        'macro' => ''
+        'line_nr' => 90
       }
     },
     {
@@ -8542,8 +8170,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 91,
-                'macro' => ''
+                'line_nr' => 91
               }
             },
             {
@@ -8569,8 +8196,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 91,
-                'macro' => ''
+                'line_nr' => 91
               }
             }
           ],
@@ -8601,8 +8227,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 91,
-        'macro' => ''
+        'line_nr' => 91
       }
     },
     {
@@ -8626,8 +8251,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 93,
-                'macro' => ''
+                'line_nr' => 93
               }
             },
             {
@@ -8682,8 +8306,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 93,
-                'macro' => ''
+                'line_nr' => 93
               }
             }
           ],
@@ -8717,8 +8340,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                 'cmdname' => 'ifnottex',
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 94,
-                  'macro' => ''
+                  'line_nr' => 94
                 }
               },
               'sourcemark_type' => 'expanded_conditional_command',
@@ -8739,8 +8361,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 93,
-        'macro' => ''
+        'line_nr' => 93
       }
     },
     {
@@ -8764,8 +8385,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 95,
-                'macro' => ''
+                'line_nr' => 95
               }
             },
             {
@@ -8820,8 +8440,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 95,
-                'macro' => ''
+                'line_nr' => 95
               }
             }
           ],
@@ -8868,8 +8487,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 96,
-                  'macro' => ''
+                  'line_nr' => 96
                 }
               },
               'sourcemark_type' => 'expanded_conditional_command',
@@ -8894,8 +8512,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 95,
-        'macro' => ''
+        'line_nr' => 95
       }
     },
     {
@@ -8920,8 +8537,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 98,
-                'macro' => ''
+                'line_nr' => 98
               }
             }
           ],
@@ -8955,8 +8571,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                 'cmdname' => 'ifnottex',
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 99,
-                  'macro' => ''
+                  'line_nr' => 99
                 }
               },
               'sourcemark_type' => 'expanded_conditional_command',
@@ -8977,8 +8592,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 98,
-        'macro' => ''
+        'line_nr' => 98
       }
     },
     {
@@ -9003,8 +8617,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 100,
-                'macro' => ''
+                'line_nr' => 100
               }
             }
           ],
@@ -9051,8 +8664,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 101,
-                  'macro' => ''
+                  'line_nr' => 101
                 }
               },
               'sourcemark_type' => 'expanded_conditional_command',
@@ -9077,8 +8689,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 100,
-        'macro' => ''
+        'line_nr' => 100
       }
     },
     {
@@ -9106,8 +8717,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 103,
-                        'macro' => ''
+                        'line_nr' => 103
                       }
                     }
                   ],
@@ -9117,8 +8727,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'cite',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 103,
-                'macro' => ''
+                'line_nr' => 103
               }
             },
             {
@@ -9151,8 +8760,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'b',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 103,
-                        'macro' => ''
+                        'line_nr' => 103
                       }
                     }
                   ],
@@ -9162,8 +8770,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 103,
-                'macro' => ''
+                'line_nr' => 103
               }
             },
             {
@@ -9183,8 +8790,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'r',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 103,
-                'macro' => ''
+                'line_nr' => 103
               }
             },
             {
@@ -9204,8 +8810,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 103,
-                'macro' => ''
+                'line_nr' => 103
               }
             },
             {
@@ -9225,8 +8830,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'strong',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 103,
-                'macro' => ''
+                'line_nr' => 103
               }
             },
             {
@@ -9246,8 +8850,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 't',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 103,
-                'macro' => ''
+                'line_nr' => 103
               }
             },
             {
@@ -9267,8 +8870,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 103,
-                'macro' => ''
+                'line_nr' => 103
               }
             },
             {
@@ -9288,8 +8890,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 103,
-                'macro' => ''
+                'line_nr' => 103
               }
             },
             {
@@ -9309,8 +8910,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'i',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 103,
-                'macro' => ''
+                'line_nr' => 103
               }
             }
           ],
@@ -9335,8 +8935,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 103,
-        'macro' => ''
+        'line_nr' => 103
       }
     },
     {
@@ -9364,8 +8963,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 104,
-                        'macro' => ''
+                        'line_nr' => 104
                       }
                     }
                   ],
@@ -9375,8 +8973,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'cite',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 104,
-                'macro' => ''
+                'line_nr' => 104
               }
             },
             {
@@ -9409,8 +9006,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'b',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 104,
-                        'macro' => ''
+                        'line_nr' => 104
                       }
                     }
                   ],
@@ -9420,8 +9016,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 104,
-                'macro' => ''
+                'line_nr' => 104
               }
             },
             {
@@ -9441,8 +9036,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'r',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 104,
-                'macro' => ''
+                'line_nr' => 104
               }
             },
             {
@@ -9462,8 +9056,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 104,
-                'macro' => ''
+                'line_nr' => 104
               }
             },
             {
@@ -9483,8 +9076,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'strong',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 104,
-                'macro' => ''
+                'line_nr' => 104
               }
             },
             {
@@ -9504,8 +9096,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 't',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 104,
-                'macro' => ''
+                'line_nr' => 104
               }
             },
             {
@@ -9525,8 +9116,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 104,
-                'macro' => ''
+                'line_nr' => 104
               }
             },
             {
@@ -9546,8 +9136,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 104,
-                'macro' => ''
+                'line_nr' => 104
               }
             },
             {
@@ -9567,8 +9156,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'i',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 104,
-                'macro' => ''
+                'line_nr' => 104
               }
             }
           ],
@@ -9599,8 +9187,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 104,
-        'macro' => ''
+        'line_nr' => 104
       }
     },
     {
@@ -9621,8 +9208,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'env',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 106,
-                'macro' => ''
+                'line_nr' => 106
               }
             },
             {
@@ -9642,8 +9228,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 106,
-                'macro' => ''
+                'line_nr' => 106
               }
             },
             {
@@ -9663,8 +9248,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'option',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 106,
-                'macro' => ''
+                'line_nr' => 106
               }
             },
             {
@@ -9684,8 +9268,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 106,
-                'macro' => ''
+                'line_nr' => 106
               }
             },
             {
@@ -9705,8 +9288,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'command',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 106,
-                'macro' => ''
+                'line_nr' => 106
               }
             },
             {
@@ -9726,8 +9308,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'file',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 106,
-                'macro' => ''
+                'line_nr' => 106
               }
             },
             {
@@ -9754,8 +9335,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'key',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 106,
-                        'macro' => ''
+                        'line_nr' => 106
                       }
                     }
                   ],
@@ -9765,8 +9345,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'kbd',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 106,
-                'macro' => ''
+                'line_nr' => 106
               }
             }
           ],
@@ -9791,8 +9370,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 106,
-        'macro' => ''
+        'line_nr' => 106
       }
     },
     {
@@ -9813,8 +9391,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'env',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 107,
-                'macro' => ''
+                'line_nr' => 107
               }
             },
             {
@@ -9834,8 +9411,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 107,
-                'macro' => ''
+                'line_nr' => 107
               }
             },
             {
@@ -9855,8 +9431,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'option',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 107,
-                'macro' => ''
+                'line_nr' => 107
               }
             },
             {
@@ -9876,8 +9451,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 107,
-                'macro' => ''
+                'line_nr' => 107
               }
             },
             {
@@ -9897,8 +9471,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'command',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 107,
-                'macro' => ''
+                'line_nr' => 107
               }
             },
             {
@@ -9918,8 +9491,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'file',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 107,
-                'macro' => ''
+                'line_nr' => 107
               }
             },
             {
@@ -9946,8 +9518,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'key',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 107,
-                        'macro' => ''
+                        'line_nr' => 107
                       }
                     }
                   ],
@@ -9957,8 +9528,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'kbd',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 107,
-                'macro' => ''
+                'line_nr' => 107
               }
             }
           ],
@@ -9989,8 +9559,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 107,
-        'macro' => ''
+        'line_nr' => 107
       }
     },
     {
@@ -10014,8 +9583,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'dmn',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 109,
-                'macro' => ''
+                'line_nr' => 109
               }
             }
           ],
@@ -10040,8 +9608,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 109,
-        'macro' => ''
+        'line_nr' => 109
       }
     },
     {
@@ -10065,8 +9632,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'dmn',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 110,
-                'macro' => ''
+                'line_nr' => 110
               }
             }
           ],
@@ -10097,8 +9663,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 110,
-        'macro' => ''
+        'line_nr' => 110
       }
     },
     {
@@ -10119,8 +9684,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'sansserif',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 112,
-                'macro' => ''
+                'line_nr' => 112
               }
             },
             {
@@ -10140,8 +9704,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'slanted',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 112,
-                'macro' => ''
+                'line_nr' => 112
               }
             }
           ],
@@ -10166,8 +9729,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 112,
-        'macro' => ''
+        'line_nr' => 112
       }
     },
     {
@@ -10188,8 +9750,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'sansserif',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 113,
-                'macro' => ''
+                'line_nr' => 113
               }
             },
             {
@@ -10209,8 +9770,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'slanted',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 113,
-                'macro' => ''
+                'line_nr' => 113
               }
             }
           ],
@@ -10241,8 +9801,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 113,
-        'macro' => ''
+        'line_nr' => 113
       }
     },
     {
@@ -10263,8 +9822,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'indicateurl',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 115,
-                'macro' => ''
+                'line_nr' => 115
               }
             }
           ],
@@ -10289,8 +9847,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 115,
-        'macro' => ''
+        'line_nr' => 115
       }
     },
     {
@@ -10311,8 +9868,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'indicateurl',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 116,
-                'macro' => ''
+                'line_nr' => 116
               }
             }
           ],
@@ -10343,8 +9899,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 116,
-        'macro' => ''
+        'line_nr' => 116
       }
     },
     {
@@ -10365,8 +9920,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'sub',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 118,
-                'macro' => ''
+                'line_nr' => 118
               }
             },
             {
@@ -10386,8 +9940,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'sup',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 118,
-                'macro' => ''
+                'line_nr' => 118
               }
             }
           ],
@@ -10412,8 +9965,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 118,
-        'macro' => ''
+        'line_nr' => 118
       }
     },
     {
@@ -10434,8 +9986,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'sub',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 119,
-                'macro' => ''
+                'line_nr' => 119
               }
             },
             {
@@ -10455,8 +10006,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'sup',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 119,
-                'macro' => ''
+                'line_nr' => 119
               }
             }
           ],
@@ -10487,8 +10037,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 119,
-        'macro' => ''
+        'line_nr' => 119
       }
     },
     {
@@ -10509,8 +10058,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'url',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 121,
-                'macro' => ''
+                'line_nr' => 121
               }
             },
             {
@@ -10543,8 +10091,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'url',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 121,
-                'macro' => ''
+                'line_nr' => 121
               }
             },
             {
@@ -10575,8 +10122,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'uref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 121,
-                'macro' => ''
+                'line_nr' => 121
               }
             }
           ],
@@ -10601,8 +10147,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 121,
-        'macro' => ''
+        'line_nr' => 121
       }
     },
     {
@@ -10623,8 +10168,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'url',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 122,
-                'macro' => ''
+                'line_nr' => 122
               }
             },
             {
@@ -10657,8 +10201,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'url',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 122,
-                'macro' => ''
+                'line_nr' => 122
               }
             },
             {
@@ -10689,8 +10232,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'uref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 122,
-                'macro' => ''
+                'line_nr' => 122
               }
             }
           ],
@@ -10750,8 +10292,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 124,
-                'macro' => ''
+                'line_nr' => 124
               }
             },
             {
@@ -10854,8 +10395,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 126,
-                'macro' => ''
+                'line_nr' => 126
               }
             },
             {
@@ -10885,8 +10425,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'atchar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 128,
-                        'macro' => ''
+                        'line_nr' => 128
                       }
                     },
                     {
@@ -10901,8 +10440,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'lbracechar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 128,
-                        'macro' => ''
+                        'line_nr' => 128
                       }
                     },
                     {
@@ -10917,8 +10455,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'rbracechar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 128,
-                        'macro' => ''
+                        'line_nr' => 128
                       }
                     },
                     {
@@ -10933,8 +10470,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'backslashchar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 128,
-                        'macro' => ''
+                        'line_nr' => 128
                       }
                     },
                     {
@@ -10949,8 +10485,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'hashchar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 128,
-                        'macro' => ''
+                        'line_nr' => 128
                       }
                     }
                   ],
@@ -10976,8 +10511,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 128,
-                'macro' => ''
+                'line_nr' => 128
               }
             },
             {
@@ -11007,8 +10541,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'LaTeX',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 130,
-                        'macro' => ''
+                        'line_nr' => 130
                       }
                     },
                     {
@@ -11023,8 +10556,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'TeX',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 130,
-                        'macro' => ''
+                        'line_nr' => 130
                       }
                     },
                     {
@@ -11039,8 +10571,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'bullet',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 130,
-                        'macro' => ''
+                        'line_nr' => 130
                       }
                     },
                     {
@@ -11055,8 +10586,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'comma',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 130,
-                        'macro' => ''
+                        'line_nr' => 130
                       }
                     },
                     {
@@ -11071,8 +10601,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'copyright',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 130,
-                        'macro' => ''
+                        'line_nr' => 130
                       }
                     },
                     {
@@ -11087,8 +10616,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'dots',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 130,
-                        'macro' => ''
+                        'line_nr' => 130
                       }
                     },
                     {
@@ -11103,8 +10631,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'enddots',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 130,
-                        'macro' => ''
+                        'line_nr' => 130
                       }
                     }
                   ],
@@ -11134,8 +10661,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 130,
-                'macro' => ''
+                'line_nr' => 130
               }
             },
             {
@@ -11165,8 +10691,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'equiv',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 132,
-                        'macro' => ''
+                        'line_nr' => 132
                       }
                     },
                     {
@@ -11181,8 +10706,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'error',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 132,
-                        'macro' => ''
+                        'line_nr' => 132
                       }
                     },
                     {
@@ -11197,8 +10721,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'euro',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 132,
-                        'macro' => ''
+                        'line_nr' => 132
                       }
                     },
                     {
@@ -11213,8 +10736,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'exclamdown',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 132,
-                        'macro' => ''
+                        'line_nr' => 132
                       }
                     },
                     {
@@ -11229,8 +10751,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'expansion',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 132,
-                        'macro' => ''
+                        'line_nr' => 132
                       }
                     },
                     {
@@ -11245,8 +10766,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'minus',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 132,
-                        'macro' => ''
+                        'line_nr' => 132
                       }
                     }
                   ],
@@ -11274,8 +10794,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 132,
-                'macro' => ''
+                'line_nr' => 132
               }
             },
             {
@@ -11305,8 +10824,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'geq',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 134,
-                        'macro' => ''
+                        'line_nr' => 134
                       }
                     },
                     {
@@ -11321,8 +10839,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'leq',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 134,
-                        'macro' => ''
+                        'line_nr' => 134
                       }
                     },
                     {
@@ -11337,8 +10854,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'arrow',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 134,
-                        'macro' => ''
+                        'line_nr' => 134
                       }
                     }
                   ],
@@ -11360,8 +10876,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 134,
-                'macro' => ''
+                'line_nr' => 134
               }
             },
             {
@@ -11391,8 +10906,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'ordf',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 136,
-                        'macro' => ''
+                        'line_nr' => 136
                       }
                     },
                     {
@@ -11407,8 +10921,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'ordm',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 136,
-                        'macro' => ''
+                        'line_nr' => 136
                       }
                     },
                     {
@@ -11423,8 +10936,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'point',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 136,
-                        'macro' => ''
+                        'line_nr' => 136
                       }
                     },
                     {
@@ -11439,8 +10951,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'pounds',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 136,
-                        'macro' => ''
+                        'line_nr' => 136
                       }
                     },
                     {
@@ -11455,8 +10966,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'print',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 136,
-                        'macro' => ''
+                        'line_nr' => 136
                       }
                     },
                     {
@@ -11471,8 +10981,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'questiondown',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 136,
-                        'macro' => ''
+                        'line_nr' => 136
                       }
                     },
                     {
@@ -11487,8 +10996,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'registeredsymbol',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 136,
-                        'macro' => ''
+                        'line_nr' => 136
                       }
                     }
                   ],
@@ -11518,8 +11026,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 136,
-                'macro' => ''
+                'line_nr' => 136
               }
             },
             {
@@ -11549,8 +11056,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'result',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 138,
-                        'macro' => ''
+                        'line_nr' => 138
                       }
                     },
                     {
@@ -11565,8 +11071,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'textdegree',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 138,
-                        'macro' => ''
+                        'line_nr' => 138
                       }
                     },
                     {
@@ -11581,8 +11086,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'tie',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 138,
-                        'macro' => ''
+                        'line_nr' => 138
                       }
                     },
                     {
@@ -11597,8 +11101,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'today',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 138,
-                        'macro' => ''
+                        'line_nr' => 138
                       }
                     },
                     {
@@ -11613,8 +11116,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 138,
-                        'macro' => ''
+                        'line_nr' => 138
                       }
                     }
                   ],
@@ -11640,8 +11142,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 138,
-                'macro' => ''
+                'line_nr' => 138
               }
             },
             {
@@ -11671,8 +11172,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     },
                     {
@@ -11687,8 +11187,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'ae',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     },
                     {
@@ -11703,8 +11202,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'oe',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     },
                     {
@@ -11719,8 +11217,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'AE',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     },
                     {
@@ -11735,8 +11232,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'OE',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     },
                     {
@@ -11751,8 +11247,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'o',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     },
                     {
@@ -11767,8 +11262,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'O',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     },
                     {
@@ -11783,8 +11277,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'ss',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     },
                     {
@@ -11799,8 +11292,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'l',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     },
                     {
@@ -11815,8 +11307,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'L',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     },
                     {
@@ -11831,8 +11322,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'DH',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     },
                     {
@@ -11847,8 +11337,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'dh',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     },
                     {
@@ -11863,8 +11352,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'TH',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     },
                     {
@@ -11879,8 +11367,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'th',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 140,
-                        'macro' => ''
+                        'line_nr' => 140
                       }
                     }
                   ],
@@ -11924,8 +11411,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 140,
-                'macro' => ''
+                'line_nr' => 140
               }
             },
             {
@@ -11960,8 +11446,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => '"',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 142,
-                        'macro' => ''
+                        'line_nr' => 142
                       }
                     },
                     {
@@ -11981,8 +11466,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 142,
-                        'macro' => ''
+                        'line_nr' => 142
                       }
                     },
                     {
@@ -12006,8 +11490,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 142,
-                                'macro' => ''
+                                'line_nr' => 142
                               }
                             }
                           ],
@@ -12017,8 +11500,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 142,
-                        'macro' => ''
+                        'line_nr' => 142
                       }
                     },
                     {
@@ -12038,8 +11520,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 142,
-                        'macro' => ''
+                        'line_nr' => 142
                       }
                     },
                     {
@@ -12059,8 +11540,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => '`',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 142,
-                        'macro' => ''
+                        'line_nr' => 142
                       }
                     },
                     {
@@ -12080,8 +11560,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 142,
-                        'macro' => ''
+                        'line_nr' => 142
                       }
                     },
                     {
@@ -12101,8 +11580,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 142,
-                        'macro' => ''
+                        'line_nr' => 142
                       }
                     },
                     {
@@ -12122,8 +11600,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 142,
-                        'macro' => ''
+                        'line_nr' => 142
                       }
                     },
                     {
@@ -12143,8 +11620,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'ringaccent',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 142,
-                        'macro' => ''
+                        'line_nr' => 142
                       }
                     },
                     {
@@ -12164,8 +11640,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'H',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 142,
-                        'macro' => ''
+                        'line_nr' => 142
                       }
                     },
                     {
@@ -12185,8 +11660,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'ogonek',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 142,
-                        'macro' => ''
+                        'line_nr' => 142
                       }
                     }
                   ],
@@ -12224,8 +11698,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 142,
-                'macro' => ''
+                'line_nr' => 142
               }
             },
             {
@@ -12260,8 +11733,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'dotaccent',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 144,
-                        'macro' => ''
+                        'line_nr' => 144
                       }
                     },
                     {
@@ -12281,8 +11753,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'u',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 144,
-                        'macro' => ''
+                        'line_nr' => 144
                       }
                     },
                     {
@@ -12302,8 +11773,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'ubaraccent',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 144,
-                        'macro' => ''
+                        'line_nr' => 144
                       }
                     },
                     {
@@ -12323,8 +11793,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 144,
-                        'macro' => ''
+                        'line_nr' => 144
                       }
                     },
                     {
@@ -12344,8 +11813,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 144,
-                        'macro' => ''
+                        'line_nr' => 144
                       }
                     },
                     {
@@ -12365,8 +11833,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 144,
-                        'macro' => ''
+                        'line_nr' => 144
                       }
                     },
                     {
@@ -12386,8 +11853,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'tieaccent',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 144,
-                        'macro' => ''
+                        'line_nr' => 144
                       }
                     }
                   ],
@@ -12417,8 +11883,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 144,
-                'macro' => ''
+                'line_nr' => 144
               }
             },
             {
@@ -12453,8 +11918,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 146,
-                        'macro' => ''
+                        'line_nr' => 146
                       }
                     },
                     {
@@ -12478,8 +11942,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                               'cmdname' => '=',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 146,
-                                'macro' => ''
+                                'line_nr' => 146
                               }
                             }
                           ],
@@ -12489,8 +11952,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => '`',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 146,
-                        'macro' => ''
+                        'line_nr' => 146
                       }
                     },
                     {
@@ -12514,8 +11976,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                               'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 146,
-                                'macro' => ''
+                                'line_nr' => 146
                               }
                             }
                           ],
@@ -12525,8 +11986,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 146,
-                        'macro' => ''
+                        'line_nr' => 146
                       }
                     }
                   ],
@@ -12548,8 +12008,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 146,
-                'macro' => ''
+                'line_nr' => 146
               }
             },
             {
@@ -12579,8 +12038,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'quotedblleft',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 148,
-                        'macro' => ''
+                        'line_nr' => 148
                       }
                     },
                     {
@@ -12595,8 +12053,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'quotedblright',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 148,
-                        'macro' => ''
+                        'line_nr' => 148
                       }
                     },
                     {
@@ -12611,8 +12068,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'quoteleft',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 148,
-                        'macro' => ''
+                        'line_nr' => 148
                       }
                     },
                     {
@@ -12627,8 +12083,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'quoteright',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 148,
-                        'macro' => ''
+                        'line_nr' => 148
                       }
                     },
                     {
@@ -12643,8 +12098,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'quotedblbase',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 148,
-                        'macro' => ''
+                        'line_nr' => 148
                       }
                     },
                     {
@@ -12659,8 +12113,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'quotesinglbase',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 148,
-                        'macro' => ''
+                        'line_nr' => 148
                       }
                     }
                   ],
@@ -12688,8 +12141,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 148,
-                'macro' => ''
+                'line_nr' => 148
               }
             },
             {
@@ -12719,8 +12171,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'guillemetleft',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 150,
-                        'macro' => ''
+                        'line_nr' => 150
                       }
                     },
                     {
@@ -12735,8 +12186,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'guillemetright',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 150,
-                        'macro' => ''
+                        'line_nr' => 150
                       }
                     },
                     {
@@ -12751,8 +12201,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'guillemotleft',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 150,
-                        'macro' => ''
+                        'line_nr' => 150
                       }
                     },
                     {
@@ -12767,8 +12216,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'guillemotright',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 150,
-                        'macro' => ''
+                        'line_nr' => 150
                       }
                     },
                     {
@@ -12783,8 +12231,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'guilsinglleft',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 150,
-                        'macro' => ''
+                        'line_nr' => 150
                       }
                     },
                     {
@@ -12799,8 +12246,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'guilsinglright',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 150,
-                        'macro' => ''
+                        'line_nr' => 150
                       }
                     }
                   ],
@@ -12828,8 +12274,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 150,
-                'macro' => ''
+                'line_nr' => 150
               }
             },
             {
@@ -12868,8 +12313,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 152,
-                'macro' => ''
+                'line_nr' => 152
               }
             },
             {
@@ -12917,8 +12361,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'acronym',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 154,
-                        'macro' => ''
+                        'line_nr' => 154
                       }
                     },
                     {
@@ -12938,8 +12381,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'acronym',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 154,
-                        'macro' => ''
+                        'line_nr' => 154
                       }
                     },
                     {
@@ -12959,8 +12401,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'acronym',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 154,
-                        'macro' => ''
+                        'line_nr' => 154
                       }
                     }
                   ],
@@ -12982,8 +12423,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 154,
-                'macro' => ''
+                'line_nr' => 154
               }
             },
             {
@@ -13012,8 +12452,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                 'cmdname' => 'ifnottex',
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 156,
-                  'macro' => ''
+                  'line_nr' => 156
                 }
               },
               'position' => 1,
@@ -13058,8 +12497,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'abbr',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 157,
-                        'macro' => ''
+                        'line_nr' => 157
                       }
                     },
                     {
@@ -13079,8 +12517,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'abbr',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 157,
-                        'macro' => ''
+                        'line_nr' => 157
                       }
                     },
                     {
@@ -13100,8 +12537,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'abbr',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 157,
-                        'macro' => ''
+                        'line_nr' => 157
                       }
                     }
                   ],
@@ -13123,8 +12559,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 157,
-                'macro' => ''
+                'line_nr' => 157
               }
             },
             {
@@ -13159,8 +12594,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 158,
-                      'macro' => ''
+                      'line_nr' => 158
                     }
                   },
                   'position' => 1,
@@ -13218,8 +12652,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'email',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 160,
-                        'macro' => ''
+                        'line_nr' => 160
                       }
                     },
                     {
@@ -13245,8 +12678,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'email',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 160,
-                        'macro' => ''
+                        'line_nr' => 160
                       }
                     }
                   ],
@@ -13266,8 +12698,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 160,
-                'macro' => ''
+                'line_nr' => 160
               }
             },
             {
@@ -13296,8 +12727,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                 'cmdname' => 'ifnottex',
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 162,
-                  'macro' => ''
+                  'line_nr' => 162
                 }
               },
               'position' => 1,
@@ -13332,8 +12762,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 163,
-                        'macro' => ''
+                        'line_nr' => 163
                       }
                     },
                     {
@@ -13388,8 +12817,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 163,
-                        'macro' => ''
+                        'line_nr' => 163
                       }
                     }
                   ],
@@ -13409,8 +12837,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 163,
-                'macro' => ''
+                'line_nr' => 163
               }
             },
             {
@@ -13449,8 +12876,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 165,
-                        'macro' => ''
+                        'line_nr' => 165
                       }
                     }
                   ],
@@ -13468,8 +12894,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 165,
-                'macro' => ''
+                'line_nr' => 165
               }
             },
             {
@@ -13504,8 +12929,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 166,
-                      'macro' => ''
+                      'line_nr' => 166
                     }
                   },
                   'position' => 1,
@@ -13551,8 +12975,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                               'cmdname' => 'asis',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 168,
-                                'macro' => ''
+                                'line_nr' => 168
                               }
                             }
                           ],
@@ -13562,8 +12985,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'cite',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 168,
-                        'macro' => ''
+                        'line_nr' => 168
                       }
                     },
                     {
@@ -13596,8 +13018,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                               'cmdname' => 'b',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 168,
-                                'macro' => ''
+                                'line_nr' => 168
                               }
                             }
                           ],
@@ -13607,8 +13028,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'w',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 168,
-                        'macro' => ''
+                        'line_nr' => 168
                       }
                     },
                     {
@@ -13628,8 +13048,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'r',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 168,
-                        'macro' => ''
+                        'line_nr' => 168
                       }
                     },
                     {
@@ -13649,8 +13068,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'sc',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 168,
-                        'macro' => ''
+                        'line_nr' => 168
                       }
                     },
                     {
@@ -13670,8 +13088,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'strong',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 168,
-                        'macro' => ''
+                        'line_nr' => 168
                       }
                     },
                     {
@@ -13691,8 +13108,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 't',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 168,
-                        'macro' => ''
+                        'line_nr' => 168
                       }
                     },
                     {
@@ -13712,8 +13128,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'var',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 168,
-                        'macro' => ''
+                        'line_nr' => 168
                       }
                     },
                     {
@@ -13733,8 +13148,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'dfn',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 168,
-                        'macro' => ''
+                        'line_nr' => 168
                       }
                     },
                     {
@@ -13754,8 +13168,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'i',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 168,
-                        'macro' => ''
+                        'line_nr' => 168
                       }
                     }
                   ],
@@ -13789,8 +13202,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 168,
-                'macro' => ''
+                'line_nr' => 168
               }
             },
             {
@@ -13825,8 +13237,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'env',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 170,
-                        'macro' => ''
+                        'line_nr' => 170
                       }
                     },
                     {
@@ -13846,8 +13257,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 170,
-                        'macro' => ''
+                        'line_nr' => 170
                       }
                     },
                     {
@@ -13867,8 +13277,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'option',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 170,
-                        'macro' => ''
+                        'line_nr' => 170
                       }
                     },
                     {
@@ -13888,8 +13297,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'samp',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 170,
-                        'macro' => ''
+                        'line_nr' => 170
                       }
                     },
                     {
@@ -13909,8 +13317,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'command',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 170,
-                        'macro' => ''
+                        'line_nr' => 170
                       }
                     },
                     {
@@ -13930,8 +13337,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'file',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 170,
-                        'macro' => ''
+                        'line_nr' => 170
                       }
                     },
                     {
@@ -13958,8 +13364,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                               'cmdname' => 'key',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 170,
-                                'macro' => ''
+                                'line_nr' => 170
                               }
                             }
                           ],
@@ -13969,8 +13374,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'kbd',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 170,
-                        'macro' => ''
+                        'line_nr' => 170
                       }
                     }
                   ],
@@ -14000,8 +13404,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 170,
-                'macro' => ''
+                'line_nr' => 170
               }
             },
             {
@@ -14039,8 +13442,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'dmn',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 172,
-                        'macro' => ''
+                        'line_nr' => 172
                       }
                     }
                   ],
@@ -14059,8 +13461,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 172,
-                'macro' => ''
+                'line_nr' => 172
               }
             },
             {
@@ -14095,8 +13496,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'sansserif',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 174,
-                        'macro' => ''
+                        'line_nr' => 174
                       }
                     },
                     {
@@ -14116,8 +13516,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'slanted',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 174,
-                        'macro' => ''
+                        'line_nr' => 174
                       }
                     }
                   ],
@@ -14137,8 +13536,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 174,
-                'macro' => ''
+                'line_nr' => 174
               }
             },
             {
@@ -14173,8 +13571,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'indicateurl',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 176,
-                        'macro' => ''
+                        'line_nr' => 176
                       }
                     }
                   ],
@@ -14192,8 +13589,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 176,
-                'macro' => ''
+                'line_nr' => 176
               }
             },
             {
@@ -14228,8 +13624,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'sub',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 178,
-                        'macro' => ''
+                        'line_nr' => 178
                       }
                     },
                     {
@@ -14249,8 +13644,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'sup',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 178,
-                        'macro' => ''
+                        'line_nr' => 178
                       }
                     }
                   ],
@@ -14270,8 +13664,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 178,
-                'macro' => ''
+                'line_nr' => 178
               }
             },
             {
@@ -14306,8 +13699,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'url',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 180,
-                        'macro' => ''
+                        'line_nr' => 180
                       }
                     },
                     {
@@ -14340,8 +13732,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'url',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 180,
-                        'macro' => ''
+                        'line_nr' => 180
                       }
                     },
                     {
@@ -14372,8 +13763,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'uref',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 180,
-                        'macro' => ''
+                        'line_nr' => 180
                       }
                     }
                   ],
@@ -14395,8 +13785,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 180,
-                'macro' => ''
+                'line_nr' => 180
               }
             },
             {
@@ -14422,8 +13811,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 122,
-        'macro' => ''
+        'line_nr' => 122
       }
     },
     {
@@ -16868,7 +16256,6 @@ $result_errors{'at_commands_in_refs_utf8'} = [
 ',
     'file_name' => '',
     'line_nr' => 98,
-    'macro' => '',
     'text' => '@verb should not appear on @node line',
     'type' => 'warning'
   },
@@ -16877,7 +16264,6 @@ $result_errors{'at_commands_in_refs_utf8'} = [
 ',
     'file_name' => '',
     'line_nr' => 100,
-    'macro' => '',
     'text' => '@verb should not appear on @chapter line',
     'type' => 'warning'
   },
@@ -16886,7 +16272,6 @@ $result_errors{'at_commands_in_refs_utf8'} = [
 ',
     'file_name' => '',
     'line_nr' => 165,
-    'macro' => '',
     'text' => '@verb should not appear anywhere inside @ref',
     'type' => 'warning'
   }
@@ -16902,7 +16287,6 @@ 
$result_converted_errors{'file_html'}->{'at_commands_in_refs_utf8'} = [
 ',
     'file_name' => '',
     'line_nr' => 95,
-    'macro' => '',
     'text' => '@image file `f--ile1\' (for HTML) not found, using 
`f--ile1.jpg\'',
     'type' => 'warning'
   },
@@ -16911,7 +16295,6 @@ 
$result_converted_errors{'file_html'}->{'at_commands_in_refs_utf8'} = [
 ',
     'file_name' => '',
     'line_nr' => 93,
-    'macro' => '',
     'text' => '@image file `f--ile1\' (for HTML) not found, using 
`f--ile1.jpg\'',
     'type' => 'warning'
   },
@@ -16920,7 +16303,6 @@ 
$result_converted_errors{'file_html'}->{'at_commands_in_refs_utf8'} = [
 ',
     'file_name' => '',
     'line_nr' => 95,
-    'macro' => '',
     'text' => '@image file `f--ile1\' (for HTML) not found, using 
`f--ile1.jpg\'',
     'type' => 'warning'
   },
@@ -16929,7 +16311,6 @@ 
$result_converted_errors{'file_html'}->{'at_commands_in_refs_utf8'} = [
 ',
     'file_name' => '',
     'line_nr' => 163,
-    'macro' => '',
     'text' => '@image file `f--ile1\' (for HTML) not found, using 
`f--ile1.jpg\'',
     'type' => 'warning'
   }
@@ -16942,7 +16323,6 @@ 
$result_converted_errors{'file_info'}->{'at_commands_in_refs_utf8'} = [
 ',
     'file_name' => '',
     'line_nr' => 26,
-    'macro' => '',
     'text' => 'could not find @image file `f--ile1.txt\' nor alternate text',
     'type' => 'warning'
   },
@@ -16951,7 +16331,6 @@ 
$result_converted_errors{'file_info'}->{'at_commands_in_refs_utf8'} = [
 ',
     'file_name' => '',
     'line_nr' => 34,
-    'macro' => '',
     'text' => 'menu entry node name should not contain `:\'',
     'type' => 'warning'
   },
@@ -16960,7 +16339,6 @@ 
$result_converted_errors{'file_info'}->{'at_commands_in_refs_utf8'} = [
 ",
     'file_name' => '',
     'line_nr' => 46,
-    'macro' => '',
     'text' => "\@node name should not contain `,': LaTeX TeX \x{2022} , \x{a9} 
... ...",
     'type' => 'warning'
   },
@@ -16969,7 +16347,6 @@ 
$result_converted_errors{'file_info'}->{'at_commands_in_refs_utf8'} = [
 ',
     'file_name' => '',
     'line_nr' => 93,
-    'macro' => '',
     'text' => 'could not find @image file `f--ile1.txt\' nor alternate text',
     'type' => 'warning'
   },
@@ -16978,7 +16355,6 @@ 
$result_converted_errors{'file_info'}->{'at_commands_in_refs_utf8'} = [
 ',
     'file_name' => '',
     'line_nr' => 95,
-    'macro' => '',
     'text' => 'could not find @image file `f--ile1.txt\' nor alternate text',
     'type' => 'warning'
   },
@@ -16987,7 +16363,6 @@ 
$result_converted_errors{'file_info'}->{'at_commands_in_refs_utf8'} = [
 ',
     'file_name' => '',
     'line_nr' => 93,
-    'macro' => '',
     'text' => 'could not find @image file `f--ile1.txt\' nor alternate text',
     'type' => 'warning'
   },
@@ -16996,7 +16371,6 @@ 
$result_converted_errors{'file_info'}->{'at_commands_in_refs_utf8'} = [
 ',
     'file_name' => '',
     'line_nr' => 180,
-    'macro' => '',
     'text' => '@ref node name should not contain `:\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs.pl 
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs.pl
index fb72995fc7..047620ee38 100644
--- a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs.pl
+++ b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs.pl
@@ -55,8 +55,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               },
               'source_info' => {
                 'file_name' => 'char_latin1_latin1_in_refs.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -100,8 +99,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_latin1_latin1_in_refs.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -158,8 +156,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
           },
           'source_info' => {
             'file_name' => 'char_latin1_latin1_in_refs.texi',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -224,8 +221,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => 'char_latin1_latin1_in_refs.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -272,8 +268,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => 'char_latin1_latin1_in_refs.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               },
               'type' => 'menu_entry'
             },
@@ -320,8 +315,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => 'char_latin1_latin1_in_refs.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               },
               'type' => 'menu_entry'
             },
@@ -368,8 +362,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => 'char_latin1_latin1_in_refs.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               },
               'type' => 'menu_entry'
             },
@@ -416,8 +409,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => 'char_latin1_latin1_in_refs.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               },
               'type' => 'menu_entry'
             },
@@ -449,15 +441,13 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               },
               'source_info' => {
                 'file_name' => 'char_latin1_latin1_in_refs.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
           'source_info' => {
             'file_name' => 'char_latin1_latin1_in_refs.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -474,8 +464,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_latin1_latin1_in_refs.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -507,8 +496,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_latin1_latin1_in_refs.texi',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -546,8 +534,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_latin1_latin1_in_refs.texi',
-        'line_nr' => 19,
-        'macro' => ''
+        'line_nr' => 19
       }
     },
     {
@@ -579,8 +566,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_latin1_latin1_in_refs.texi',
-        'line_nr' => 21,
-        'macro' => ''
+        'line_nr' => 21
       }
     },
     {
@@ -618,8 +604,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_latin1_latin1_in_refs.texi',
-        'line_nr' => 22,
-        'macro' => ''
+        'line_nr' => 22
       }
     },
     {
@@ -651,8 +636,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_latin1_latin1_in_refs.texi',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     {
@@ -690,8 +674,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_latin1_latin1_in_refs.texi',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
@@ -723,8 +706,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_latin1_latin1_in_refs.texi',
-        'line_nr' => 27,
-        'macro' => ''
+        'line_nr' => 27
       }
     },
     {
@@ -762,8 +744,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_latin1_latin1_in_refs.texi',
-        'line_nr' => 28,
-        'macro' => ''
+        'line_nr' => 28
       }
     },
     {
@@ -795,8 +776,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_latin1_latin1_in_refs.texi',
-        'line_nr' => 30,
-        'macro' => ''
+        'line_nr' => 30
       }
     },
     {
@@ -847,8 +827,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'char_latin1_latin1_in_refs.texi',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               }
             },
             {
@@ -877,8 +856,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'char_latin1_latin1_in_refs.texi',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             },
             {
@@ -907,8 +885,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'char_latin1_latin1_in_refs.texi',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             },
             {
@@ -937,8 +914,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'char_latin1_latin1_in_refs.texi',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               }
             },
             {
@@ -967,8 +943,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'char_latin1_latin1_in_refs.texi',
-                'line_nr' => 37,
-                'macro' => ''
+                'line_nr' => 37
               }
             },
             {
@@ -1016,8 +991,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
           },
           'source_info' => {
             'file_name' => 'char_latin1_latin1_in_refs.texi',
-            'line_nr' => 39,
-            'macro' => ''
+            'line_nr' => 39
           },
           'type' => 'index_entry_command'
         },
@@ -1054,8 +1028,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
           },
           'source_info' => {
             'file_name' => 'char_latin1_latin1_in_refs.texi',
-            'line_nr' => 40,
-            'macro' => ''
+            'line_nr' => 40
           },
           'type' => 'index_entry_command'
         },
@@ -1092,8 +1065,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
           },
           'source_info' => {
             'file_name' => 'char_latin1_latin1_in_refs.texi',
-            'line_nr' => 41,
-            'macro' => ''
+            'line_nr' => 41
           },
           'type' => 'index_entry_command'
         },
@@ -1130,8 +1102,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
           },
           'source_info' => {
             'file_name' => 'char_latin1_latin1_in_refs.texi',
-            'line_nr' => 42,
-            'macro' => ''
+            'line_nr' => 42
           },
           'type' => 'index_entry_command'
         },
@@ -1168,8 +1139,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
           },
           'source_info' => {
             'file_name' => 'char_latin1_latin1_in_refs.texi',
-            'line_nr' => 43,
-            'macro' => ''
+            'line_nr' => 43
           },
           'type' => 'index_entry_command'
         },
@@ -1206,8 +1176,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
           },
           'source_info' => {
             'file_name' => 'char_latin1_latin1_in_refs.texi',
-            'line_nr' => 44,
-            'macro' => ''
+            'line_nr' => 44
           },
           'type' => 'index_entry_command'
         },
@@ -1227,8 +1196,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_latin1_latin1_in_refs.texi',
-        'line_nr' => 31,
-        'macro' => ''
+        'line_nr' => 31
       }
     },
     {
diff --git a/tp/t/results/formats_encodings/char_latin2_latin2_in_refs.pl 
b/tp/t/results/formats_encodings/char_latin2_latin2_in_refs.pl
index 443fa8868f..5e0f2c6f0d 100644
--- a/tp/t/results/formats_encodings/char_latin2_latin2_in_refs.pl
+++ b/tp/t/results/formats_encodings/char_latin2_latin2_in_refs.pl
@@ -55,8 +55,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
               },
               'source_info' => {
                 'file_name' => 'char_latin2_latin2_in_refs.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -100,8 +99,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_latin2_latin2_in_refs.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -152,8 +150,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'char_latin2_latin2_in_refs.texi',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -198,8 +195,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
           },
           'source_info' => {
             'file_name' => 'char_latin2_latin2_in_refs.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -274,8 +270,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => 'char_latin2_latin2_in_refs.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               },
               'type' => 'menu_entry'
             },
@@ -307,15 +302,13 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
               },
               'source_info' => {
                 'file_name' => 'char_latin2_latin2_in_refs.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
           'source_info' => {
             'file_name' => 'char_latin2_latin2_in_refs.texi',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -332,8 +325,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_latin2_latin2_in_refs.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -365,8 +357,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_latin2_latin2_in_refs.texi',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -426,8 +417,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
           },
           'source_info' => {
             'file_name' => 'char_latin2_latin2_in_refs.texi',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           },
           'type' => 'index_entry_command'
         },
@@ -447,8 +437,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_latin2_latin2_in_refs.texi',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
diff --git a/tp/t/results/formats_encodings/char_us_ascii_latin1_in_refs.pl 
b/tp/t/results/formats_encodings/char_us_ascii_latin1_in_refs.pl
index 1150d6fae9..54217421e2 100644
--- a/tp/t/results/formats_encodings/char_us_ascii_latin1_in_refs.pl
+++ b/tp/t/results/formats_encodings/char_us_ascii_latin1_in_refs.pl
@@ -55,8 +55,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
               },
               'source_info' => {
                 'file_name' => 'char_us_ascii_latin1_in_refs.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -100,8 +99,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_us_ascii_latin1_in_refs.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -158,8 +156,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
           },
           'source_info' => {
             'file_name' => 'char_us_ascii_latin1_in_refs.texi',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -224,8 +221,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => 'char_us_ascii_latin1_in_refs.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -272,8 +268,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => 'char_us_ascii_latin1_in_refs.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               },
               'type' => 'menu_entry'
             },
@@ -320,8 +315,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => 'char_us_ascii_latin1_in_refs.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               },
               'type' => 'menu_entry'
             },
@@ -368,8 +362,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => 'char_us_ascii_latin1_in_refs.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               },
               'type' => 'menu_entry'
             },
@@ -416,8 +409,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => 'char_us_ascii_latin1_in_refs.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               },
               'type' => 'menu_entry'
             },
@@ -449,15 +441,13 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
               },
               'source_info' => {
                 'file_name' => 'char_us_ascii_latin1_in_refs.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
           'source_info' => {
             'file_name' => 'char_us_ascii_latin1_in_refs.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -474,8 +464,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_us_ascii_latin1_in_refs.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -507,8 +496,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_us_ascii_latin1_in_refs.texi',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -546,8 +534,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_us_ascii_latin1_in_refs.texi',
-        'line_nr' => 19,
-        'macro' => ''
+        'line_nr' => 19
       }
     },
     {
@@ -579,8 +566,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_us_ascii_latin1_in_refs.texi',
-        'line_nr' => 21,
-        'macro' => ''
+        'line_nr' => 21
       }
     },
     {
@@ -618,8 +604,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_us_ascii_latin1_in_refs.texi',
-        'line_nr' => 22,
-        'macro' => ''
+        'line_nr' => 22
       }
     },
     {
@@ -651,8 +636,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_us_ascii_latin1_in_refs.texi',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     {
@@ -690,8 +674,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_us_ascii_latin1_in_refs.texi',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
@@ -723,8 +706,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_us_ascii_latin1_in_refs.texi',
-        'line_nr' => 27,
-        'macro' => ''
+        'line_nr' => 27
       }
     },
     {
@@ -762,8 +744,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_us_ascii_latin1_in_refs.texi',
-        'line_nr' => 28,
-        'macro' => ''
+        'line_nr' => 28
       }
     },
     {
@@ -795,8 +776,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_us_ascii_latin1_in_refs.texi',
-        'line_nr' => 30,
-        'macro' => ''
+        'line_nr' => 30
       }
     },
     {
@@ -847,8 +827,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'char_us_ascii_latin1_in_refs.texi',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               }
             },
             {
@@ -877,8 +856,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'char_us_ascii_latin1_in_refs.texi',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             },
             {
@@ -907,8 +885,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'char_us_ascii_latin1_in_refs.texi',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             },
             {
@@ -937,8 +914,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'char_us_ascii_latin1_in_refs.texi',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               }
             },
             {
@@ -967,8 +943,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'char_us_ascii_latin1_in_refs.texi',
-                'line_nr' => 37,
-                'macro' => ''
+                'line_nr' => 37
               }
             },
             {
@@ -1016,8 +991,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
           },
           'source_info' => {
             'file_name' => 'char_us_ascii_latin1_in_refs.texi',
-            'line_nr' => 39,
-            'macro' => ''
+            'line_nr' => 39
           },
           'type' => 'index_entry_command'
         },
@@ -1054,8 +1028,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
           },
           'source_info' => {
             'file_name' => 'char_us_ascii_latin1_in_refs.texi',
-            'line_nr' => 40,
-            'macro' => ''
+            'line_nr' => 40
           },
           'type' => 'index_entry_command'
         },
@@ -1092,8 +1065,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
           },
           'source_info' => {
             'file_name' => 'char_us_ascii_latin1_in_refs.texi',
-            'line_nr' => 41,
-            'macro' => ''
+            'line_nr' => 41
           },
           'type' => 'index_entry_command'
         },
@@ -1130,8 +1102,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
           },
           'source_info' => {
             'file_name' => 'char_us_ascii_latin1_in_refs.texi',
-            'line_nr' => 42,
-            'macro' => ''
+            'line_nr' => 42
           },
           'type' => 'index_entry_command'
         },
@@ -1168,8 +1139,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
           },
           'source_info' => {
             'file_name' => 'char_us_ascii_latin1_in_refs.texi',
-            'line_nr' => 43,
-            'macro' => ''
+            'line_nr' => 43
           },
           'type' => 'index_entry_command'
         },
@@ -1206,8 +1176,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
           },
           'source_info' => {
             'file_name' => 'char_us_ascii_latin1_in_refs.texi',
-            'line_nr' => 44,
-            'macro' => ''
+            'line_nr' => 44
           },
           'type' => 'index_entry_command'
         },
@@ -1227,8 +1196,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_us_ascii_latin1_in_refs.texi',
-        'line_nr' => 31,
-        'macro' => ''
+        'line_nr' => 31
       }
     },
     {
diff --git a/tp/t/results/formats_encodings/char_utf8_latin1_in_refs.pl 
b/tp/t/results/formats_encodings/char_utf8_latin1_in_refs.pl
index bdd2452ba5..2ec608f6be 100644
--- a/tp/t/results/formats_encodings/char_utf8_latin1_in_refs.pl
+++ b/tp/t/results/formats_encodings/char_utf8_latin1_in_refs.pl
@@ -55,8 +55,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
               },
               'source_info' => {
                 'file_name' => 'char_utf8_latin1_in_refs.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -100,8 +99,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_utf8_latin1_in_refs.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -158,8 +156,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
           },
           'source_info' => {
             'file_name' => 'char_utf8_latin1_in_refs.texi',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -224,8 +221,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => 'char_utf8_latin1_in_refs.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -272,8 +268,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => 'char_utf8_latin1_in_refs.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               },
               'type' => 'menu_entry'
             },
@@ -320,8 +315,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => 'char_utf8_latin1_in_refs.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               },
               'type' => 'menu_entry'
             },
@@ -368,8 +362,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => 'char_utf8_latin1_in_refs.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               },
               'type' => 'menu_entry'
             },
@@ -416,8 +409,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => 'char_utf8_latin1_in_refs.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               },
               'type' => 'menu_entry'
             },
@@ -449,15 +441,13 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
               },
               'source_info' => {
                 'file_name' => 'char_utf8_latin1_in_refs.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
           'source_info' => {
             'file_name' => 'char_utf8_latin1_in_refs.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -474,8 +464,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_utf8_latin1_in_refs.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -507,8 +496,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_utf8_latin1_in_refs.texi',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -546,8 +534,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_utf8_latin1_in_refs.texi',
-        'line_nr' => 19,
-        'macro' => ''
+        'line_nr' => 19
       }
     },
     {
@@ -579,8 +566,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_utf8_latin1_in_refs.texi',
-        'line_nr' => 21,
-        'macro' => ''
+        'line_nr' => 21
       }
     },
     {
@@ -618,8 +604,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_utf8_latin1_in_refs.texi',
-        'line_nr' => 22,
-        'macro' => ''
+        'line_nr' => 22
       }
     },
     {
@@ -651,8 +636,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_utf8_latin1_in_refs.texi',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     {
@@ -690,8 +674,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_utf8_latin1_in_refs.texi',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
@@ -723,8 +706,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_utf8_latin1_in_refs.texi',
-        'line_nr' => 27,
-        'macro' => ''
+        'line_nr' => 27
       }
     },
     {
@@ -762,8 +744,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_utf8_latin1_in_refs.texi',
-        'line_nr' => 28,
-        'macro' => ''
+        'line_nr' => 28
       }
     },
     {
@@ -795,8 +776,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_utf8_latin1_in_refs.texi',
-        'line_nr' => 30,
-        'macro' => ''
+        'line_nr' => 30
       }
     },
     {
@@ -847,8 +827,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'char_utf8_latin1_in_refs.texi',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               }
             },
             {
@@ -877,8 +856,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'char_utf8_latin1_in_refs.texi',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             },
             {
@@ -907,8 +885,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'char_utf8_latin1_in_refs.texi',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             },
             {
@@ -937,8 +914,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'char_utf8_latin1_in_refs.texi',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               }
             },
             {
@@ -967,8 +943,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'char_utf8_latin1_in_refs.texi',
-                'line_nr' => 37,
-                'macro' => ''
+                'line_nr' => 37
               }
             },
             {
@@ -1016,8 +991,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
           },
           'source_info' => {
             'file_name' => 'char_utf8_latin1_in_refs.texi',
-            'line_nr' => 39,
-            'macro' => ''
+            'line_nr' => 39
           },
           'type' => 'index_entry_command'
         },
@@ -1054,8 +1028,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
           },
           'source_info' => {
             'file_name' => 'char_utf8_latin1_in_refs.texi',
-            'line_nr' => 40,
-            'macro' => ''
+            'line_nr' => 40
           },
           'type' => 'index_entry_command'
         },
@@ -1092,8 +1065,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
           },
           'source_info' => {
             'file_name' => 'char_utf8_latin1_in_refs.texi',
-            'line_nr' => 41,
-            'macro' => ''
+            'line_nr' => 41
           },
           'type' => 'index_entry_command'
         },
@@ -1130,8 +1102,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
           },
           'source_info' => {
             'file_name' => 'char_utf8_latin1_in_refs.texi',
-            'line_nr' => 42,
-            'macro' => ''
+            'line_nr' => 42
           },
           'type' => 'index_entry_command'
         },
@@ -1168,8 +1139,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
           },
           'source_info' => {
             'file_name' => 'char_utf8_latin1_in_refs.texi',
-            'line_nr' => 43,
-            'macro' => ''
+            'line_nr' => 43
           },
           'type' => 'index_entry_command'
         },
@@ -1206,8 +1176,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
           },
           'source_info' => {
             'file_name' => 'char_utf8_latin1_in_refs.texi',
-            'line_nr' => 44,
-            'macro' => ''
+            'line_nr' => 44
           },
           'type' => 'index_entry_command'
         },
@@ -1227,8 +1196,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'char_utf8_latin1_in_refs.texi',
-        'line_nr' => 31,
-        'macro' => ''
+        'line_nr' => 31
       }
     },
     {
diff --git 
a/tp/t/results/formats_encodings/documentencoding_utf8_and_insertions.pl 
b/tp/t/results/formats_encodings/documentencoding_utf8_and_insertions.pl
index f62b385cc0..d73816aa7a 100644
--- a/tp/t/results/formats_encodings/documentencoding_utf8_and_insertions.pl
+++ b/tp/t/results/formats_encodings/documentencoding_utf8_and_insertions.pl
@@ -38,8 +38,7 @@ $result_trees{'documentencoding_utf8_and_insertions'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -66,8 +65,7 @@ $result_trees{'documentencoding_utf8_and_insertions'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -87,8 +85,7 @@ $result_trees{'documentencoding_utf8_and_insertions'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -136,8 +133,7 @@ $result_trees{'documentencoding_utf8_and_insertions'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   }
                 },
                 {
@@ -157,8 +153,7 @@ $result_trees{'documentencoding_utf8_and_insertions'} = {
                   'cmdname' => '~',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   }
                 },
                 {
@@ -196,15 +191,13 @@ $result_trees{'documentencoding_utf8_and_insertions'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
diff --git a/tp/t/results/formats_encodings/dotless_argument_non_ascii.pl 
b/tp/t/results/formats_encodings/dotless_argument_non_ascii.pl
index 7129b82f41..65271b1e67 100644
--- a/tp/t/results/formats_encodings/dotless_argument_non_ascii.pl
+++ b/tp/t/results/formats_encodings/dotless_argument_non_ascii.pl
@@ -44,8 +44,7 @@ $result_trees{'dotless_argument_non_ascii'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -81,8 +80,7 @@ $result_trees{'dotless_argument_non_ascii'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -114,8 +112,7 @@ $result_trees{'dotless_argument_non_ascii'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -153,8 +150,7 @@ $result_trees{'dotless_argument_non_ascii'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -180,8 +176,7 @@ $result_trees{'dotless_argument_non_ascii'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -202,8 +197,7 @@ $result_trees{'dotless_argument_non_ascii'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
@@ -331,7 +325,6 @@ $result_errors{'dotless_argument_non_ascii'} = [
 ",
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => "\@dotless expects `i' or `j' as argument, not `\x{ea}'",
     'type' => 'error'
   },
@@ -340,7 +333,6 @@ $result_errors{'dotless_argument_non_ascii'} = [
 ",
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => "\@dotless expects `i' or `j' as argument, not `\x{ea}'",
     'type' => 'error'
   }
diff --git a/tp/t/results/formats_encodings/japanese_shift_jis.pl 
b/tp/t/results/formats_encodings/japanese_shift_jis.pl
index ad33b09eb7..b479176294 100644
--- a/tp/t/results/formats_encodings/japanese_shift_jis.pl
+++ b/tp/t/results/formats_encodings/japanese_shift_jis.pl
@@ -50,8 +50,7 @@ $result_trees{'japanese_shift_jis'} = {
               },
               'source_info' => {
                 'file_name' => 'japanese_shift_jis.texi',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -87,8 +86,7 @@ $result_trees{'japanese_shift_jis'} = {
               },
               'source_info' => {
                 'file_name' => 'japanese_shift_jis.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -116,8 +114,7 @@ $result_trees{'japanese_shift_jis'} = {
               },
               'source_info' => {
                 'file_name' => 'japanese_shift_jis.texi',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -153,8 +150,7 @@ $result_trees{'japanese_shift_jis'} = {
               },
               'source_info' => {
                 'file_name' => 'japanese_shift_jis.texi',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -197,8 +193,7 @@ $result_trees{'japanese_shift_jis'} = {
       },
       'source_info' => {
         'file_name' => 'japanese_shift_jis.texi',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -253,8 +248,7 @@ $result_trees{'japanese_shift_jis'} = {
                   'cmdname' => 'copyright',
                   'source_info' => {
                     'file_name' => 'japanese_shift_jis.texi',
-                    'line_nr' => 12,
-                    'macro' => ''
+                    'line_nr' => 12
                   }
                 },
                 {
@@ -293,8 +287,7 @@ $result_trees{'japanese_shift_jis'} = {
                   'cmdname' => 'emph',
                   'source_info' => {
                     'file_name' => 'japanese_shift_jis.texi',
-                    'line_nr' => 14,
-                    'macro' => ''
+                    'line_nr' => 14
                   }
                 },
                 {
@@ -329,8 +322,7 @@ $result_trees{'japanese_shift_jis'} = {
                   'cmdname' => 'emph',
                   'source_info' => {
                     'file_name' => 'japanese_shift_jis.texi',
-                    'line_nr' => 18,
-                    'macro' => ''
+                    'line_nr' => 18
                   }
                 },
                 {
@@ -368,15 +360,13 @@ $result_trees{'japanese_shift_jis'} = {
               },
               'source_info' => {
                 'file_name' => 'japanese_shift_jis.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             }
           ],
           'source_info' => {
             'file_name' => 'japanese_shift_jis.texi',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -460,8 +450,7 @@ $result_trees{'japanese_shift_jis'} = {
               ],
               'source_info' => {
                 'file_name' => 'japanese_shift_jis.texi',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               },
               'type' => 'menu_entry'
             },
@@ -508,8 +497,7 @@ $result_trees{'japanese_shift_jis'} = {
               ],
               'source_info' => {
                 'file_name' => 'japanese_shift_jis.texi',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               },
               'type' => 'menu_entry'
             },
@@ -541,15 +529,13 @@ $result_trees{'japanese_shift_jis'} = {
               },
               'source_info' => {
                 'file_name' => 'japanese_shift_jis.texi',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             }
           ],
           'source_info' => {
             'file_name' => 'japanese_shift_jis.texi',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           }
         },
         {
@@ -566,8 +552,7 @@ $result_trees{'japanese_shift_jis'} = {
       },
       'source_info' => {
         'file_name' => 'japanese_shift_jis.texi',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -599,8 +584,7 @@ $result_trees{'japanese_shift_jis'} = {
       },
       'source_info' => {
         'file_name' => 'japanese_shift_jis.texi',
-        'line_nr' => 30,
-        'macro' => ''
+        'line_nr' => 30
       }
     },
     {
@@ -657,8 +641,7 @@ $result_trees{'japanese_shift_jis'} = {
       },
       'source_info' => {
         'file_name' => 'japanese_shift_jis.texi',
-        'line_nr' => 31,
-        'macro' => ''
+        'line_nr' => 31
       }
     },
     {
@@ -690,8 +673,7 @@ $result_trees{'japanese_shift_jis'} = {
       },
       'source_info' => {
         'file_name' => 'japanese_shift_jis.texi',
-        'line_nr' => 36,
-        'macro' => ''
+        'line_nr' => 36
       }
     },
     {
@@ -743,8 +725,7 @@ $result_trees{'japanese_shift_jis'} = {
       },
       'source_info' => {
         'file_name' => 'japanese_shift_jis.texi',
-        'line_nr' => 37,
-        'macro' => ''
+        'line_nr' => 37
       }
     },
     {
@@ -999,7 +980,6 @@ $result_errors{'japanese_shift_jis'} = [
 ',
     'file_name' => 'japanese_shift_jis.texi',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'encoding `shift_jis\' is not a canonical texinfo encoding',
     'type' => 'warning'
   }
diff --git a/tp/t/results/formats_encodings/manual_simple_latin1_with_error.pl 
b/tp/t/results/formats_encodings/manual_simple_latin1_with_error.pl
index b2cccf3db3..d14bf9636f 100644
--- a/tp/t/results/formats_encodings/manual_simple_latin1_with_error.pl
+++ b/tp/t/results/formats_encodings/manual_simple_latin1_with_error.pl
@@ -55,8 +55,7 @@ $result_trees{'manual_simple_latin1_with_error'} = {
               },
               'source_info' => {
                 'file_name' => 'manual_simple_latin1_with_error.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -99,8 +98,7 @@ $result_trees{'manual_simple_latin1_with_error'} = {
       },
       'source_info' => {
         'file_name' => 'manual_simple_latin1_with_error.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -136,8 +134,7 @@ $result_trees{'manual_simple_latin1_with_error'} = {
       },
       'source_info' => {
         'file_name' => 'manual_simple_latin1_with_error.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -176,8 +173,7 @@ $result_trees{'manual_simple_latin1_with_error'} = {
       },
       'source_info' => {
         'file_name' => 'manual_simple_latin1_with_error.texi',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -209,8 +205,7 @@ $result_trees{'manual_simple_latin1_with_error'} = {
       },
       'source_info' => {
         'file_name' => 'manual_simple_latin1_with_error.texi',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -265,8 +260,7 @@ $result_trees{'manual_simple_latin1_with_error'} = {
       },
       'source_info' => {
         'file_name' => 'manual_simple_latin1_with_error.texi',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     }
   ],
@@ -413,7 +407,6 @@ $result_errors{'manual_simple_latin1_with_error'} = [
 ",
     'file_name' => 'manual_simple_latin1_with_error.texi',
     'line_nr' => 13,
-    'macro' => '',
     'text' => "undefined flag: non_conn\x{f9}e",
     'type' => 'warning'
   },
@@ -422,7 +415,6 @@ $result_errors{'manual_simple_latin1_with_error'} = [
 ",
     'file_name' => 'manual_simple_latin1_with_error.texi',
     'line_nr' => 8,
-    'macro' => '',
     'text' => "node `\x{e9}sseul\x{e9}' unreferenced",
     'type' => 'warning'
   }
diff --git a/tp/t/results/formats_encodings/manual_simple_utf8_with_error.pl 
b/tp/t/results/formats_encodings/manual_simple_utf8_with_error.pl
index 8c920da6d2..1e3930446e 100644
--- a/tp/t/results/formats_encodings/manual_simple_utf8_with_error.pl
+++ b/tp/t/results/formats_encodings/manual_simple_utf8_with_error.pl
@@ -59,8 +59,7 @@ $result_trees{'manual_simple_utf8_with_error'} = {
       },
       'source_info' => {
         'file_name' => 'manual_simple_utf8_with_error.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -96,8 +95,7 @@ $result_trees{'manual_simple_utf8_with_error'} = {
       },
       'source_info' => {
         'file_name' => 'manual_simple_utf8_with_error.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -136,8 +134,7 @@ $result_trees{'manual_simple_utf8_with_error'} = {
       },
       'source_info' => {
         'file_name' => 'manual_simple_utf8_with_error.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -169,8 +166,7 @@ $result_trees{'manual_simple_utf8_with_error'} = {
       },
       'source_info' => {
         'file_name' => 'manual_simple_utf8_with_error.texi',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -225,8 +221,7 @@ $result_trees{'manual_simple_utf8_with_error'} = {
       },
       'source_info' => {
         'file_name' => 'manual_simple_utf8_with_error.texi',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     }
   ],
@@ -370,7 +365,6 @@ $result_errors{'manual_simple_utf8_with_error'} = [
 ",
     'file_name' => 'manual_simple_utf8_with_error.texi',
     'line_nr' => 11,
-    'macro' => '',
     'text' => "undefined flag: non_conn\x{f9}e",
     'type' => 'warning'
   },
@@ -379,7 +373,6 @@ $result_errors{'manual_simple_utf8_with_error'} = [
 ",
     'file_name' => 'manual_simple_utf8_with_error.texi',
     'line_nr' => 6,
-    'macro' => '',
     'text' => "node `\x{e9}sseul\x{e9}' unreferenced",
     'type' => 'warning'
   }
diff --git a/tp/t/results/formats_encodings/multiple_include_encodings.pl 
b/tp/t/results/formats_encodings/multiple_include_encodings.pl
index bad362d73d..1f22f51750 100644
--- a/tp/t/results/formats_encodings/multiple_include_encodings.pl
+++ b/tp/t/results/formats_encodings/multiple_include_encodings.pl
@@ -50,8 +50,7 @@ $result_trees{'multiple_include_encodings'} = {
               },
               'source_info' => {
                 'file_name' => 'multiple_include_encodings.texi',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -110,15 +109,13 @@ $result_trees{'multiple_include_encodings'} = {
                   },
                   'source_info' => {
                     'file_name' => 'multiple_include_encodings.texi',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'multiple_include_encodings.texi',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -153,8 +150,7 @@ $result_trees{'multiple_include_encodings'} = {
                     },
                     'source_info' => {
                       'file_name' => 'multiple_include_encodings.texi',
-                      'line_nr' => 8,
-                      'macro' => ''
+                      'line_nr' => 8
                     }
                   },
                   'position' => 1,
@@ -195,8 +191,7 @@ $result_trees{'multiple_include_encodings'} = {
               },
               'source_info' => {
                 'file_name' => 'documentdescription_EUC_CN.texi',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -255,15 +250,13 @@ $result_trees{'multiple_include_encodings'} = {
                   },
                   'source_info' => {
                     'file_name' => 'documentdescription_EUC_CN.texi',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'documentdescription_EUC_CN.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               },
               'source_marks' => [
                 {
@@ -307,8 +300,7 @@ $result_trees{'multiple_include_encodings'} = {
               },
               'source_info' => {
                 'file_name' => 'multiple_include_encodings.texi',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -351,8 +343,7 @@ $result_trees{'multiple_include_encodings'} = {
       },
       'source_info' => {
         'file_name' => 'multiple_include_encodings.texi',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -406,8 +397,7 @@ $result_trees{'multiple_include_encodings'} = {
                 },
                 'source_info' => {
                   'file_name' => 'multiple_include_encodings.texi',
-                  'line_nr' => 15,
-                  'macro' => ''
+                  'line_nr' => 15
                 }
               },
               'position' => 1,
@@ -450,8 +440,7 @@ $result_trees{'multiple_include_encodings'} = {
       },
       'source_info' => {
         'file_name' => 'multiple_include_encodings.texi',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -483,8 +472,7 @@ $result_trees{'multiple_include_encodings'} = {
       },
       'source_info' => {
         'file_name' => 'multiple_include_encodings.texi',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -538,8 +526,7 @@ $result_trees{'multiple_include_encodings'} = {
                 },
                 'source_info' => {
                   'file_name' => 'multiple_include_encodings.texi',
-                  'line_nr' => 20,
-                  'macro' => ''
+                  'line_nr' => 20
                 }
               },
               'position' => 1,
@@ -580,8 +567,7 @@ $result_trees{'multiple_include_encodings'} = {
           },
           'source_info' => {
             'file_name' => 'chapter_japanese_shift_jis.texi',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -612,8 +598,7 @@ $result_trees{'multiple_include_encodings'} = {
           },
           'source_info' => {
             'file_name' => 'chapter_japanese_shift_jis.texi',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -637,8 +622,7 @@ $result_trees{'multiple_include_encodings'} = {
       },
       'source_info' => {
         'file_name' => 'multiple_include_encodings.texi',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -670,8 +654,7 @@ $result_trees{'multiple_include_encodings'} = {
       },
       'source_info' => {
         'file_name' => 'chapter_japanese_shift_jis.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -742,8 +725,7 @@ $result_trees{'multiple_include_encodings'} = {
       },
       'source_info' => {
         'file_name' => 'chapter_japanese_shift_jis.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -775,8 +757,7 @@ $result_trees{'multiple_include_encodings'} = {
       },
       'source_info' => {
         'file_name' => 'chapter_japanese_shift_jis.texi',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -857,8 +838,7 @@ $result_trees{'multiple_include_encodings'} = {
                 },
                 'source_info' => {
                   'file_name' => 'multiple_include_encodings.texi',
-                  'line_nr' => 22,
-                  'macro' => ''
+                  'line_nr' => 22
                 }
               },
               'position' => 1,
@@ -899,8 +879,7 @@ $result_trees{'multiple_include_encodings'} = {
           },
           'source_info' => {
             'file_name' => 'chapter_char_latin2_latin2_in_refs.texi',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -919,8 +898,7 @@ $result_trees{'multiple_include_encodings'} = {
       },
       'source_info' => {
         'file_name' => 'chapter_japanese_shift_jis.texi',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -953,8 +931,7 @@ $result_trees{'multiple_include_encodings'} = {
       },
       'source_info' => {
         'file_name' => 'chapter_char_latin2_latin2_in_refs.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -1005,8 +982,7 @@ $result_trees{'multiple_include_encodings'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'chapter_char_latin2_latin2_in_refs.texi',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -1051,8 +1027,7 @@ $result_trees{'multiple_include_encodings'} = {
           },
           'source_info' => {
             'file_name' => 'chapter_char_latin2_latin2_in_refs.texi',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -1127,8 +1102,7 @@ $result_trees{'multiple_include_encodings'} = {
               ],
               'source_info' => {
                 'file_name' => 'chapter_char_latin2_latin2_in_refs.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               },
               'type' => 'menu_entry'
             },
@@ -1160,15 +1134,13 @@ $result_trees{'multiple_include_encodings'} = {
               },
               'source_info' => {
                 'file_name' => 'chapter_char_latin2_latin2_in_refs.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             }
           ],
           'source_info' => {
             'file_name' => 'chapter_char_latin2_latin2_in_refs.texi',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -1187,8 +1159,7 @@ $result_trees{'multiple_include_encodings'} = {
       },
       'source_info' => {
         'file_name' => 'chapter_char_latin2_latin2_in_refs.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -1220,8 +1191,7 @@ $result_trees{'multiple_include_encodings'} = {
       },
       'source_info' => {
         'file_name' => 'chapter_char_latin2_latin2_in_refs.texi',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -1281,8 +1251,7 @@ $result_trees{'multiple_include_encodings'} = {
           },
           'source_info' => {
             'file_name' => 'chapter_char_latin2_latin2_in_refs.texi',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           },
           'type' => 'index_entry_command'
         },
@@ -1331,8 +1300,7 @@ $result_trees{'multiple_include_encodings'} = {
                 },
                 'source_info' => {
                   'file_name' => 'multiple_include_encodings.texi',
-                  'line_nr' => 24,
-                  'macro' => ''
+                  'line_nr' => 24
                 }
               },
               'position' => 1,
@@ -1373,8 +1341,7 @@ $result_trees{'multiple_include_encodings'} = {
           },
           'source_info' => {
             'file_name' => 'chapter_chinese_mixed_with_en_EUC_CN.texi',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -1393,8 +1360,7 @@ $result_trees{'multiple_include_encodings'} = {
       },
       'source_info' => {
         'file_name' => 'chapter_char_latin2_latin2_in_refs.texi',
-        'line_nr' => 16,
-        'macro' => ''
+        'line_nr' => 16
       }
     },
     {
@@ -1426,8 +1392,7 @@ $result_trees{'multiple_include_encodings'} = {
       },
       'source_info' => {
         'file_name' => 'chapter_chinese_mixed_with_en_EUC_CN.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -1676,8 +1641,7 @@ $result_trees{'multiple_include_encodings'} = {
                 },
                 'source_info' => {
                   'file_name' => 'multiple_include_encodings.texi',
-                  'line_nr' => 29,
-                  'macro' => ''
+                  'line_nr' => 29
                 }
               },
               'position' => 1,
@@ -1718,8 +1682,7 @@ $result_trees{'multiple_include_encodings'} = {
           },
           'source_info' => {
             'file_name' => 'chapter_chinese_mixed_with_en.texi',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -1738,8 +1701,7 @@ $result_trees{'multiple_include_encodings'} = {
       },
       'source_info' => {
         'file_name' => 'chapter_chinese_mixed_with_en_EUC_CN.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -1771,8 +1733,7 @@ $result_trees{'multiple_include_encodings'} = {
       },
       'source_info' => {
         'file_name' => 'chapter_chinese_mixed_with_en.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -1977,8 +1938,7 @@ $result_trees{'multiple_include_encodings'} = {
       },
       'source_info' => {
         'file_name' => 'chapter_chinese_mixed_with_en.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -2670,7 +2630,6 @@ $result_errors{'multiple_include_encodings'} = [
 ',
     'file_name' => 'documentdescription_EUC_CN.texi',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'encoding `EUC-CN\' is not a canonical texinfo encoding',
     'type' => 'warning'
   },
@@ -2679,7 +2638,6 @@ $result_errors{'multiple_include_encodings'} = [
 ',
     'file_name' => 'chapter_japanese_shift_jis.texi',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'encoding `shift_jis\' is not a canonical texinfo encoding',
     'type' => 'warning'
   },
@@ -2688,7 +2646,6 @@ $result_errors{'multiple_include_encodings'} = [
 ',
     'file_name' => 'chapter_chinese_mixed_with_en_EUC_CN.texi',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'encoding `EUC-CN\' is not a canonical texinfo encoding',
     'type' => 'warning'
   }
diff --git 
a/tp/t/results/formats_encodings/no_documentencoding_and_insertions.pl 
b/tp/t/results/formats_encodings/no_documentencoding_and_insertions.pl
index 4eadd2018c..56a883bdb7 100644
--- a/tp/t/results/formats_encodings/no_documentencoding_and_insertions.pl
+++ b/tp/t/results/formats_encodings/no_documentencoding_and_insertions.pl
@@ -33,8 +33,7 @@ $result_trees{'no_documentencoding_and_insertions'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -54,8 +53,7 @@ $result_trees{'no_documentencoding_and_insertions'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -103,8 +101,7 @@ $result_trees{'no_documentencoding_and_insertions'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 },
                 {
@@ -124,8 +121,7 @@ $result_trees{'no_documentencoding_and_insertions'} = {
                   'cmdname' => '~',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 },
                 {
@@ -163,15 +159,13 @@ $result_trees{'no_documentencoding_and_insertions'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         }
       ],
diff --git a/tp/t/results/formats_encodings/sample_utf8.pl 
b/tp/t/results/formats_encodings/sample_utf8.pl
index 053254ec4b..22d838645c 100644
--- a/tp/t/results/formats_encodings/sample_utf8.pl
+++ b/tp/t/results/formats_encodings/sample_utf8.pl
@@ -64,8 +64,7 @@ $result_trees{'sample_utf8'} = {
               },
               'source_info' => {
                 'file_name' => 'sample_utf8.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -93,8 +92,7 @@ $result_trees{'sample_utf8'} = {
               },
               'source_info' => {
                 'file_name' => 'sample_utf8.texi',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -126,8 +124,7 @@ $result_trees{'sample_utf8'} = {
               },
               'source_info' => {
                 'file_name' => 'sample_utf8.texi',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -214,15 +211,13 @@ $result_trees{'sample_utf8'} = {
                   },
                   'source_info' => {
                     'file_name' => 'sample_utf8.texi',
-                    'line_nr' => 13,
-                    'macro' => ''
+                    'line_nr' => 13
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'sample_utf8.texi',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -269,8 +264,7 @@ $result_trees{'sample_utf8'} = {
                   },
                   'source_info' => {
                     'file_name' => 'sample_utf8.texi',
-                    'line_nr' => 16,
-                    'macro' => ''
+                    'line_nr' => 16
                   }
                 },
                 {
@@ -313,8 +307,7 @@ $result_trees{'sample_utf8'} = {
                   'cmdname' => 'insertcopying',
                   'source_info' => {
                     'file_name' => 'sample_utf8.texi',
-                    'line_nr' => 20,
-                    'macro' => ''
+                    'line_nr' => 20
                   }
                 },
                 {
@@ -345,15 +338,13 @@ $result_trees{'sample_utf8'} = {
                   },
                   'source_info' => {
                     'file_name' => 'sample_utf8.texi',
-                    'line_nr' => 21,
-                    'macro' => ''
+                    'line_nr' => 21
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'sample_utf8.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -382,8 +373,7 @@ $result_trees{'sample_utf8'} = {
               'cmdname' => 'contents',
               'source_info' => {
                 'file_name' => 'sample_utf8.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -405,8 +395,7 @@ $result_trees{'sample_utf8'} = {
                     'cmdname' => 'ifnottex',
                     'source_info' => {
                       'file_name' => 'sample_utf8.texi',
-                      'line_nr' => 26,
-                      'macro' => ''
+                      'line_nr' => 26
                     }
                   },
                   'position' => 1,
@@ -453,8 +442,7 @@ $result_trees{'sample_utf8'} = {
       },
       'source_info' => {
         'file_name' => 'sample_utf8.texi',
-        'line_nr' => 27,
-        'macro' => ''
+        'line_nr' => 27
       }
     },
     {
@@ -492,8 +480,7 @@ $result_trees{'sample_utf8'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => 'sample_utf8.texi',
-            'line_nr' => 30,
-            'macro' => ''
+            'line_nr' => 30
           },
           'source_marks' => [
             {
@@ -526,8 +513,7 @@ $result_trees{'sample_utf8'} = {
                 },
                 'source_info' => {
                   'file_name' => 'sample_utf8.texi',
-                  'line_nr' => 31,
-                  'macro' => ''
+                  'line_nr' => 31
                 }
               },
               'sourcemark_type' => 'expanded_conditional_command',
@@ -601,8 +587,7 @@ $result_trees{'sample_utf8'} = {
               ],
               'source_info' => {
                 'file_name' => 'sample_utf8.texi',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               },
               'type' => 'menu_entry'
             },
@@ -649,8 +634,7 @@ $result_trees{'sample_utf8'} = {
               ],
               'source_info' => {
                 'file_name' => 'sample_utf8.texi',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               },
               'type' => 'menu_entry'
             },
@@ -697,8 +681,7 @@ $result_trees{'sample_utf8'} = {
               ],
               'source_info' => {
                 'file_name' => 'sample_utf8.texi',
-                'line_nr' => 37,
-                'macro' => ''
+                'line_nr' => 37
               },
               'type' => 'menu_entry'
             },
@@ -730,15 +713,13 @@ $result_trees{'sample_utf8'} = {
               },
               'source_info' => {
                 'file_name' => 'sample_utf8.texi',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               }
             }
           ],
           'source_info' => {
             'file_name' => 'sample_utf8.texi',
-            'line_nr' => 33,
-            'macro' => ''
+            'line_nr' => 33
           }
         },
         {
@@ -760,8 +741,7 @@ $result_trees{'sample_utf8'} = {
       },
       'source_info' => {
         'file_name' => 'sample_utf8.texi',
-        'line_nr' => 28,
-        'macro' => ''
+        'line_nr' => 28
       }
     },
     {
@@ -793,8 +773,7 @@ $result_trees{'sample_utf8'} = {
       },
       'source_info' => {
         'file_name' => 'sample_utf8.texi',
-        'line_nr' => 41,
-        'macro' => ''
+        'line_nr' => 41
       }
     },
     {
@@ -854,8 +833,7 @@ $result_trees{'sample_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'sample_utf8.texi',
-            'line_nr' => 44,
-            'macro' => ''
+            'line_nr' => 44
           },
           'type' => 'index_entry_command'
         },
@@ -903,8 +881,7 @@ $result_trees{'sample_utf8'} = {
               },
               'source_info' => {
                 'file_name' => 'sample_utf8.texi',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               },
               'type' => 'index_entry_command'
             },
@@ -941,8 +918,7 @@ $result_trees{'sample_utf8'} = {
               },
               'source_info' => {
                 'file_name' => 'sample_utf8.texi',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               },
               'type' => 'index_entry_command'
             },
@@ -979,8 +955,7 @@ $result_trees{'sample_utf8'} = {
               },
               'source_info' => {
                 'file_name' => 'sample_utf8.texi',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               },
               'type' => 'index_entry_command'
             }
@@ -1051,8 +1026,7 @@ $result_trees{'sample_utf8'} = {
               },
               'source_info' => {
                 'file_name' => 'sample_utf8.texi',
-                'line_nr' => 54,
-                'macro' => ''
+                'line_nr' => 54
               }
             },
             {
@@ -1081,8 +1055,7 @@ $result_trees{'sample_utf8'} = {
               },
               'source_info' => {
                 'file_name' => 'sample_utf8.texi',
-                'line_nr' => 57,
-                'macro' => ''
+                'line_nr' => 57
               }
             },
             {
@@ -1113,8 +1086,7 @@ $result_trees{'sample_utf8'} = {
               },
               'source_info' => {
                 'file_name' => 'sample_utf8.texi',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             }
           ],
@@ -1123,8 +1095,7 @@ $result_trees{'sample_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'sample_utf8.texi',
-            'line_nr' => 53,
-            'macro' => ''
+            'line_nr' => 53
           }
         },
         {
@@ -1143,8 +1114,7 @@ $result_trees{'sample_utf8'} = {
       },
       'source_info' => {
         'file_name' => 'sample_utf8.texi',
-        'line_nr' => 42,
-        'macro' => ''
+        'line_nr' => 42
       }
     },
     {
@@ -1176,8 +1146,7 @@ $result_trees{'sample_utf8'} = {
       },
       'source_info' => {
         'file_name' => 'sample_utf8.texi',
-        'line_nr' => 61,
-        'macro' => ''
+        'line_nr' => 61
       }
     },
     {
@@ -1229,8 +1198,7 @@ $result_trees{'sample_utf8'} = {
       },
       'source_info' => {
         'file_name' => 'sample_utf8.texi',
-        'line_nr' => 62,
-        'macro' => ''
+        'line_nr' => 62
       }
     },
     {
@@ -1263,8 +1231,7 @@ $result_trees{'sample_utf8'} = {
       },
       'source_info' => {
         'file_name' => 'sample_utf8.texi',
-        'line_nr' => 66,
-        'macro' => ''
+        'line_nr' => 66
       }
     },
     {
@@ -1321,8 +1288,7 @@ $result_trees{'sample_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'sample_utf8.texi',
-            'line_nr' => 69,
-            'macro' => ''
+            'line_nr' => 69
           }
         },
         {
@@ -1339,8 +1305,7 @@ $result_trees{'sample_utf8'} = {
       },
       'source_info' => {
         'file_name' => 'sample_utf8.texi',
-        'line_nr' => 67,
-        'macro' => ''
+        'line_nr' => 67
       }
     },
     {
diff --git a/tp/t/results/formats_encodings/verb_delimiter_not_ascii.pl 
b/tp/t/results/formats_encodings/verb_delimiter_not_ascii.pl
index 0a9552a9ee..e0dfe8a4a0 100644
--- a/tp/t/results/formats_encodings/verb_delimiter_not_ascii.pl
+++ b/tp/t/results/formats_encodings/verb_delimiter_not_ascii.pl
@@ -44,8 +44,7 @@ $result_trees{'verb_delimiter_not_ascii'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -81,8 +80,7 @@ $result_trees{'verb_delimiter_not_ascii'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -114,8 +112,7 @@ $result_trees{'verb_delimiter_not_ascii'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -157,8 +154,7 @@ $result_trees{'verb_delimiter_not_ascii'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -179,8 +175,7 @@ $result_trees{'verb_delimiter_not_ascii'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
diff --git a/tp/t/results/formats_encodings/weird_accents.pl 
b/tp/t/results/formats_encodings/weird_accents.pl
index b23d281cc9..048fef67bb 100644
--- a/tp/t/results/formats_encodings/weird_accents.pl
+++ b/tp/t/results/formats_encodings/weird_accents.pl
@@ -40,8 +40,7 @@ $result_trees{'weird_accents'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -84,8 +83,7 @@ $result_trees{'weird_accents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -121,8 +119,7 @@ $result_trees{'weird_accents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -154,8 +151,7 @@ $result_trees{'weird_accents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -206,8 +202,7 @@ $result_trees{'weird_accents'} = {
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 9,
-                                'macro' => ''
+                                'line_nr' => 9
                               }
                             }
                           ],
@@ -217,8 +212,7 @@ $result_trees{'weird_accents'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     }
                   ],
@@ -228,8 +222,7 @@ $result_trees{'weird_accents'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -268,8 +261,7 @@ $result_trees{'weird_accents'} = {
                               'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 11,
-                                'macro' => ''
+                                'line_nr' => 11
                               }
                             }
                           ],
@@ -279,8 +271,7 @@ $result_trees{'weird_accents'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     }
                   ],
@@ -290,8 +281,7 @@ $result_trees{'weird_accents'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -326,8 +316,7 @@ $result_trees{'weird_accents'} = {
                       'cmdname' => 'ubaraccent',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     }
                   ],
@@ -337,8 +326,7 @@ $result_trees{'weird_accents'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -377,8 +365,7 @@ $result_trees{'weird_accents'} = {
                               'cmdname' => '`',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 15,
-                                'macro' => ''
+                                'line_nr' => 15
                               }
                             }
                           ],
@@ -388,8 +375,7 @@ $result_trees{'weird_accents'} = {
                       'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     }
                   ],
@@ -399,8 +385,7 @@ $result_trees{'weird_accents'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -439,8 +424,7 @@ $result_trees{'weird_accents'} = {
                               'cmdname' => '`',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 17,
-                                'macro' => ''
+                                'line_nr' => 17
                               }
                             }
                           ],
@@ -450,8 +434,7 @@ $result_trees{'weird_accents'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     }
                   ],
@@ -461,8 +444,7 @@ $result_trees{'weird_accents'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -483,8 +465,7 @@ $result_trees{'weird_accents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     }
   ],
diff --git a/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl 
b/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl
index 0760939798..779207408f 100644
--- a/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl
+++ b/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl
@@ -40,8 +40,7 @@ $result_trees{'weird_accents_disable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -84,8 +83,7 @@ $result_trees{'weird_accents_disable_encoding'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -121,8 +119,7 @@ $result_trees{'weird_accents_disable_encoding'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -154,8 +151,7 @@ $result_trees{'weird_accents_disable_encoding'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -206,8 +202,7 @@ $result_trees{'weird_accents_disable_encoding'} = {
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 9,
-                                'macro' => ''
+                                'line_nr' => 9
                               }
                             }
                           ],
@@ -217,8 +212,7 @@ $result_trees{'weird_accents_disable_encoding'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     }
                   ],
@@ -228,8 +222,7 @@ $result_trees{'weird_accents_disable_encoding'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -268,8 +261,7 @@ $result_trees{'weird_accents_disable_encoding'} = {
                               'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 11,
-                                'macro' => ''
+                                'line_nr' => 11
                               }
                             }
                           ],
@@ -279,8 +271,7 @@ $result_trees{'weird_accents_disable_encoding'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     }
                   ],
@@ -290,8 +281,7 @@ $result_trees{'weird_accents_disable_encoding'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -326,8 +316,7 @@ $result_trees{'weird_accents_disable_encoding'} = {
                       'cmdname' => 'ubaraccent',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     }
                   ],
@@ -337,8 +326,7 @@ $result_trees{'weird_accents_disable_encoding'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -377,8 +365,7 @@ $result_trees{'weird_accents_disable_encoding'} = {
                               'cmdname' => '`',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 15,
-                                'macro' => ''
+                                'line_nr' => 15
                               }
                             }
                           ],
@@ -388,8 +375,7 @@ $result_trees{'weird_accents_disable_encoding'} = {
                       'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     }
                   ],
@@ -399,8 +385,7 @@ $result_trees{'weird_accents_disable_encoding'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -439,8 +424,7 @@ $result_trees{'weird_accents_disable_encoding'} = {
                               'cmdname' => '`',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 17,
-                                'macro' => ''
+                                'line_nr' => 17
                               }
                             }
                           ],
@@ -450,8 +434,7 @@ $result_trees{'weird_accents_disable_encoding'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     }
                   ],
@@ -461,8 +444,7 @@ $result_trees{'weird_accents_disable_encoding'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -483,8 +465,7 @@ $result_trees{'weird_accents_disable_encoding'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     }
   ],
diff --git a/tp/t/results/heading/heading_in_copying.pl 
b/tp/t/results/heading/heading_in_copying.pl
index 0d84f373ab..04aeb13d20 100644
--- a/tp/t/results/heading/heading_in_copying.pl
+++ b/tp/t/results/heading/heading_in_copying.pl
@@ -55,8 +55,7 @@ $result_trees{'heading_in_copying'} = {
                       'cmdname' => 'emph',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -77,8 +76,7 @@ $result_trees{'heading_in_copying'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -114,8 +112,7 @@ $result_trees{'heading_in_copying'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'index_entry_command'
             },
@@ -151,8 +148,7 @@ $result_trees{'heading_in_copying'} = {
                       'cmdname' => 'emph',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     }
                   ],
@@ -173,8 +169,7 @@ $result_trees{'heading_in_copying'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -205,15 +200,13 @@ $result_trees{'heading_in_copying'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -253,8 +246,7 @@ $result_trees{'heading_in_copying'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -292,8 +284,7 @@ $result_trees{'heading_in_copying'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           }
         }
       ],
@@ -308,8 +299,7 @@ $result_trees{'heading_in_copying'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     }
   ],
diff --git a/tp/t/results/heading/heading_in_example.pl 
b/tp/t/results/heading/heading_in_example.pl
index 51a2f304af..9ee1ce47f2 100644
--- a/tp/t/results/heading/heading_in_example.pl
+++ b/tp/t/results/heading/heading_in_example.pl
@@ -50,8 +50,7 @@ $result_trees{'heading_in_example'} = {
                       'cmdname' => 'emph',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -72,8 +71,7 @@ $result_trees{'heading_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -104,15 +102,13 @@ $result_trees{'heading_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/heading/heading_in_quotation.pl 
b/tp/t/results/heading/heading_in_quotation.pl
index 32cb93ea24..2e5745a3ad 100644
--- a/tp/t/results/heading/heading_in_quotation.pl
+++ b/tp/t/results/heading/heading_in_quotation.pl
@@ -55,8 +55,7 @@ $result_trees{'heading_in_quotation'} = {
                       'cmdname' => 'emph',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -77,8 +76,7 @@ $result_trees{'heading_in_quotation'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -114,15 +112,13 @@ $result_trees{'heading_in_quotation'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/html_tests/acronym_in_node_and_section.pl 
b/tp/t/results/html_tests/acronym_in_node_and_section.pl
index bc1536fc84..7b18a4a1e6 100644
--- a/tp/t/results/html_tests/acronym_in_node_and_section.pl
+++ b/tp/t/results/html_tests/acronym_in_node_and_section.pl
@@ -39,8 +39,7 @@ $result_trees{'acronym_in_node_and_section'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -76,8 +75,7 @@ $result_trees{'acronym_in_node_and_section'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -109,8 +107,7 @@ $result_trees{'acronym_in_node_and_section'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -148,8 +145,7 @@ $result_trees{'acronym_in_node_and_section'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -181,8 +177,7 @@ $result_trees{'acronym_in_node_and_section'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -238,8 +233,7 @@ $result_trees{'acronym_in_node_and_section'} = {
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -265,8 +259,7 @@ $result_trees{'acronym_in_node_and_section'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -290,8 +283,7 @@ $result_trees{'acronym_in_node_and_section'} = {
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
@@ -316,8 +308,7 @@ $result_trees{'acronym_in_node_and_section'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -341,8 +332,7 @@ $result_trees{'acronym_in_node_and_section'} = {
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             }
           ],
@@ -381,8 +371,7 @@ $result_trees{'acronym_in_node_and_section'} = {
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -403,8 +392,7 @@ $result_trees{'acronym_in_node_and_section'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     }
   ],
diff --git a/tp/t/results/html_tests/automatic_menus.pl 
b/tp/t/results/html_tests/automatic_menus.pl
index cc690f0ccd..b002d7e457 100644
--- a/tp/t/results/html_tests/automatic_menus.pl
+++ b/tp/t/results/html_tests/automatic_menus.pl
@@ -39,8 +39,7 @@ $result_trees{'automatic_menus'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -76,8 +75,7 @@ $result_trees{'automatic_menus'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -128,8 +126,7 @@ $result_trees{'automatic_menus'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         'normalized' => 'chap'
@@ -141,8 +138,7 @@ $result_trees{'automatic_menus'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -181,8 +177,7 @@ $result_trees{'automatic_menus'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -233,8 +228,7 @@ $result_trees{'automatic_menus'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         'normalized' => 'sec'
@@ -246,8 +240,7 @@ $result_trees{'automatic_menus'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -286,8 +279,7 @@ $result_trees{'automatic_menus'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -319,8 +311,7 @@ $result_trees{'automatic_menus'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -351,8 +342,7 @@ $result_trees{'automatic_menus'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     }
   ],
diff --git a/tp/t/results/html_tests/character_number_leading_toc_stoc.pl 
b/tp/t/results/html_tests/character_number_leading_toc_stoc.pl
index b02a752ec6..50b6af5afb 100644
--- a/tp/t/results/html_tests/character_number_leading_toc_stoc.pl
+++ b/tp/t/results/html_tests/character_number_leading_toc_stoc.pl
@@ -36,8 +36,7 @@ $result_trees{'character_number_leading_toc_stoc'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -68,8 +67,7 @@ $result_trees{'character_number_leading_toc_stoc'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -98,8 +96,7 @@ $result_trees{'character_number_leading_toc_stoc'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -137,8 +134,7 @@ $result_trees{'character_number_leading_toc_stoc'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -157,8 +153,7 @@ $result_trees{'character_number_leading_toc_stoc'} = {
           'cmdname' => 'shortcontents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -175,8 +170,7 @@ $result_trees{'character_number_leading_toc_stoc'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     }
   ],
diff --git a/tp/t/results/html_tests/check_htmlxref.pl 
b/tp/t/results/html_tests/check_htmlxref.pl
index 6d8dcf232a..c895dca86e 100644
--- a/tp/t/results/html_tests/check_htmlxref.pl
+++ b/tp/t/results/html_tests/check_htmlxref.pl
@@ -117,8 +117,7 @@ $result_trees{'check_htmlxref'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -207,8 +206,7 @@ $result_trees{'check_htmlxref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -275,8 +273,7 @@ $result_trees{'check_htmlxref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -348,8 +345,7 @@ $result_trees{'check_htmlxref'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -401,8 +397,7 @@ $result_trees{'check_htmlxref'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'menu_entry'
             },
@@ -449,8 +444,7 @@ $result_trees{'check_htmlxref'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -482,15 +476,13 @@ $result_trees{'check_htmlxref'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -507,8 +499,7 @@ $result_trees{'check_htmlxref'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -571,8 +562,7 @@ $result_trees{'check_htmlxref'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -663,8 +653,7 @@ $result_trees{'check_htmlxref'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 16,
-        'macro' => ''
+        'line_nr' => 16
       }
     },
     {
@@ -728,8 +717,7 @@ $result_trees{'check_htmlxref'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -750,8 +738,7 @@ $result_trees{'check_htmlxref'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     }
   ],
@@ -1045,7 +1032,6 @@ $result_converted_errors{'html'}->{'check_htmlxref'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'no htmlxref.cnf entry found for 
`../there/no_existing_no_manual_direction\'',
     'type' => 'warning'
   },
@@ -1054,7 +1040,6 @@ $result_converted_errors{'html'}->{'check_htmlxref'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'no htmlxref.cnf entry found for `dir\'',
     'type' => 'warning'
   },
@@ -1063,7 +1048,6 @@ $result_converted_errors{'html'}->{'check_htmlxref'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'no htmlxref.cnf entry found for `no_existing_no_manual.info\'',
     'type' => 'warning'
   },
@@ -1072,7 +1056,6 @@ $result_converted_errors{'html'}->{'check_htmlxref'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'no htmlxref.cnf entry found for `no_existing_no_manual.info\'',
     'type' => 'warning'
   },
@@ -1081,7 +1064,6 @@ $result_converted_errors{'html'}->{'check_htmlxref'} = [
 ',
     'file_name' => '',
     'line_nr' => 14,
-    'macro' => '',
     'text' => 'no htmlxref.cnf entry found for `no_existing_no_manual.info\'',
     'type' => 'warning'
   },
@@ -1090,7 +1072,6 @@ $result_converted_errors{'html'}->{'check_htmlxref'} = [
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => 'no htmlxref.cnf entry found for `chap_not_existing\'',
     'type' => 'warning'
   },
@@ -1099,7 +1080,6 @@ $result_converted_errors{'html'}->{'check_htmlxref'} = [
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => 'no htmlxref.cnf entry found for `dir\'',
     'type' => 'warning'
   },
@@ -1108,7 +1088,6 @@ $result_converted_errors{'html'}->{'check_htmlxref'} = [
 ',
     'file_name' => '',
     'line_nr' => 19,
-    'macro' => '',
     'text' => 'no htmlxref.cnf entry found for `some_name_inf.inf\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/html_tests/check_htmlxref_ignore_ref_top_up.pl 
b/tp/t/results/html_tests/check_htmlxref_ignore_ref_top_up.pl
index a785172b0e..62d5b290a4 100644
--- a/tp/t/results/html_tests/check_htmlxref_ignore_ref_top_up.pl
+++ b/tp/t/results/html_tests/check_htmlxref_ignore_ref_top_up.pl
@@ -117,8 +117,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -207,8 +206,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -275,8 +273,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -348,8 +345,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -401,8 +397,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'menu_entry'
             },
@@ -449,8 +444,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -482,15 +476,13 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -507,8 +499,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -571,8 +562,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -663,8 +653,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 16,
-        'macro' => ''
+        'line_nr' => 16
       }
     },
     {
@@ -728,8 +717,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -750,8 +738,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     }
   ],
@@ -1045,7 +1032,6 @@ 
$result_converted_errors{'html'}->{'check_htmlxref_ignore_ref_top_up'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'no htmlxref.cnf entry found for 
`../there/no_existing_no_manual_direction\'',
     'type' => 'warning'
   },
@@ -1054,7 +1040,6 @@ 
$result_converted_errors{'html'}->{'check_htmlxref_ignore_ref_top_up'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'no htmlxref.cnf entry found for `no_existing_no_manual.info\'',
     'type' => 'warning'
   },
@@ -1063,7 +1048,6 @@ 
$result_converted_errors{'html'}->{'check_htmlxref_ignore_ref_top_up'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'no htmlxref.cnf entry found for `no_existing_no_manual.info\'',
     'type' => 'warning'
   },
@@ -1072,7 +1056,6 @@ 
$result_converted_errors{'html'}->{'check_htmlxref_ignore_ref_top_up'} = [
 ',
     'file_name' => '',
     'line_nr' => 14,
-    'macro' => '',
     'text' => 'no htmlxref.cnf entry found for `no_existing_no_manual.info\'',
     'type' => 'warning'
   },
@@ -1081,7 +1064,6 @@ 
$result_converted_errors{'html'}->{'check_htmlxref_ignore_ref_top_up'} = [
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => 'no htmlxref.cnf entry found for `chap_not_existing\'',
     'type' => 'warning'
   },
@@ -1090,7 +1072,6 @@ 
$result_converted_errors{'html'}->{'check_htmlxref_ignore_ref_top_up'} = [
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => 'no htmlxref.cnf entry found for `dir\'',
     'type' => 'warning'
   },
@@ -1099,7 +1080,6 @@ 
$result_converted_errors{'html'}->{'check_htmlxref_ignore_ref_top_up'} = [
 ',
     'file_name' => '',
     'line_nr' => 19,
-    'macro' => '',
     'text' => 'no htmlxref.cnf entry found for `some_name_inf.inf\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/html_tests/check_htmlxref_menu.pl 
b/tp/t/results/html_tests/check_htmlxref_menu.pl
index d9b9087bd1..d0408336f3 100644
--- a/tp/t/results/html_tests/check_htmlxref_menu.pl
+++ b/tp/t/results/html_tests/check_htmlxref_menu.pl
@@ -125,8 +125,7 @@ $result_trees{'check_htmlxref_menu'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -215,8 +214,7 @@ $result_trees{'check_htmlxref_menu'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -283,8 +281,7 @@ $result_trees{'check_htmlxref_menu'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -356,8 +353,7 @@ $result_trees{'check_htmlxref_menu'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -409,8 +405,7 @@ $result_trees{'check_htmlxref_menu'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'menu_entry'
             },
@@ -457,8 +452,7 @@ $result_trees{'check_htmlxref_menu'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -490,15 +484,13 @@ $result_trees{'check_htmlxref_menu'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -515,8 +507,7 @@ $result_trees{'check_htmlxref_menu'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -579,8 +570,7 @@ $result_trees{'check_htmlxref_menu'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -671,8 +661,7 @@ $result_trees{'check_htmlxref_menu'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 16,
-        'macro' => ''
+        'line_nr' => 16
       }
     },
     {
@@ -736,8 +725,7 @@ $result_trees{'check_htmlxref_menu'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -758,8 +746,7 @@ $result_trees{'check_htmlxref_menu'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     }
   ],
@@ -986,7 +973,6 @@ 
$result_converted_errors{'file_html'}->{'check_htmlxref_menu'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'no htmlxref.cnf entry found for 
`../there/no_existing_no_manual_direction\'',
     'type' => 'warning'
   },
@@ -995,7 +981,6 @@ 
$result_converted_errors{'file_html'}->{'check_htmlxref_menu'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'no htmlxref.cnf entry found for `dir\'',
     'type' => 'warning'
   },
@@ -1004,7 +989,6 @@ 
$result_converted_errors{'file_html'}->{'check_htmlxref_menu'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'no htmlxref.cnf entry found for `no_existing_no_manual.info\'',
     'type' => 'warning'
   },
@@ -1013,7 +997,6 @@ 
$result_converted_errors{'file_html'}->{'check_htmlxref_menu'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'no htmlxref.cnf entry found for `no_existing_no_manual.info\'',
     'type' => 'warning'
   },
@@ -1022,7 +1005,6 @@ 
$result_converted_errors{'file_html'}->{'check_htmlxref_menu'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => 'no htmlxref.cnf entry found for `other_no_existing_no_manual\'',
     'type' => 'warning'
   },
@@ -1031,7 +1013,6 @@ 
$result_converted_errors{'file_html'}->{'check_htmlxref_menu'} = [
 ',
     'file_name' => '',
     'line_nr' => 14,
-    'macro' => '',
     'text' => 'no htmlxref.cnf entry found for `no_existing_no_manual.info\'',
     'type' => 'warning'
   },
@@ -1040,7 +1021,6 @@ 
$result_converted_errors{'file_html'}->{'check_htmlxref_menu'} = [
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => 'no htmlxref.cnf entry found for `chap_not_existing\'',
     'type' => 'warning'
   },
@@ -1049,7 +1029,6 @@ 
$result_converted_errors{'file_html'}->{'check_htmlxref_menu'} = [
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => 'no htmlxref.cnf entry found for `dir\'',
     'type' => 'warning'
   },
@@ -1058,7 +1037,6 @@ 
$result_converted_errors{'file_html'}->{'check_htmlxref_menu'} = [
 ',
     'file_name' => '',
     'line_nr' => 19,
-    'macro' => '',
     'text' => 'no htmlxref.cnf entry found for `some_name_inf.inf\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/html_tests/check_htmlxref_no_use_nodes.pl 
b/tp/t/results/html_tests/check_htmlxref_no_use_nodes.pl
index 8a26a9a0f2..e62fbffbed 100644
--- a/tp/t/results/html_tests/check_htmlxref_no_use_nodes.pl
+++ b/tp/t/results/html_tests/check_htmlxref_no_use_nodes.pl
@@ -125,8 +125,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -215,8 +214,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -283,8 +281,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -356,8 +353,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -409,8 +405,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'menu_entry'
             },
@@ -457,8 +452,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -490,15 +484,13 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -515,8 +507,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -579,8 +570,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -671,8 +661,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 16,
-        'macro' => ''
+        'line_nr' => 16
       }
     },
     {
@@ -736,8 +725,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -758,8 +746,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     }
   ],
@@ -986,7 +973,6 @@ 
$result_converted_errors{'file_html'}->{'check_htmlxref_no_use_nodes'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'no htmlxref.cnf entry found for `no_existing_no_manual.info\'',
     'type' => 'warning'
   },
@@ -995,7 +981,6 @@ 
$result_converted_errors{'file_html'}->{'check_htmlxref_no_use_nodes'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'no htmlxref.cnf entry found for `no_existing_no_manual.info\'',
     'type' => 'warning'
   },
@@ -1004,7 +989,6 @@ 
$result_converted_errors{'file_html'}->{'check_htmlxref_no_use_nodes'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'no htmlxref.cnf entry found for `dir\'',
     'type' => 'warning'
   },
@@ -1013,7 +997,6 @@ 
$result_converted_errors{'file_html'}->{'check_htmlxref_no_use_nodes'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'no htmlxref.cnf entry found for 
`../there/no_existing_no_manual_direction\'',
     'type' => 'warning'
   },
@@ -1022,7 +1005,6 @@ 
$result_converted_errors{'file_html'}->{'check_htmlxref_no_use_nodes'} = [
 ',
     'file_name' => '',
     'line_nr' => 19,
-    'macro' => '',
     'text' => 'no htmlxref.cnf entry found for `some_name_inf.inf\'',
     'type' => 'warning'
   },
@@ -1031,7 +1013,6 @@ 
$result_converted_errors{'file_html'}->{'check_htmlxref_no_use_nodes'} = [
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => 'no htmlxref.cnf entry found for `chap_not_existing\'',
     'type' => 'warning'
   },
@@ -1040,7 +1021,6 @@ 
$result_converted_errors{'file_html'}->{'check_htmlxref_no_use_nodes'} = [
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => 'no htmlxref.cnf entry found for `dir\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/html_tests/commands_in_abbr.pl 
b/tp/t/results/html_tests/commands_in_abbr.pl
index 2accf12fe9..fd6a1d1427 100644
--- a/tp/t/results/html_tests/commands_in_abbr.pl
+++ b/tp/t/results/html_tests/commands_in_abbr.pl
@@ -37,8 +37,7 @@ $result_trees{'commands_in_abbr'} = {
                       'cmdname' => 'b',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     },
                     {
@@ -56,8 +55,7 @@ $result_trees{'commands_in_abbr'} = {
               'cmdname' => 'abbr',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -114,8 +112,7 @@ $result_trees{'commands_in_abbr'} = {
                           'cmdname' => 'b',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 4,
-                            'macro' => ''
+                            'line_nr' => 4
                           }
                         },
                         {
@@ -133,8 +130,7 @@ $result_trees{'commands_in_abbr'} = {
                   'cmdname' => 'abbr',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 },
                 {
@@ -172,15 +168,13 @@ $result_trees{'commands_in_abbr'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         }
       ],
diff --git a/tp/t/results/html_tests/commands_in_alt.pl 
b/tp/t/results/html_tests/commands_in_alt.pl
index 1b420602cd..189a56010f 100644
--- a/tp/t/results/html_tests/commands_in_alt.pl
+++ b/tp/t/results/html_tests/commands_in_alt.pl
@@ -44,8 +44,7 @@ $result_trees{'commands_in_alt'} = {
                   'cmdname' => 'b',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 }
               ],
@@ -58,8 +57,7 @@ $result_trees{'commands_in_alt'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -122,8 +120,7 @@ $result_trees{'commands_in_alt'} = {
                           'cmdname' => 'b',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 4,
-                            'macro' => ''
+                            'line_nr' => 4
                           }
                         }
                       ],
@@ -136,8 +133,7 @@ $result_trees{'commands_in_alt'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 },
                 {
@@ -175,15 +171,13 @@ $result_trees{'commands_in_alt'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         }
       ],
diff --git a/tp/t/results/html_tests/commands_in_email.pl 
b/tp/t/results/html_tests/commands_in_email.pl
index 76318efabd..5340a470f4 100644
--- a/tp/t/results/html_tests/commands_in_email.pl
+++ b/tp/t/results/html_tests/commands_in_email.pl
@@ -27,8 +27,7 @@ $result_trees{'commands_in_email'} = {
                       'cmdname' => 'enddots',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     },
                     {
@@ -48,8 +47,7 @@ $result_trees{'commands_in_email'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     }
                   ],
@@ -59,8 +57,7 @@ $result_trees{'commands_in_email'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
diff --git a/tp/t/results/html_tests/contents_at_end.pl 
b/tp/t/results/html_tests/contents_at_end.pl
index 2104236133..78e772b5e3 100644
--- a/tp/t/results/html_tests/contents_at_end.pl
+++ b/tp/t/results/html_tests/contents_at_end.pl
@@ -59,8 +59,7 @@ $result_trees{'contents_at_end'} = {
       },
       'source_info' => {
         'file_name' => 'contents_at_end.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -158,8 +157,7 @@ $result_trees{'contents_at_end'} = {
               ],
               'source_info' => {
                 'file_name' => 'contents_at_end.texi',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -191,15 +189,13 @@ $result_trees{'contents_at_end'} = {
               },
               'source_info' => {
                 'file_name' => 'contents_at_end.texi',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
           'source_info' => {
             'file_name' => 'contents_at_end.texi',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -216,8 +212,7 @@ $result_trees{'contents_at_end'} = {
       },
       'source_info' => {
         'file_name' => 'contents_at_end.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -249,8 +244,7 @@ $result_trees{'contents_at_end'} = {
       },
       'source_info' => {
         'file_name' => 'contents_at_end.texi',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -302,8 +296,7 @@ $result_trees{'contents_at_end'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'contents_at_end.texi',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         }
       ],
@@ -317,8 +310,7 @@ $result_trees{'contents_at_end'} = {
       },
       'source_info' => {
         'file_name' => 'contents_at_end.texi',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
diff --git a/tp/t/results/html_tests/contents_at_end_inline.pl 
b/tp/t/results/html_tests/contents_at_end_inline.pl
index b686feb691..218b632edd 100644
--- a/tp/t/results/html_tests/contents_at_end_inline.pl
+++ b/tp/t/results/html_tests/contents_at_end_inline.pl
@@ -59,8 +59,7 @@ $result_trees{'contents_at_end_inline'} = {
       },
       'source_info' => {
         'file_name' => 'contents_at_end.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -158,8 +157,7 @@ $result_trees{'contents_at_end_inline'} = {
               ],
               'source_info' => {
                 'file_name' => 'contents_at_end.texi',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -191,15 +189,13 @@ $result_trees{'contents_at_end_inline'} = {
               },
               'source_info' => {
                 'file_name' => 'contents_at_end.texi',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
           'source_info' => {
             'file_name' => 'contents_at_end.texi',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -216,8 +212,7 @@ $result_trees{'contents_at_end_inline'} = {
       },
       'source_info' => {
         'file_name' => 'contents_at_end.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -249,8 +244,7 @@ $result_trees{'contents_at_end_inline'} = {
       },
       'source_info' => {
         'file_name' => 'contents_at_end.texi',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -302,8 +296,7 @@ $result_trees{'contents_at_end_inline'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'contents_at_end.texi',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         }
       ],
@@ -317,8 +310,7 @@ $result_trees{'contents_at_end_inline'} = {
       },
       'source_info' => {
         'file_name' => 'contents_at_end.texi',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
diff --git a/tp/t/results/html_tests/contents_at_end_separate_element.pl 
b/tp/t/results/html_tests/contents_at_end_separate_element.pl
index 7b039d8427..dd63dfbec5 100644
--- a/tp/t/results/html_tests/contents_at_end_separate_element.pl
+++ b/tp/t/results/html_tests/contents_at_end_separate_element.pl
@@ -59,8 +59,7 @@ $result_trees{'contents_at_end_separate_element'} = {
       },
       'source_info' => {
         'file_name' => 'contents_at_end.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -158,8 +157,7 @@ $result_trees{'contents_at_end_separate_element'} = {
               ],
               'source_info' => {
                 'file_name' => 'contents_at_end.texi',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -191,15 +189,13 @@ $result_trees{'contents_at_end_separate_element'} = {
               },
               'source_info' => {
                 'file_name' => 'contents_at_end.texi',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
           'source_info' => {
             'file_name' => 'contents_at_end.texi',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -216,8 +212,7 @@ $result_trees{'contents_at_end_separate_element'} = {
       },
       'source_info' => {
         'file_name' => 'contents_at_end.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -249,8 +244,7 @@ $result_trees{'contents_at_end_separate_element'} = {
       },
       'source_info' => {
         'file_name' => 'contents_at_end.texi',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -302,8 +296,7 @@ $result_trees{'contents_at_end_separate_element'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'contents_at_end.texi',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         }
       ],
@@ -317,8 +310,7 @@ $result_trees{'contents_at_end_separate_element'} = {
       },
       'source_info' => {
         'file_name' => 'contents_at_end.texi',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
diff --git a/tp/t/results/html_tests/contents_in_middle_chapter.pl 
b/tp/t/results/html_tests/contents_in_middle_chapter.pl
index 051c87511d..512fb1846f 100644
--- a/tp/t/results/html_tests/contents_in_middle_chapter.pl
+++ b/tp/t/results/html_tests/contents_in_middle_chapter.pl
@@ -59,8 +59,7 @@ $result_trees{'contents_in_middle_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_chapter.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -158,8 +157,7 @@ $result_trees{'contents_in_middle_chapter'} = {
               ],
               'source_info' => {
                 'file_name' => 'contents_in_middle_chapter.texi',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -191,15 +189,13 @@ $result_trees{'contents_in_middle_chapter'} = {
               },
               'source_info' => {
                 'file_name' => 'contents_in_middle_chapter.texi',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
           'source_info' => {
             'file_name' => 'contents_in_middle_chapter.texi',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -216,8 +212,7 @@ $result_trees{'contents_in_middle_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_chapter.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -249,8 +244,7 @@ $result_trees{'contents_in_middle_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_chapter.texi',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -297,8 +291,7 @@ $result_trees{'contents_in_middle_chapter'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'contents_in_middle_chapter.texi',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           }
         },
         {
@@ -363,8 +356,7 @@ $result_trees{'contents_in_middle_chapter'} = {
               ],
               'source_info' => {
                 'file_name' => 'contents_in_middle_chapter.texi',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               },
               'type' => 'menu_entry'
             },
@@ -396,15 +388,13 @@ $result_trees{'contents_in_middle_chapter'} = {
               },
               'source_info' => {
                 'file_name' => 'contents_in_middle_chapter.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             }
           ],
           'source_info' => {
             'file_name' => 'contents_in_middle_chapter.texi',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           }
         },
         {
@@ -423,8 +413,7 @@ $result_trees{'contents_in_middle_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_chapter.texi',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -456,8 +445,7 @@ $result_trees{'contents_in_middle_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_chapter.texi',
-        'line_nr' => 22,
-        'macro' => ''
+        'line_nr' => 22
       }
     },
     {
@@ -509,8 +497,7 @@ $result_trees{'contents_in_middle_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_chapter.texi',
-        'line_nr' => 23,
-        'macro' => ''
+        'line_nr' => 23
       }
     },
     {
diff --git a/tp/t/results/html_tests/contents_in_middle_chapter_inline.pl 
b/tp/t/results/html_tests/contents_in_middle_chapter_inline.pl
index 4bb134eff1..795010c527 100644
--- a/tp/t/results/html_tests/contents_in_middle_chapter_inline.pl
+++ b/tp/t/results/html_tests/contents_in_middle_chapter_inline.pl
@@ -59,8 +59,7 @@ $result_trees{'contents_in_middle_chapter_inline'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_chapter.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -158,8 +157,7 @@ $result_trees{'contents_in_middle_chapter_inline'} = {
               ],
               'source_info' => {
                 'file_name' => 'contents_in_middle_chapter.texi',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -191,15 +189,13 @@ $result_trees{'contents_in_middle_chapter_inline'} = {
               },
               'source_info' => {
                 'file_name' => 'contents_in_middle_chapter.texi',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
           'source_info' => {
             'file_name' => 'contents_in_middle_chapter.texi',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -216,8 +212,7 @@ $result_trees{'contents_in_middle_chapter_inline'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_chapter.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -249,8 +244,7 @@ $result_trees{'contents_in_middle_chapter_inline'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_chapter.texi',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -297,8 +291,7 @@ $result_trees{'contents_in_middle_chapter_inline'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'contents_in_middle_chapter.texi',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           }
         },
         {
@@ -363,8 +356,7 @@ $result_trees{'contents_in_middle_chapter_inline'} = {
               ],
               'source_info' => {
                 'file_name' => 'contents_in_middle_chapter.texi',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               },
               'type' => 'menu_entry'
             },
@@ -396,15 +388,13 @@ $result_trees{'contents_in_middle_chapter_inline'} = {
               },
               'source_info' => {
                 'file_name' => 'contents_in_middle_chapter.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             }
           ],
           'source_info' => {
             'file_name' => 'contents_in_middle_chapter.texi',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           }
         },
         {
@@ -423,8 +413,7 @@ $result_trees{'contents_in_middle_chapter_inline'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_chapter.texi',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -456,8 +445,7 @@ $result_trees{'contents_in_middle_chapter_inline'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_chapter.texi',
-        'line_nr' => 22,
-        'macro' => ''
+        'line_nr' => 22
       }
     },
     {
@@ -509,8 +497,7 @@ $result_trees{'contents_in_middle_chapter_inline'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_chapter.texi',
-        'line_nr' => 23,
-        'macro' => ''
+        'line_nr' => 23
       }
     },
     {
diff --git 
a/tp/t/results/html_tests/contents_in_middle_chapter_separate_element.pl 
b/tp/t/results/html_tests/contents_in_middle_chapter_separate_element.pl
index 22cb53804b..42a0422806 100644
--- a/tp/t/results/html_tests/contents_in_middle_chapter_separate_element.pl
+++ b/tp/t/results/html_tests/contents_in_middle_chapter_separate_element.pl
@@ -59,8 +59,7 @@ $result_trees{'contents_in_middle_chapter_separate_element'} 
= {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_chapter.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -158,8 +157,7 @@ 
$result_trees{'contents_in_middle_chapter_separate_element'} = {
               ],
               'source_info' => {
                 'file_name' => 'contents_in_middle_chapter.texi',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -191,15 +189,13 @@ 
$result_trees{'contents_in_middle_chapter_separate_element'} = {
               },
               'source_info' => {
                 'file_name' => 'contents_in_middle_chapter.texi',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
           'source_info' => {
             'file_name' => 'contents_in_middle_chapter.texi',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -216,8 +212,7 @@ 
$result_trees{'contents_in_middle_chapter_separate_element'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_chapter.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -249,8 +244,7 @@ 
$result_trees{'contents_in_middle_chapter_separate_element'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_chapter.texi',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -297,8 +291,7 @@ 
$result_trees{'contents_in_middle_chapter_separate_element'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'contents_in_middle_chapter.texi',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           }
         },
         {
@@ -363,8 +356,7 @@ 
$result_trees{'contents_in_middle_chapter_separate_element'} = {
               ],
               'source_info' => {
                 'file_name' => 'contents_in_middle_chapter.texi',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               },
               'type' => 'menu_entry'
             },
@@ -396,15 +388,13 @@ 
$result_trees{'contents_in_middle_chapter_separate_element'} = {
               },
               'source_info' => {
                 'file_name' => 'contents_in_middle_chapter.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             }
           ],
           'source_info' => {
             'file_name' => 'contents_in_middle_chapter.texi',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           }
         },
         {
@@ -423,8 +413,7 @@ 
$result_trees{'contents_in_middle_chapter_separate_element'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_chapter.texi',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -456,8 +445,7 @@ 
$result_trees{'contents_in_middle_chapter_separate_element'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_chapter.texi',
-        'line_nr' => 22,
-        'macro' => ''
+        'line_nr' => 22
       }
     },
     {
@@ -509,8 +497,7 @@ 
$result_trees{'contents_in_middle_chapter_separate_element'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_chapter.texi',
-        'line_nr' => 23,
-        'macro' => ''
+        'line_nr' => 23
       }
     },
     {
diff --git a/tp/t/results/html_tests/contents_in_middle_section.pl 
b/tp/t/results/html_tests/contents_in_middle_section.pl
index ba0ebdb1c6..6305243535 100644
--- a/tp/t/results/html_tests/contents_in_middle_section.pl
+++ b/tp/t/results/html_tests/contents_in_middle_section.pl
@@ -59,8 +59,7 @@ $result_trees{'contents_in_middle_section'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_section.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -158,8 +157,7 @@ $result_trees{'contents_in_middle_section'} = {
               ],
               'source_info' => {
                 'file_name' => 'contents_in_middle_section.texi',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -191,15 +189,13 @@ $result_trees{'contents_in_middle_section'} = {
               },
               'source_info' => {
                 'file_name' => 'contents_in_middle_section.texi',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
           'source_info' => {
             'file_name' => 'contents_in_middle_section.texi',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -216,8 +212,7 @@ $result_trees{'contents_in_middle_section'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_section.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -249,8 +244,7 @@ $result_trees{'contents_in_middle_section'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_section.texi',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -339,8 +333,7 @@ $result_trees{'contents_in_middle_section'} = {
               ],
               'source_info' => {
                 'file_name' => 'contents_in_middle_section.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               },
               'type' => 'menu_entry'
             },
@@ -387,8 +380,7 @@ $result_trees{'contents_in_middle_section'} = {
               ],
               'source_info' => {
                 'file_name' => 'contents_in_middle_section.texi',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               },
               'type' => 'menu_entry'
             },
@@ -420,15 +412,13 @@ $result_trees{'contents_in_middle_section'} = {
               },
               'source_info' => {
                 'file_name' => 'contents_in_middle_section.texi',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             }
           ],
           'source_info' => {
             'file_name' => 'contents_in_middle_section.texi',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           }
         },
         {
@@ -447,8 +437,7 @@ $result_trees{'contents_in_middle_section'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_section.texi',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -480,8 +469,7 @@ $result_trees{'contents_in_middle_section'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_section.texi',
-        'line_nr' => 21,
-        'macro' => ''
+        'line_nr' => 21
       }
     },
     {
@@ -528,8 +516,7 @@ $result_trees{'contents_in_middle_section'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'contents_in_middle_section.texi',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           }
         },
         {
@@ -548,8 +535,7 @@ $result_trees{'contents_in_middle_section'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_section.texi',
-        'line_nr' => 22,
-        'macro' => ''
+        'line_nr' => 22
       }
     },
     {
@@ -581,8 +567,7 @@ $result_trees{'contents_in_middle_section'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_section.texi',
-        'line_nr' => 27,
-        'macro' => ''
+        'line_nr' => 27
       }
     },
     {
@@ -634,8 +619,7 @@ $result_trees{'contents_in_middle_section'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_section.texi',
-        'line_nr' => 28,
-        'macro' => ''
+        'line_nr' => 28
       }
     },
     {
diff --git a/tp/t/results/html_tests/contents_in_middle_section_inline.pl 
b/tp/t/results/html_tests/contents_in_middle_section_inline.pl
index 70dd72ca4e..33699b44d4 100644
--- a/tp/t/results/html_tests/contents_in_middle_section_inline.pl
+++ b/tp/t/results/html_tests/contents_in_middle_section_inline.pl
@@ -59,8 +59,7 @@ $result_trees{'contents_in_middle_section_inline'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_section.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -158,8 +157,7 @@ $result_trees{'contents_in_middle_section_inline'} = {
               ],
               'source_info' => {
                 'file_name' => 'contents_in_middle_section.texi',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -191,15 +189,13 @@ $result_trees{'contents_in_middle_section_inline'} = {
               },
               'source_info' => {
                 'file_name' => 'contents_in_middle_section.texi',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
           'source_info' => {
             'file_name' => 'contents_in_middle_section.texi',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -216,8 +212,7 @@ $result_trees{'contents_in_middle_section_inline'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_section.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -249,8 +244,7 @@ $result_trees{'contents_in_middle_section_inline'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_section.texi',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -339,8 +333,7 @@ $result_trees{'contents_in_middle_section_inline'} = {
               ],
               'source_info' => {
                 'file_name' => 'contents_in_middle_section.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               },
               'type' => 'menu_entry'
             },
@@ -387,8 +380,7 @@ $result_trees{'contents_in_middle_section_inline'} = {
               ],
               'source_info' => {
                 'file_name' => 'contents_in_middle_section.texi',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               },
               'type' => 'menu_entry'
             },
@@ -420,15 +412,13 @@ $result_trees{'contents_in_middle_section_inline'} = {
               },
               'source_info' => {
                 'file_name' => 'contents_in_middle_section.texi',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             }
           ],
           'source_info' => {
             'file_name' => 'contents_in_middle_section.texi',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           }
         },
         {
@@ -447,8 +437,7 @@ $result_trees{'contents_in_middle_section_inline'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_section.texi',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -480,8 +469,7 @@ $result_trees{'contents_in_middle_section_inline'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_section.texi',
-        'line_nr' => 21,
-        'macro' => ''
+        'line_nr' => 21
       }
     },
     {
@@ -528,8 +516,7 @@ $result_trees{'contents_in_middle_section_inline'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'contents_in_middle_section.texi',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           }
         },
         {
@@ -548,8 +535,7 @@ $result_trees{'contents_in_middle_section_inline'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_section.texi',
-        'line_nr' => 22,
-        'macro' => ''
+        'line_nr' => 22
       }
     },
     {
@@ -581,8 +567,7 @@ $result_trees{'contents_in_middle_section_inline'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_section.texi',
-        'line_nr' => 27,
-        'macro' => ''
+        'line_nr' => 27
       }
     },
     {
@@ -634,8 +619,7 @@ $result_trees{'contents_in_middle_section_inline'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_section.texi',
-        'line_nr' => 28,
-        'macro' => ''
+        'line_nr' => 28
       }
     },
     {
diff --git 
a/tp/t/results/html_tests/contents_in_middle_section_separate_element.pl 
b/tp/t/results/html_tests/contents_in_middle_section_separate_element.pl
index da13287a32..06be6dcd10 100644
--- a/tp/t/results/html_tests/contents_in_middle_section_separate_element.pl
+++ b/tp/t/results/html_tests/contents_in_middle_section_separate_element.pl
@@ -59,8 +59,7 @@ $result_trees{'contents_in_middle_section_separate_element'} 
= {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_section.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -158,8 +157,7 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
               ],
               'source_info' => {
                 'file_name' => 'contents_in_middle_section.texi',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -191,15 +189,13 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
               },
               'source_info' => {
                 'file_name' => 'contents_in_middle_section.texi',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
           'source_info' => {
             'file_name' => 'contents_in_middle_section.texi',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -216,8 +212,7 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_section.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -249,8 +244,7 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_section.texi',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -339,8 +333,7 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
               ],
               'source_info' => {
                 'file_name' => 'contents_in_middle_section.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               },
               'type' => 'menu_entry'
             },
@@ -387,8 +380,7 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
               ],
               'source_info' => {
                 'file_name' => 'contents_in_middle_section.texi',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               },
               'type' => 'menu_entry'
             },
@@ -420,15 +412,13 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
               },
               'source_info' => {
                 'file_name' => 'contents_in_middle_section.texi',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             }
           ],
           'source_info' => {
             'file_name' => 'contents_in_middle_section.texi',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           }
         },
         {
@@ -447,8 +437,7 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_section.texi',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -480,8 +469,7 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_section.texi',
-        'line_nr' => 21,
-        'macro' => ''
+        'line_nr' => 21
       }
     },
     {
@@ -528,8 +516,7 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'contents_in_middle_section.texi',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           }
         },
         {
@@ -548,8 +535,7 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_section.texi',
-        'line_nr' => 22,
-        'macro' => ''
+        'line_nr' => 22
       }
     },
     {
@@ -581,8 +567,7 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_section.texi',
-        'line_nr' => 27,
-        'macro' => ''
+        'line_nr' => 27
       }
     },
     {
@@ -634,8 +619,7 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
       },
       'source_info' => {
         'file_name' => 'contents_in_middle_section.texi',
-        'line_nr' => 28,
-        'macro' => ''
+        'line_nr' => 28
       }
     },
     {
diff --git a/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl 
b/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
index ea9c9142bb..2d047c5905 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
@@ -102,8 +102,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   },
                   'type' => 'def_line'
                 },
@@ -149,8 +148,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 }
               ],
@@ -161,8 +159,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -193,15 +190,13 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -220,8 +215,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -259,8 +253,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -279,8 +272,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -320,8 +312,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -357,8 +348,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -390,8 +380,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 16,
-        'macro' => ''
+        'line_nr' => 16
       }
     },
     {
@@ -497,8 +486,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               },
               'type' => 'def_line'
             },
@@ -544,8 +532,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             }
           ],
@@ -556,8 +543,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         },
         {
@@ -576,8 +562,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     }
   ],
diff --git a/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl 
b/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
index c8ef6c3835..fe01d17465 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
@@ -44,8 +44,7 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -146,8 +145,7 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   },
                   'type' => 'def_line'
                 },
@@ -193,8 +191,7 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
@@ -205,8 +202,7 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -237,15 +233,13 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -285,8 +279,7 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -322,8 +315,7 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -355,8 +347,7 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -462,8 +453,7 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               },
               'type' => 'def_line'
             },
@@ -509,8 +499,7 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             }
           ],
@@ -521,8 +510,7 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           }
         },
         {
@@ -541,8 +529,7 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     }
   ],
diff --git a/tp/t/results/html_tests/documentdescription.pl 
b/tp/t/results/html_tests/documentdescription.pl
index 554b6de11a..ea77f2c22b 100644
--- a/tp/t/results/html_tests/documentdescription.pl
+++ b/tp/t/results/html_tests/documentdescription.pl
@@ -42,8 +42,7 @@ $result_trees{'documentdescription'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   }
                 },
                 {
@@ -58,8 +57,7 @@ $result_trees{'documentdescription'} = {
                   'cmdname' => 'bullet',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   }
                 },
                 {
@@ -74,8 +72,7 @@ $result_trees{'documentdescription'} = {
                   'cmdname' => 'enddots',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   }
                 },
                 {
@@ -99,8 +96,7 @@ $result_trees{'documentdescription'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   }
                 },
                 {
@@ -115,8 +111,7 @@ $result_trees{'documentdescription'} = {
                   'cmdname' => 'aa',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   }
                 },
                 {
@@ -140,8 +135,7 @@ $result_trees{'documentdescription'} = {
                           'cmdname' => 'dotless',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 2,
-                            'macro' => ''
+                            'line_nr' => 2
                           }
                         }
                       ],
@@ -151,8 +145,7 @@ $result_trees{'documentdescription'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   }
                 },
                 {
@@ -176,8 +169,7 @@ $result_trees{'documentdescription'} = {
                           'cmdname' => 'code',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 2,
-                            'macro' => ''
+                            'line_nr' => 2
                           }
                         },
                         {
@@ -190,8 +182,7 @@ $result_trees{'documentdescription'} = {
                   'cmdname' => 'email',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   }
                 },
                 {
@@ -229,15 +220,13 @@ $result_trees{'documentdescription'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -274,8 +263,7 @@ $result_trees{'documentdescription'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
diff --git a/tp/t/results/html_tests/double_contents.pl 
b/tp/t/results/html_tests/double_contents.pl
index 0766302858..1e5bcfdf06 100644
--- a/tp/t/results/html_tests/double_contents.pl
+++ b/tp/t/results/html_tests/double_contents.pl
@@ -37,8 +37,7 @@ $result_trees{'double_contents'} = {
               'cmdname' => 'contents',
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -81,8 +80,7 @@ $result_trees{'double_contents'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -180,8 +178,7 @@ $result_trees{'double_contents'} = {
               ],
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -213,15 +210,13 @@ $result_trees{'double_contents'} = {
               },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -238,8 +233,7 @@ $result_trees{'double_contents'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -271,8 +265,7 @@ $result_trees{'double_contents'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -310,8 +303,7 @@ $result_trees{'double_contents'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -385,8 +377,7 @@ $result_trees{'double_contents'} = {
               ],
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               },
               'type' => 'menu_entry'
             },
@@ -418,15 +409,13 @@ $result_trees{'double_contents'} = {
               },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           ],
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
@@ -445,8 +434,7 @@ $result_trees{'double_contents'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -478,8 +466,7 @@ $result_trees{'double_contents'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     {
@@ -512,8 +499,7 @@ $result_trees{'double_contents'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         },
         {
@@ -532,8 +518,7 @@ $result_trees{'double_contents'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
diff --git a/tp/t/results/html_tests/double_contents_after_title.pl 
b/tp/t/results/html_tests/double_contents_after_title.pl
index 86816e0786..2ef4649736 100644
--- a/tp/t/results/html_tests/double_contents_after_title.pl
+++ b/tp/t/results/html_tests/double_contents_after_title.pl
@@ -37,8 +37,7 @@ $result_trees{'double_contents_after_title'} = {
               'cmdname' => 'contents',
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -81,8 +80,7 @@ $result_trees{'double_contents_after_title'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -180,8 +178,7 @@ $result_trees{'double_contents_after_title'} = {
               ],
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -213,15 +210,13 @@ $result_trees{'double_contents_after_title'} = {
               },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -238,8 +233,7 @@ $result_trees{'double_contents_after_title'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -271,8 +265,7 @@ $result_trees{'double_contents_after_title'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -310,8 +303,7 @@ $result_trees{'double_contents_after_title'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -385,8 +377,7 @@ $result_trees{'double_contents_after_title'} = {
               ],
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               },
               'type' => 'menu_entry'
             },
@@ -418,15 +409,13 @@ $result_trees{'double_contents_after_title'} = {
               },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           ],
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
@@ -445,8 +434,7 @@ $result_trees{'double_contents_after_title'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -478,8 +466,7 @@ $result_trees{'double_contents_after_title'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     {
@@ -512,8 +499,7 @@ $result_trees{'double_contents_after_title'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         },
         {
@@ -532,8 +518,7 @@ $result_trees{'double_contents_after_title'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
diff --git a/tp/t/results/html_tests/double_contents_after_title_show_title.pl 
b/tp/t/results/html_tests/double_contents_after_title_show_title.pl
index 067c9ab5fe..36b0865fb8 100644
--- a/tp/t/results/html_tests/double_contents_after_title_show_title.pl
+++ b/tp/t/results/html_tests/double_contents_after_title_show_title.pl
@@ -37,8 +37,7 @@ $result_trees{'double_contents_after_title_show_title'} = {
               'cmdname' => 'contents',
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -81,8 +80,7 @@ $result_trees{'double_contents_after_title_show_title'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -180,8 +178,7 @@ $result_trees{'double_contents_after_title_show_title'} = {
               ],
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -213,15 +210,13 @@ $result_trees{'double_contents_after_title_show_title'} = 
{
               },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -238,8 +233,7 @@ $result_trees{'double_contents_after_title_show_title'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -271,8 +265,7 @@ $result_trees{'double_contents_after_title_show_title'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -310,8 +303,7 @@ $result_trees{'double_contents_after_title_show_title'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -385,8 +377,7 @@ $result_trees{'double_contents_after_title_show_title'} = {
               ],
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               },
               'type' => 'menu_entry'
             },
@@ -418,15 +409,13 @@ $result_trees{'double_contents_after_title_show_title'} = 
{
               },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           ],
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
@@ -445,8 +434,7 @@ $result_trees{'double_contents_after_title_show_title'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -478,8 +466,7 @@ $result_trees{'double_contents_after_title_show_title'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     {
@@ -512,8 +499,7 @@ $result_trees{'double_contents_after_title_show_title'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         },
         {
@@ -532,8 +518,7 @@ $result_trees{'double_contents_after_title_show_title'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
diff --git 
a/tp/t/results/html_tests/double_contents_after_title_show_title_nodes.pl 
b/tp/t/results/html_tests/double_contents_after_title_show_title_nodes.pl
index 01d6d3a49f..2133cefda2 100644
--- a/tp/t/results/html_tests/double_contents_after_title_show_title_nodes.pl
+++ b/tp/t/results/html_tests/double_contents_after_title_show_title_nodes.pl
@@ -37,8 +37,7 @@ $result_trees{'double_contents_after_title_show_title_nodes'} 
= {
               'cmdname' => 'contents',
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -81,8 +80,7 @@ $result_trees{'double_contents_after_title_show_title_nodes'} 
= {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -180,8 +178,7 @@ 
$result_trees{'double_contents_after_title_show_title_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -213,15 +210,13 @@ 
$result_trees{'double_contents_after_title_show_title_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -238,8 +233,7 @@ 
$result_trees{'double_contents_after_title_show_title_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -271,8 +265,7 @@ 
$result_trees{'double_contents_after_title_show_title_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -310,8 +303,7 @@ 
$result_trees{'double_contents_after_title_show_title_nodes'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -385,8 +377,7 @@ 
$result_trees{'double_contents_after_title_show_title_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               },
               'type' => 'menu_entry'
             },
@@ -418,15 +409,13 @@ 
$result_trees{'double_contents_after_title_show_title_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           ],
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
@@ -445,8 +434,7 @@ 
$result_trees{'double_contents_after_title_show_title_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -478,8 +466,7 @@ 
$result_trees{'double_contents_after_title_show_title_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     {
@@ -512,8 +499,7 @@ 
$result_trees{'double_contents_after_title_show_title_nodes'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         },
         {
@@ -532,8 +518,7 @@ 
$result_trees{'double_contents_after_title_show_title_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
diff --git a/tp/t/results/html_tests/double_contents_book.pl 
b/tp/t/results/html_tests/double_contents_book.pl
index 810c71cd2f..351f7ff37a 100644
--- a/tp/t/results/html_tests/double_contents_book.pl
+++ b/tp/t/results/html_tests/double_contents_book.pl
@@ -37,8 +37,7 @@ $result_trees{'double_contents_book'} = {
               'cmdname' => 'contents',
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -81,8 +80,7 @@ $result_trees{'double_contents_book'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -180,8 +178,7 @@ $result_trees{'double_contents_book'} = {
               ],
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -213,15 +210,13 @@ $result_trees{'double_contents_book'} = {
               },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -238,8 +233,7 @@ $result_trees{'double_contents_book'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -271,8 +265,7 @@ $result_trees{'double_contents_book'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -310,8 +303,7 @@ $result_trees{'double_contents_book'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -385,8 +377,7 @@ $result_trees{'double_contents_book'} = {
               ],
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               },
               'type' => 'menu_entry'
             },
@@ -418,15 +409,13 @@ $result_trees{'double_contents_book'} = {
               },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           ],
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
@@ -445,8 +434,7 @@ $result_trees{'double_contents_book'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -478,8 +466,7 @@ $result_trees{'double_contents_book'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     {
@@ -512,8 +499,7 @@ $result_trees{'double_contents_book'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         },
         {
@@ -532,8 +518,7 @@ $result_trees{'double_contents_book'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
diff --git a/tp/t/results/html_tests/double_contents_chapter.pl 
b/tp/t/results/html_tests/double_contents_chapter.pl
index 6a9c754e96..fb6a6ea2ef 100644
--- a/tp/t/results/html_tests/double_contents_chapter.pl
+++ b/tp/t/results/html_tests/double_contents_chapter.pl
@@ -37,8 +37,7 @@ $result_trees{'double_contents_chapter'} = {
               'cmdname' => 'contents',
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -81,8 +80,7 @@ $result_trees{'double_contents_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -180,8 +178,7 @@ $result_trees{'double_contents_chapter'} = {
               ],
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -213,15 +210,13 @@ $result_trees{'double_contents_chapter'} = {
               },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -238,8 +233,7 @@ $result_trees{'double_contents_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -271,8 +265,7 @@ $result_trees{'double_contents_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -310,8 +303,7 @@ $result_trees{'double_contents_chapter'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -385,8 +377,7 @@ $result_trees{'double_contents_chapter'} = {
               ],
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               },
               'type' => 'menu_entry'
             },
@@ -418,15 +409,13 @@ $result_trees{'double_contents_chapter'} = {
               },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           ],
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
@@ -445,8 +434,7 @@ $result_trees{'double_contents_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -478,8 +466,7 @@ $result_trees{'double_contents_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     {
@@ -512,8 +499,7 @@ $result_trees{'double_contents_chapter'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         },
         {
@@ -532,8 +518,7 @@ $result_trees{'double_contents_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
diff --git a/tp/t/results/html_tests/double_contents_inline.pl 
b/tp/t/results/html_tests/double_contents_inline.pl
index 7093deb090..bbc88dc2cc 100644
--- a/tp/t/results/html_tests/double_contents_inline.pl
+++ b/tp/t/results/html_tests/double_contents_inline.pl
@@ -37,8 +37,7 @@ $result_trees{'double_contents_inline'} = {
               'cmdname' => 'contents',
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -81,8 +80,7 @@ $result_trees{'double_contents_inline'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -180,8 +178,7 @@ $result_trees{'double_contents_inline'} = {
               ],
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -213,15 +210,13 @@ $result_trees{'double_contents_inline'} = {
               },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -238,8 +233,7 @@ $result_trees{'double_contents_inline'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -271,8 +265,7 @@ $result_trees{'double_contents_inline'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -310,8 +303,7 @@ $result_trees{'double_contents_inline'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -385,8 +377,7 @@ $result_trees{'double_contents_inline'} = {
               ],
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               },
               'type' => 'menu_entry'
             },
@@ -418,15 +409,13 @@ $result_trees{'double_contents_inline'} = {
               },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           ],
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
@@ -445,8 +434,7 @@ $result_trees{'double_contents_inline'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -478,8 +466,7 @@ $result_trees{'double_contents_inline'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     {
@@ -512,8 +499,7 @@ $result_trees{'double_contents_inline'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         },
         {
@@ -532,8 +518,7 @@ $result_trees{'double_contents_inline'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
diff --git a/tp/t/results/html_tests/double_contents_inline_chapter.pl 
b/tp/t/results/html_tests/double_contents_inline_chapter.pl
index 7a03345f40..759d12fda3 100644
--- a/tp/t/results/html_tests/double_contents_inline_chapter.pl
+++ b/tp/t/results/html_tests/double_contents_inline_chapter.pl
@@ -37,8 +37,7 @@ $result_trees{'double_contents_inline_chapter'} = {
               'cmdname' => 'contents',
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -81,8 +80,7 @@ $result_trees{'double_contents_inline_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -180,8 +178,7 @@ $result_trees{'double_contents_inline_chapter'} = {
               ],
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -213,15 +210,13 @@ $result_trees{'double_contents_inline_chapter'} = {
               },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -238,8 +233,7 @@ $result_trees{'double_contents_inline_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -271,8 +265,7 @@ $result_trees{'double_contents_inline_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -310,8 +303,7 @@ $result_trees{'double_contents_inline_chapter'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -385,8 +377,7 @@ $result_trees{'double_contents_inline_chapter'} = {
               ],
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               },
               'type' => 'menu_entry'
             },
@@ -418,15 +409,13 @@ $result_trees{'double_contents_inline_chapter'} = {
               },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           ],
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
@@ -445,8 +434,7 @@ $result_trees{'double_contents_inline_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -478,8 +466,7 @@ $result_trees{'double_contents_inline_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     {
@@ -512,8 +499,7 @@ $result_trees{'double_contents_inline_chapter'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         },
         {
@@ -532,8 +518,7 @@ $result_trees{'double_contents_inline_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
diff --git a/tp/t/results/html_tests/double_contents_inline_nodes.pl 
b/tp/t/results/html_tests/double_contents_inline_nodes.pl
index 38ff0fb700..8127fe372d 100644
--- a/tp/t/results/html_tests/double_contents_inline_nodes.pl
+++ b/tp/t/results/html_tests/double_contents_inline_nodes.pl
@@ -37,8 +37,7 @@ $result_trees{'double_contents_inline_nodes'} = {
               'cmdname' => 'contents',
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -81,8 +80,7 @@ $result_trees{'double_contents_inline_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -180,8 +178,7 @@ $result_trees{'double_contents_inline_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -213,15 +210,13 @@ $result_trees{'double_contents_inline_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -238,8 +233,7 @@ $result_trees{'double_contents_inline_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -271,8 +265,7 @@ $result_trees{'double_contents_inline_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -310,8 +303,7 @@ $result_trees{'double_contents_inline_nodes'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -385,8 +377,7 @@ $result_trees{'double_contents_inline_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               },
               'type' => 'menu_entry'
             },
@@ -418,15 +409,13 @@ $result_trees{'double_contents_inline_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           ],
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
@@ -445,8 +434,7 @@ $result_trees{'double_contents_inline_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -478,8 +466,7 @@ $result_trees{'double_contents_inline_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     {
@@ -512,8 +499,7 @@ $result_trees{'double_contents_inline_nodes'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         },
         {
@@ -532,8 +518,7 @@ $result_trees{'double_contents_inline_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
diff --git a/tp/t/results/html_tests/double_contents_inline_section.pl 
b/tp/t/results/html_tests/double_contents_inline_section.pl
index 59fd2588ac..1d5f69479c 100644
--- a/tp/t/results/html_tests/double_contents_inline_section.pl
+++ b/tp/t/results/html_tests/double_contents_inline_section.pl
@@ -37,8 +37,7 @@ $result_trees{'double_contents_inline_section'} = {
               'cmdname' => 'contents',
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -81,8 +80,7 @@ $result_trees{'double_contents_inline_section'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -180,8 +178,7 @@ $result_trees{'double_contents_inline_section'} = {
               ],
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -213,15 +210,13 @@ $result_trees{'double_contents_inline_section'} = {
               },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -238,8 +233,7 @@ $result_trees{'double_contents_inline_section'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -271,8 +265,7 @@ $result_trees{'double_contents_inline_section'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -310,8 +303,7 @@ $result_trees{'double_contents_inline_section'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -385,8 +377,7 @@ $result_trees{'double_contents_inline_section'} = {
               ],
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               },
               'type' => 'menu_entry'
             },
@@ -418,15 +409,13 @@ $result_trees{'double_contents_inline_section'} = {
               },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           ],
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
@@ -445,8 +434,7 @@ $result_trees{'double_contents_inline_section'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -478,8 +466,7 @@ $result_trees{'double_contents_inline_section'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     {
@@ -512,8 +499,7 @@ $result_trees{'double_contents_inline_section'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         },
         {
@@ -532,8 +518,7 @@ $result_trees{'double_contents_inline_section'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
diff --git a/tp/t/results/html_tests/double_contents_nodes.pl 
b/tp/t/results/html_tests/double_contents_nodes.pl
index b24e652592..1a404a0985 100644
--- a/tp/t/results/html_tests/double_contents_nodes.pl
+++ b/tp/t/results/html_tests/double_contents_nodes.pl
@@ -37,8 +37,7 @@ $result_trees{'double_contents_nodes'} = {
               'cmdname' => 'contents',
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -81,8 +80,7 @@ $result_trees{'double_contents_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -180,8 +178,7 @@ $result_trees{'double_contents_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -213,15 +210,13 @@ $result_trees{'double_contents_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -238,8 +233,7 @@ $result_trees{'double_contents_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -271,8 +265,7 @@ $result_trees{'double_contents_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -310,8 +303,7 @@ $result_trees{'double_contents_nodes'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -385,8 +377,7 @@ $result_trees{'double_contents_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               },
               'type' => 'menu_entry'
             },
@@ -418,15 +409,13 @@ $result_trees{'double_contents_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           ],
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
@@ -445,8 +434,7 @@ $result_trees{'double_contents_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -478,8 +466,7 @@ $result_trees{'double_contents_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     {
@@ -512,8 +499,7 @@ $result_trees{'double_contents_nodes'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         },
         {
@@ -532,8 +518,7 @@ $result_trees{'double_contents_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
diff --git a/tp/t/results/html_tests/double_contents_section.pl 
b/tp/t/results/html_tests/double_contents_section.pl
index f1b0aac53d..89d3ed1f1b 100644
--- a/tp/t/results/html_tests/double_contents_section.pl
+++ b/tp/t/results/html_tests/double_contents_section.pl
@@ -37,8 +37,7 @@ $result_trees{'double_contents_section'} = {
               'cmdname' => 'contents',
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -81,8 +80,7 @@ $result_trees{'double_contents_section'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -180,8 +178,7 @@ $result_trees{'double_contents_section'} = {
               ],
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -213,15 +210,13 @@ $result_trees{'double_contents_section'} = {
               },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -238,8 +233,7 @@ $result_trees{'double_contents_section'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -271,8 +265,7 @@ $result_trees{'double_contents_section'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -310,8 +303,7 @@ $result_trees{'double_contents_section'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -385,8 +377,7 @@ $result_trees{'double_contents_section'} = {
               ],
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               },
               'type' => 'menu_entry'
             },
@@ -418,15 +409,13 @@ $result_trees{'double_contents_section'} = {
               },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           ],
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
@@ -445,8 +434,7 @@ $result_trees{'double_contents_section'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -478,8 +466,7 @@ $result_trees{'double_contents_section'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     {
@@ -512,8 +499,7 @@ $result_trees{'double_contents_section'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         },
         {
@@ -532,8 +518,7 @@ $result_trees{'double_contents_section'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
diff --git a/tp/t/results/html_tests/double_contents_separate_element.pl 
b/tp/t/results/html_tests/double_contents_separate_element.pl
index 29296dbdfc..d5756de361 100644
--- a/tp/t/results/html_tests/double_contents_separate_element.pl
+++ b/tp/t/results/html_tests/double_contents_separate_element.pl
@@ -37,8 +37,7 @@ $result_trees{'double_contents_separate_element'} = {
               'cmdname' => 'contents',
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -81,8 +80,7 @@ $result_trees{'double_contents_separate_element'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -180,8 +178,7 @@ $result_trees{'double_contents_separate_element'} = {
               ],
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -213,15 +210,13 @@ $result_trees{'double_contents_separate_element'} = {
               },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -238,8 +233,7 @@ $result_trees{'double_contents_separate_element'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -271,8 +265,7 @@ $result_trees{'double_contents_separate_element'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -310,8 +303,7 @@ $result_trees{'double_contents_separate_element'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -385,8 +377,7 @@ $result_trees{'double_contents_separate_element'} = {
               ],
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               },
               'type' => 'menu_entry'
             },
@@ -418,15 +409,13 @@ $result_trees{'double_contents_separate_element'} = {
               },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           ],
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
@@ -445,8 +434,7 @@ $result_trees{'double_contents_separate_element'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -478,8 +466,7 @@ $result_trees{'double_contents_separate_element'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     {
@@ -512,8 +499,7 @@ $result_trees{'double_contents_separate_element'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         },
         {
@@ -532,8 +518,7 @@ $result_trees{'double_contents_separate_element'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
diff --git 
a/tp/t/results/html_tests/double_contents_separate_element_chapter.pl 
b/tp/t/results/html_tests/double_contents_separate_element_chapter.pl
index f87886da22..2ca16254fe 100644
--- a/tp/t/results/html_tests/double_contents_separate_element_chapter.pl
+++ b/tp/t/results/html_tests/double_contents_separate_element_chapter.pl
@@ -37,8 +37,7 @@ $result_trees{'double_contents_separate_element_chapter'} = {
               'cmdname' => 'contents',
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -81,8 +80,7 @@ $result_trees{'double_contents_separate_element_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -180,8 +178,7 @@ $result_trees{'double_contents_separate_element_chapter'} = 
{
               ],
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -213,15 +210,13 @@ $result_trees{'double_contents_separate_element_chapter'} 
= {
               },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -238,8 +233,7 @@ $result_trees{'double_contents_separate_element_chapter'} = 
{
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -271,8 +265,7 @@ $result_trees{'double_contents_separate_element_chapter'} = 
{
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -310,8 +303,7 @@ $result_trees{'double_contents_separate_element_chapter'} = 
{
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -385,8 +377,7 @@ $result_trees{'double_contents_separate_element_chapter'} = 
{
               ],
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               },
               'type' => 'menu_entry'
             },
@@ -418,15 +409,13 @@ $result_trees{'double_contents_separate_element_chapter'} 
= {
               },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           ],
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
@@ -445,8 +434,7 @@ $result_trees{'double_contents_separate_element_chapter'} = 
{
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -478,8 +466,7 @@ $result_trees{'double_contents_separate_element_chapter'} = 
{
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     {
@@ -512,8 +499,7 @@ $result_trees{'double_contents_separate_element_chapter'} = 
{
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         },
         {
@@ -532,8 +518,7 @@ $result_trees{'double_contents_separate_element_chapter'} = 
{
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
diff --git a/tp/t/results/html_tests/double_contents_separate_element_nodes.pl 
b/tp/t/results/html_tests/double_contents_separate_element_nodes.pl
index a26d285466..ccc65b7ec1 100644
--- a/tp/t/results/html_tests/double_contents_separate_element_nodes.pl
+++ b/tp/t/results/html_tests/double_contents_separate_element_nodes.pl
@@ -37,8 +37,7 @@ $result_trees{'double_contents_separate_element_nodes'} = {
               'cmdname' => 'contents',
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -81,8 +80,7 @@ $result_trees{'double_contents_separate_element_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -180,8 +178,7 @@ $result_trees{'double_contents_separate_element_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -213,15 +210,13 @@ $result_trees{'double_contents_separate_element_nodes'} = 
{
               },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -238,8 +233,7 @@ $result_trees{'double_contents_separate_element_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -271,8 +265,7 @@ $result_trees{'double_contents_separate_element_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -310,8 +303,7 @@ $result_trees{'double_contents_separate_element_nodes'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -385,8 +377,7 @@ $result_trees{'double_contents_separate_element_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               },
               'type' => 'menu_entry'
             },
@@ -418,15 +409,13 @@ $result_trees{'double_contents_separate_element_nodes'} = 
{
               },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           ],
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
@@ -445,8 +434,7 @@ $result_trees{'double_contents_separate_element_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -478,8 +466,7 @@ $result_trees{'double_contents_separate_element_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     {
@@ -512,8 +499,7 @@ $result_trees{'double_contents_separate_element_nodes'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         },
         {
@@ -532,8 +518,7 @@ $result_trees{'double_contents_separate_element_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
diff --git 
a/tp/t/results/html_tests/double_contents_separate_element_section.pl 
b/tp/t/results/html_tests/double_contents_separate_element_section.pl
index 160580f43d..06730eca8f 100644
--- a/tp/t/results/html_tests/double_contents_separate_element_section.pl
+++ b/tp/t/results/html_tests/double_contents_separate_element_section.pl
@@ -37,8 +37,7 @@ $result_trees{'double_contents_separate_element_section'} = {
               'cmdname' => 'contents',
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -81,8 +80,7 @@ $result_trees{'double_contents_separate_element_section'} = {
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -180,8 +178,7 @@ $result_trees{'double_contents_separate_element_section'} = 
{
               ],
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -213,15 +210,13 @@ $result_trees{'double_contents_separate_element_section'} 
= {
               },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -238,8 +233,7 @@ $result_trees{'double_contents_separate_element_section'} = 
{
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -271,8 +265,7 @@ $result_trees{'double_contents_separate_element_section'} = 
{
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -310,8 +303,7 @@ $result_trees{'double_contents_separate_element_section'} = 
{
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -385,8 +377,7 @@ $result_trees{'double_contents_separate_element_section'} = 
{
               ],
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               },
               'type' => 'menu_entry'
             },
@@ -418,15 +409,13 @@ $result_trees{'double_contents_separate_element_section'} 
= {
               },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           ],
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
@@ -445,8 +434,7 @@ $result_trees{'double_contents_separate_element_section'} = 
{
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -478,8 +466,7 @@ $result_trees{'double_contents_separate_element_section'} = 
{
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     {
@@ -512,8 +499,7 @@ $result_trees{'double_contents_separate_element_section'} = 
{
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'double_contents.texi',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         },
         {
@@ -532,8 +518,7 @@ $result_trees{'double_contents_separate_element_section'} = 
{
       },
       'source_info' => {
         'file_name' => 'double_contents.texi',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
diff --git a/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl 
b/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
index eafbf5de9f..0d4fd12596 100644
--- a/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
+++ b/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
@@ -81,8 +81,7 @@ $result_trees{'empty_lines_at_beginning_no_setfilename'} = {
       },
       'source_info' => {
         'file_name' => 'empty_lines_at_beginning_no_setfilename.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -118,8 +117,7 @@ $result_trees{'empty_lines_at_beginning_no_setfilename'} = {
       },
       'source_info' => {
         'file_name' => 'empty_lines_at_beginning_no_setfilename.texi',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
diff --git 
a/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename_no_element.pl 
b/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename_no_element.pl
index ed1de95153..1e81236b64 100644
--- 
a/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename_no_element.pl
+++ 
b/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename_no_element.pl
@@ -57,8 +57,7 @@ 
$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'} = {
           },
           'source_info' => {
             'file_name' => 
'empty_lines_at_beginning_no_setfilename_no_element.texi',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
diff --git a/tp/t/results/html_tests/empty_titlefont.pl 
b/tp/t/results/html_tests/empty_titlefont.pl
index 67c9e5dfd6..7de702e04b 100644
--- a/tp/t/results/html_tests/empty_titlefont.pl
+++ b/tp/t/results/html_tests/empty_titlefont.pl
@@ -23,8 +23,7 @@ $result_trees{'empty_titlefont'} = {
           'cmdname' => 'titlefont',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
diff --git 
a/tp/t/results/html_tests/file_name_case_insensitive_conflict_node.pl 
b/tp/t/results/html_tests/file_name_case_insensitive_conflict_node.pl
index 844a4bf36f..4e4ce00186 100644
--- a/tp/t/results/html_tests/file_name_case_insensitive_conflict_node.pl
+++ b/tp/t/results/html_tests/file_name_case_insensitive_conflict_node.pl
@@ -44,8 +44,7 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -81,8 +80,7 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -114,8 +112,7 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = 
{
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -160,8 +157,7 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = 
{
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -185,8 +181,7 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = 
{
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -218,8 +213,7 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = 
{
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -257,8 +251,7 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = 
{
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -290,8 +283,7 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = 
{
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -329,8 +321,7 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = 
{
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -362,8 +353,7 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = 
{
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -414,8 +404,7 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = 
{
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -454,8 +443,7 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = 
{
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -476,8 +464,7 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = 
{
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 16,
-        'macro' => ''
+        'line_nr' => 16
       }
     }
   ],
@@ -766,7 +753,6 @@ 
$result_converted_errors{'file_html'}->{'file_name_case_insensitive_conflict_nod
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '@anchor `fOO\' file Foo.html for redirection exists',
     'type' => 'warning'
   },
@@ -776,7 +762,6 @@ 
$result_converted_errors{'file_html'}->{'file_name_case_insensitive_conflict_nod
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'conflict with @node `Foo\' file',
     'type' => 'warning'
   },
@@ -785,7 +770,6 @@ 
$result_converted_errors{'file_html'}->{'file_name_case_insensitive_conflict_nod
 ',
     'file_name' => '',
     'line_nr' => 15,
-    'macro' => '',
     'text' => '@node `foo\' file Foo.html for redirection exists',
     'type' => 'warning'
   },
@@ -795,7 +779,6 @@ 
$result_converted_errors{'file_html'}->{'file_name_case_insensitive_conflict_nod
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'conflict with @node `Foo\' file',
     'type' => 'warning'
   }
diff --git 
a/tp/t/results/html_tests/file_name_case_insensitive_conflict_node_no_redirections.pl
 
b/tp/t/results/html_tests/file_name_case_insensitive_conflict_node_no_redirections.pl
index 0500b9bb9c..961fd98d91 100644
--- 
a/tp/t/results/html_tests/file_name_case_insensitive_conflict_node_no_redirections.pl
+++ 
b/tp/t/results/html_tests/file_name_case_insensitive_conflict_node_no_redirections.pl
@@ -44,8 +44,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -81,8 +80,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -114,8 +112,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -160,8 +157,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -185,8 +181,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -218,8 +213,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -257,8 +251,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -290,8 +283,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -329,8 +321,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -362,8 +353,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -414,8 +404,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -454,8 +443,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -476,8 +464,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 16,
-        'macro' => ''
+        'line_nr' => 16
       }
     }
   ],
diff --git 
a/tp/t/results/html_tests/file_name_case_insensitive_conflict_redirections.pl 
b/tp/t/results/html_tests/file_name_case_insensitive_conflict_redirections.pl
index fb2a2a8b2a..1ef466cdb0 100644
--- 
a/tp/t/results/html_tests/file_name_case_insensitive_conflict_redirections.pl
+++ 
b/tp/t/results/html_tests/file_name_case_insensitive_conflict_redirections.pl
@@ -44,8 +44,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -81,8 +80,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -117,8 +115,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   },
                   'type' => 'command_as_argument'
                 }
@@ -173,8 +170,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     }
                   ],
@@ -200,8 +196,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -228,8 +223,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
                           'cmdname' => 'samp',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 10,
-                            'macro' => ''
+                            'line_nr' => 10
                           }
                         },
                         {
@@ -279,8 +273,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     }
                   ],
@@ -306,8 +299,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     },
                     {
@@ -334,8 +326,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
                           'cmdname' => 'samp',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 14,
-                            'macro' => ''
+                            'line_nr' => 14
                           }
                         },
                         {
@@ -384,8 +375,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
@@ -399,8 +389,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -432,8 +421,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -472,8 +460,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -494,8 +481,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     }
   ],
@@ -622,7 +608,6 @@ 
$result_converted_errors{'file_html'}->{'file_name_case_insensitive_conflict_red
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@anchor `foo\' file Foo.html for redirection exists',
     'type' => 'warning'
   },
@@ -632,7 +617,6 @@ 
$result_converted_errors{'file_html'}->{'file_name_case_insensitive_conflict_red
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => 'conflict with @anchor `Foo\' redirection file',
     'type' => 'warning'
   }
diff --git a/tp/t/results/html_tests/file_name_conflict_with_Top.pl 
b/tp/t/results/html_tests/file_name_conflict_with_Top.pl
index 84ae10d4c3..033c4cbbea 100644
--- a/tp/t/results/html_tests/file_name_conflict_with_Top.pl
+++ b/tp/t/results/html_tests/file_name_conflict_with_Top.pl
@@ -44,8 +44,7 @@ $result_trees{'file_name_conflict_with_Top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -81,8 +80,7 @@ $result_trees{'file_name_conflict_with_Top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -114,8 +112,7 @@ $result_trees{'file_name_conflict_with_Top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -160,8 +157,7 @@ $result_trees{'file_name_conflict_with_Top'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -180,8 +176,7 @@ $result_trees{'file_name_conflict_with_Top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
@@ -314,7 +309,6 @@ 
$result_converted_errors{'file_html'}->{'file_name_conflict_with_Top'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '@anchor `index\' file index.html for redirection exists',
     'type' => 'warning'
   },
diff --git a/tp/t/results/html_tests/file_name_conflict_with_section.pl 
b/tp/t/results/html_tests/file_name_conflict_with_section.pl
index 92113bf751..aa93c13f4e 100644
--- a/tp/t/results/html_tests/file_name_conflict_with_section.pl
+++ b/tp/t/results/html_tests/file_name_conflict_with_section.pl
@@ -44,8 +44,7 @@ $result_trees{'file_name_conflict_with_section'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -85,8 +84,7 @@ $result_trees{'file_name_conflict_with_section'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -108,8 +106,7 @@ $result_trees{'file_name_conflict_with_section'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -140,8 +137,7 @@ $result_trees{'file_name_conflict_with_section'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
@@ -238,7 +234,6 @@ 
$result_converted_errors{'file_html'}->{'file_name_conflict_with_section'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@anchor `Chap\' file Chap.html for redirection exists',
     'type' => 'warning'
   },
@@ -248,7 +243,6 @@ 
$result_converted_errors{'file_html'}->{'file_name_conflict_with_section'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'conflict with @chapter `Chap\' file',
     'type' => 'warning'
   }
diff --git a/tp/t/results/html_tests/file_name_conflict_with_user_defined.pl 
b/tp/t/results/html_tests/file_name_conflict_with_user_defined.pl
index 877bfb6941..7be1e17838 100644
--- a/tp/t/results/html_tests/file_name_conflict_with_user_defined.pl
+++ b/tp/t/results/html_tests/file_name_conflict_with_user_defined.pl
@@ -44,8 +44,7 @@ $result_trees{'file_name_conflict_with_user_defined'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -81,8 +80,7 @@ $result_trees{'file_name_conflict_with_user_defined'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -114,8 +112,7 @@ $result_trees{'file_name_conflict_with_user_defined'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -160,8 +157,7 @@ $result_trees{'file_name_conflict_with_user_defined'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -185,8 +181,7 @@ $result_trees{'file_name_conflict_with_user_defined'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -218,8 +213,7 @@ $result_trees{'file_name_conflict_with_user_defined'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -250,8 +244,7 @@ $result_trees{'file_name_conflict_with_user_defined'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     }
   ],
@@ -440,7 +433,6 @@ 
$result_converted_errors{'file_html'}->{'file_name_conflict_with_user_defined'}
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '@anchor `myanchor\' file myanchor.html for redirection exists',
     'type' => 'warning'
   },
diff --git a/tp/t/results/html_tests/filenameconflictwithnonsplit.pl 
b/tp/t/results/html_tests/filenameconflictwithnonsplit.pl
index ad56307449..95acda544e 100644
--- a/tp/t/results/html_tests/filenameconflictwithnonsplit.pl
+++ b/tp/t/results/html_tests/filenameconflictwithnonsplit.pl
@@ -44,8 +44,7 @@ $result_trees{'filenameconflictwithnonsplit'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -90,8 +89,7 @@ $result_trees{'filenameconflictwithnonsplit'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -113,8 +111,7 @@ $result_trees{'filenameconflictwithnonsplit'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
diff --git a/tp/t/results/html_tests/filenameconflictwithspecialelement.pl 
b/tp/t/results/html_tests/filenameconflictwithspecialelement.pl
index c7d557096f..52d810ce2e 100644
--- a/tp/t/results/html_tests/filenameconflictwithspecialelement.pl
+++ b/tp/t/results/html_tests/filenameconflictwithspecialelement.pl
@@ -44,8 +44,7 @@ $result_trees{'filenameconflictwithspecialelement'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -93,8 +92,7 @@ $result_trees{'filenameconflictwithspecialelement'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -118,8 +116,7 @@ $result_trees{'filenameconflictwithspecialelement'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -151,8 +148,7 @@ $result_trees{'filenameconflictwithspecialelement'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -211,8 +207,7 @@ $result_trees{'filenameconflictwithspecialelement'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -236,8 +231,7 @@ $result_trees{'filenameconflictwithspecialelement'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     }
   ],
@@ -380,7 +374,6 @@ 
$result_converted_errors{'file_html'}->{'filenameconflictwithspecialelement'} =
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => '@anchor `filenameconflictwithspecialelement fot\' file 
filenameconflictwithspecialelement-fot.html for redirection exists',
     'type' => 'warning'
   },
diff --git a/tp/t/results/html_tests/float_copying.pl 
b/tp/t/results/html_tests/float_copying.pl
index d973b565b5..1c4550ff14 100644
--- a/tp/t/results/html_tests/float_copying.pl
+++ b/tp/t/results/html_tests/float_copying.pl
@@ -59,8 +59,7 @@ $result_trees{'float_copying'} = {
               },
               'source_info' => {
                 'file_name' => 'float_copying.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -180,8 +179,7 @@ $result_trees{'float_copying'} = {
                                               },
                                               'source_info' => {
                                                 'file_name' => 
'float_copying.texi',
-                                                'line_nr' => 14,
-                                                'macro' => ''
+                                                'line_nr' => 14
                                               }
                                             },
                                             {
@@ -230,8 +228,7 @@ $result_trees{'float_copying'} = {
                                           },
                                           'source_info' => {
                                             'file_name' => 
'float_copying.texi',
-                                            'line_nr' => 16,
-                                            'macro' => ''
+                                            'line_nr' => 16
                                           },
                                           'type' => 'index_entry_command'
                                         },
@@ -268,8 +265,7 @@ $result_trees{'float_copying'} = {
                                           },
                                           'source_info' => {
                                             'file_name' => 
'float_copying.texi',
-                                            'line_nr' => 17,
-                                            'macro' => ''
+                                            'line_nr' => 17
                                           },
                                           'type' => 'index_entry_command'
                                         },
@@ -305,8 +301,7 @@ $result_trees{'float_copying'} = {
                                               'cmdname' => 'ref',
                                               'source_info' => {
                                                 'file_name' => 
'float_copying.texi',
-                                                'line_nr' => 19,
-                                                'macro' => ''
+                                                'line_nr' => 19
                                               }
                                             },
                                             {
@@ -334,8 +329,7 @@ $result_trees{'float_copying'} = {
                                   },
                                   'source_info' => {
                                     'file_name' => 'float_copying.texi',
-                                    'line_nr' => 12,
-                                    'macro' => ''
+                                    'line_nr' => 12
                                   }
                                 },
                                 {
@@ -371,8 +365,7 @@ $result_trees{'float_copying'} = {
                               },
                               'source_info' => {
                                 'file_name' => 'float_copying.texi',
-                                'line_nr' => 23,
-                                'macro' => ''
+                                'line_nr' => 23
                               }
                             },
                             {
@@ -413,8 +406,7 @@ $result_trees{'float_copying'} = {
                               },
                               'source_info' => {
                                 'file_name' => 'float_copying.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               },
                               'type' => 'index_entry_command'
                             },
@@ -451,8 +443,7 @@ $result_trees{'float_copying'} = {
                               },
                               'source_info' => {
                                 'file_name' => 'float_copying.texi',
-                                'line_nr' => 25,
-                                'macro' => ''
+                                'line_nr' => 25
                               },
                               'type' => 'index_entry_command'
                             }
@@ -466,8 +457,7 @@ $result_trees{'float_copying'} = {
                       },
                       'source_info' => {
                         'file_name' => 'float_copying.texi',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     },
                     {
@@ -503,8 +493,7 @@ $result_trees{'float_copying'} = {
                       },
                       'source_info' => {
                         'file_name' => 'float_copying.texi',
-                        'line_nr' => 27,
-                        'macro' => ''
+                        'line_nr' => 27
                       }
                     }
                   ],
@@ -521,8 +510,7 @@ $result_trees{'float_copying'} = {
                   },
                   'source_info' => {
                     'file_name' => 'float_copying.texi',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 },
                 {
@@ -553,15 +541,13 @@ $result_trees{'float_copying'} = {
                   },
                   'source_info' => {
                     'file_name' => 'float_copying.texi',
-                    'line_nr' => 28,
-                    'macro' => ''
+                    'line_nr' => 28
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'float_copying.texi',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -604,8 +590,7 @@ $result_trees{'float_copying'} = {
       },
       'source_info' => {
         'file_name' => 'float_copying.texi',
-        'line_nr' => 30,
-        'macro' => ''
+        'line_nr' => 30
       }
     },
     {
@@ -665,8 +650,7 @@ $result_trees{'float_copying'} = {
           },
           'source_info' => {
             'file_name' => 'float_copying.texi',
-            'line_nr' => 33,
-            'macro' => ''
+            'line_nr' => 33
           },
           'type' => 'index_entry_command'
         },
@@ -702,8 +686,7 @@ $result_trees{'float_copying'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'float_copying.texi',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             },
             {
@@ -745,8 +728,7 @@ $result_trees{'float_copying'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'float_copying.texi',
-                'line_nr' => 37,
-                'macro' => ''
+                'line_nr' => 37
               }
             },
             {
@@ -772,8 +754,7 @@ $result_trees{'float_copying'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => 'float_copying.texi',
-            'line_nr' => 39,
-            'macro' => ''
+            'line_nr' => 39
           }
         },
         {
@@ -838,8 +819,7 @@ $result_trees{'float_copying'} = {
               ],
               'source_info' => {
                 'file_name' => 'float_copying.texi',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               },
               'type' => 'menu_entry'
             },
@@ -871,15 +851,13 @@ $result_trees{'float_copying'} = {
               },
               'source_info' => {
                 'file_name' => 'float_copying.texi',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               }
             }
           ],
           'source_info' => {
             'file_name' => 'float_copying.texi',
-            'line_nr' => 41,
-            'macro' => ''
+            'line_nr' => 41
           }
         },
         {
@@ -896,8 +874,7 @@ $result_trees{'float_copying'} = {
       },
       'source_info' => {
         'file_name' => 'float_copying.texi',
-        'line_nr' => 31,
-        'macro' => ''
+        'line_nr' => 31
       }
     },
     {
@@ -930,8 +907,7 @@ $result_trees{'float_copying'} = {
       },
       'source_info' => {
         'file_name' => 'float_copying.texi',
-        'line_nr' => 45,
-        'macro' => ''
+        'line_nr' => 45
       }
     },
     {
@@ -1003,8 +979,7 @@ $result_trees{'float_copying'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'float_copying.texi',
-                'line_nr' => 51,
-                'macro' => ''
+                'line_nr' => 51
               }
             },
             {
@@ -1046,8 +1021,7 @@ $result_trees{'float_copying'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'float_copying.texi',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               }
             },
             {
@@ -1095,8 +1069,7 @@ $result_trees{'float_copying'} = {
           },
           'source_info' => {
             'file_name' => 'float_copying.texi',
-            'line_nr' => 55,
-            'macro' => ''
+            'line_nr' => 55
           },
           'type' => 'index_entry_command'
         },
@@ -1116,8 +1089,7 @@ $result_trees{'float_copying'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => 'float_copying.texi',
-            'line_nr' => 57,
-            'macro' => ''
+            'line_nr' => 57
           }
         },
         {
@@ -1131,8 +1103,7 @@ $result_trees{'float_copying'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => 'float_copying.texi',
-            'line_nr' => 58,
-            'macro' => ''
+            'line_nr' => 58
           }
         },
         {
@@ -1165,8 +1136,7 @@ $result_trees{'float_copying'} = {
           },
           'source_info' => {
             'file_name' => 'float_copying.texi',
-            'line_nr' => 60,
-            'macro' => ''
+            'line_nr' => 60
           }
         },
         {
@@ -1197,8 +1167,7 @@ $result_trees{'float_copying'} = {
           },
           'source_info' => {
             'file_name' => 'float_copying.texi',
-            'line_nr' => 61,
-            'macro' => ''
+            'line_nr' => 61
           }
         },
         {
@@ -1231,8 +1200,7 @@ $result_trees{'float_copying'} = {
           },
           'source_info' => {
             'file_name' => 'float_copying.texi',
-            'line_nr' => 63,
-            'macro' => ''
+            'line_nr' => 63
           }
         },
         {
@@ -1265,8 +1233,7 @@ $result_trees{'float_copying'} = {
           },
           'source_info' => {
             'file_name' => 'float_copying.texi',
-            'line_nr' => 64,
-            'macro' => ''
+            'line_nr' => 64
           }
         },
         {
@@ -1299,8 +1266,7 @@ $result_trees{'float_copying'} = {
           },
           'source_info' => {
             'file_name' => 'float_copying.texi',
-            'line_nr' => 65,
-            'macro' => ''
+            'line_nr' => 65
           }
         },
         {
@@ -1319,8 +1285,7 @@ $result_trees{'float_copying'} = {
       },
       'source_info' => {
         'file_name' => 'float_copying.texi',
-        'line_nr' => 46,
-        'macro' => ''
+        'line_nr' => 46
       }
     },
     {
diff --git 
a/tp/t/results/html_tests/footnotestyle_separate_html_text_no_monolithic.pl 
b/tp/t/results/html_tests/footnotestyle_separate_html_text_no_monolithic.pl
index 1271739572..40ee6f4ea1 100644
--- a/tp/t/results/html_tests/footnotestyle_separate_html_text_no_monolithic.pl
+++ b/tp/t/results/html_tests/footnotestyle_separate_html_text_no_monolithic.pl
@@ -39,8 +39,7 @@ 
$result_trees{'footnotestyle_separate_html_text_no_monolithic'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -80,8 +79,7 @@ 
$result_trees{'footnotestyle_separate_html_text_no_monolithic'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -127,8 +125,7 @@ 
$result_trees{'footnotestyle_separate_html_text_no_monolithic'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -152,8 +149,7 @@ 
$result_trees{'footnotestyle_separate_html_text_no_monolithic'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -185,8 +181,7 @@ 
$result_trees{'footnotestyle_separate_html_text_no_monolithic'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -224,8 +219,7 @@ 
$result_trees{'footnotestyle_separate_html_text_no_monolithic'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     }
   ],
diff --git a/tp/t/results/html_tests/footnotestyle_separate_late.pl 
b/tp/t/results/html_tests/footnotestyle_separate_late.pl
index 090fee3c21..7fd8639512 100644
--- a/tp/t/results/html_tests/footnotestyle_separate_late.pl
+++ b/tp/t/results/html_tests/footnotestyle_separate_late.pl
@@ -36,8 +36,7 @@ $result_trees{'footnotestyle_separate_late'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     'unit_contents' => [
@@ -83,8 +82,7 @@ $result_trees{'footnotestyle_separate_late'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 2,
-          'macro' => ''
+          'line_nr' => 2
         }
       }
     ],
@@ -120,8 +118,7 @@ $result_trees{'footnotestyle_separate_late'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     'unit_contents' => [
@@ -171,8 +168,7 @@ $result_trees{'footnotestyle_separate_late'} = [
                 'cmdname' => 'footnote',
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 7,
-                  'macro' => ''
+                  'line_nr' => 7
                 }
               },
               {
@@ -198,8 +194,7 @@ $result_trees{'footnotestyle_separate_late'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 5,
-          'macro' => ''
+          'line_nr' => 5
         }
       }
     ],
@@ -235,8 +230,7 @@ $result_trees{'footnotestyle_separate_late'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     'unit_contents' => [
@@ -286,8 +280,7 @@ $result_trees{'footnotestyle_separate_late'} = [
                 'cmdname' => 'footnote',
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 12,
-                  'macro' => ''
+                  'line_nr' => 12
                 }
               },
               {
@@ -332,8 +325,7 @@ $result_trees{'footnotestyle_separate_late'} = [
             },
             'source_info' => {
               'file_name' => '',
-              'line_nr' => 14,
-              'macro' => ''
+              'line_nr' => 14
             }
           }
         ],
@@ -347,8 +339,7 @@ $result_trees{'footnotestyle_separate_late'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 10,
-          'macro' => ''
+          'line_nr' => 10
         }
       }
     ],
diff --git a/tp/t/results/html_tests/headings_after_lone_nodes.pl 
b/tp/t/results/html_tests/headings_after_lone_nodes.pl
index ab32c84f45..15b535a6c4 100644
--- a/tp/t/results/html_tests/headings_after_lone_nodes.pl
+++ b/tp/t/results/html_tests/headings_after_lone_nodes.pl
@@ -39,8 +39,7 @@ $result_trees{'headings_after_lone_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -76,8 +75,7 @@ $result_trees{'headings_after_lone_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -109,8 +107,7 @@ $result_trees{'headings_after_lone_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -148,8 +145,7 @@ $result_trees{'headings_after_lone_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -196,8 +192,7 @@ $result_trees{'headings_after_lone_nodes'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -231,8 +226,7 @@ $result_trees{'headings_after_lone_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -277,8 +271,7 @@ $result_trees{'headings_after_lone_nodes'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           }
         },
         {
@@ -319,8 +312,7 @@ $result_trees{'headings_after_lone_nodes'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           }
         },
         {
@@ -354,8 +346,7 @@ $result_trees{'headings_after_lone_nodes'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
@@ -393,8 +384,7 @@ $result_trees{'headings_after_lone_nodes'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 22,
-            'macro' => ''
+            'line_nr' => 22
           }
         },
         {
@@ -454,15 +444,13 @@ $result_trees{'headings_after_lone_nodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 24,
-            'macro' => ''
+            'line_nr' => 24
           }
         },
         {
@@ -517,15 +505,13 @@ $result_trees{'headings_after_lone_nodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 28,
-            'macro' => ''
+            'line_nr' => 28
           }
         },
         {
@@ -579,15 +565,13 @@ $result_trees{'headings_after_lone_nodes'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 34,
-                      'macro' => ''
+                      'line_nr' => 34
                     }
                   }
                 ],
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 32,
-                  'macro' => ''
+                  'line_nr' => 32
                 }
               },
               'position' => 1,
@@ -628,8 +612,7 @@ $result_trees{'headings_after_lone_nodes'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 36,
-            'macro' => ''
+            'line_nr' => 36
           }
         },
         {
@@ -650,8 +633,7 @@ $result_trees{'headings_after_lone_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -717,8 +699,7 @@ $result_trees{'headings_after_lone_nodes'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 42,
-            'macro' => ''
+            'line_nr' => 42
           }
         },
         {
@@ -738,8 +719,7 @@ $result_trees{'headings_after_lone_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 38,
-        'macro' => ''
+        'line_nr' => 38
       }
     },
     {
@@ -817,15 +797,13 @@ $result_trees{'headings_after_lone_nodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 46,
-            'macro' => ''
+            'line_nr' => 46
           }
         },
         {
@@ -858,8 +836,7 @@ $result_trees{'headings_after_lone_nodes'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 50,
-            'macro' => ''
+            'line_nr' => 50
           }
         },
         {
@@ -879,8 +856,7 @@ $result_trees{'headings_after_lone_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 44,
-        'macro' => ''
+        'line_nr' => 44
       }
     },
     {
@@ -958,15 +934,13 @@ $result_trees{'headings_after_lone_nodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 54,
-            'macro' => ''
+            'line_nr' => 54
           }
         },
         {
@@ -999,8 +973,7 @@ $result_trees{'headings_after_lone_nodes'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 58,
-            'macro' => ''
+            'line_nr' => 58
           }
         },
         {
@@ -1020,8 +993,7 @@ $result_trees{'headings_after_lone_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 52,
-        'macro' => ''
+        'line_nr' => 52
       }
     },
     {
@@ -1078,8 +1050,7 @@ $result_trees{'headings_after_lone_nodes'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 62,
-            'macro' => ''
+            'line_nr' => 62
           }
         },
         {
@@ -1112,8 +1083,7 @@ $result_trees{'headings_after_lone_nodes'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 64,
-            'macro' => ''
+            'line_nr' => 64
           }
         },
         {
@@ -1133,8 +1103,7 @@ $result_trees{'headings_after_lone_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 60,
-        'macro' => ''
+        'line_nr' => 60
       }
     },
     {
@@ -1218,8 +1187,7 @@ $result_trees{'headings_after_lone_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 69,
-                'macro' => ''
+                'line_nr' => 69
               },
               'type' => 'menu_entry'
             },
@@ -1251,15 +1219,13 @@ $result_trees{'headings_after_lone_nodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 70,
-                'macro' => ''
+                'line_nr' => 70
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 68,
-            'macro' => ''
+            'line_nr' => 68
           }
         },
         {
@@ -1292,8 +1258,7 @@ $result_trees{'headings_after_lone_nodes'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 72,
-            'macro' => ''
+            'line_nr' => 72
           }
         },
         {
@@ -1313,8 +1278,7 @@ $result_trees{'headings_after_lone_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 66,
-        'macro' => ''
+        'line_nr' => 66
       }
     },
     {
@@ -1353,8 +1317,7 @@ $result_trees{'headings_after_lone_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 74,
-        'macro' => ''
+        'line_nr' => 74
       }
     }
   ],
diff --git a/tp/t/results/html_tests/html_in_copying.pl 
b/tp/t/results/html_tests/html_in_copying.pl
index 638efe9b66..4b58d962e2 100644
--- a/tp/t/results/html_tests/html_in_copying.pl
+++ b/tp/t/results/html_tests/html_in_copying.pl
@@ -93,15 +93,13 @@ $result_trees{'html_in_copying'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -132,15 +130,13 @@ $result_trees{'html_in_copying'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -180,8 +176,7 @@ $result_trees{'html_in_copying'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -217,8 +212,7 @@ $result_trees{'html_in_copying'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     }
   ],
diff --git a/tp/t/results/html_tests/image_link_prefix.pl 
b/tp/t/results/html_tests/image_link_prefix.pl
index 7bed717cfa..c519fe9c6e 100644
--- a/tp/t/results/html_tests/image_link_prefix.pl
+++ b/tp/t/results/html_tests/image_link_prefix.pl
@@ -26,8 +26,7 @@ $result_trees{'image_link_prefix'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -86,7 +85,6 @@ $result_converted_errors{'html'}->{'image_link_prefix'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@image file `image\' (for HTML) not found, using `image.jpg\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/html_tests/index_and_node_same_name.pl 
b/tp/t/results/html_tests/index_and_node_same_name.pl
index 194b452786..655626fdf0 100644
--- a/tp/t/results/html_tests/index_and_node_same_name.pl
+++ b/tp/t/results/html_tests/index_and_node_same_name.pl
@@ -36,8 +36,7 @@ $result_trees{'index_and_node_same_name'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -97,8 +96,7 @@ $result_trees{'index_and_node_same_name'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           },
           'type' => 'index_entry_command'
         },
@@ -132,8 +130,7 @@ $result_trees{'index_and_node_same_name'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -154,8 +151,7 @@ $result_trees{'index_and_node_same_name'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
diff --git a/tp/t/results/html_tests/index_below.pl 
b/tp/t/results/html_tests/index_below.pl
index c9e4490026..347d2e2ded 100644
--- a/tp/t/results/html_tests/index_below.pl
+++ b/tp/t/results/html_tests/index_below.pl
@@ -40,8 +40,7 @@ $result_trees{'index_below'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     'unit_contents' => [
@@ -88,8 +87,7 @@ $result_trees{'index_below'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     'unit_contents' => [
@@ -154,8 +152,7 @@ $result_trees{'index_below'} = [
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           },
           'type' => 'index_entry_command'
         },
@@ -189,8 +186,7 @@ $result_trees{'index_below'} = [
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         }
       ],
@@ -204,8 +200,7 @@ $result_trees{'index_below'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     'unit_contents' => [
diff --git a/tp/t/results/html_tests/info_js_dir_html.pl 
b/tp/t/results/html_tests/info_js_dir_html.pl
index e12a2afffe..8e3f52b193 100644
--- a/tp/t/results/html_tests/info_js_dir_html.pl
+++ b/tp/t/results/html_tests/info_js_dir_html.pl
@@ -39,8 +39,7 @@ $result_trees{'info_js_dir_html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -76,8 +75,7 @@ $result_trees{'info_js_dir_html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -109,8 +107,7 @@ $result_trees{'info_js_dir_html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -141,8 +138,7 @@ $result_trees{'info_js_dir_html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
diff --git a/tp/t/results/html_tests/info_js_dir_html_file.pl 
b/tp/t/results/html_tests/info_js_dir_html_file.pl
index 825d5ca8d3..f28171d3d2 100644
--- a/tp/t/results/html_tests/info_js_dir_html_file.pl
+++ b/tp/t/results/html_tests/info_js_dir_html_file.pl
@@ -44,8 +44,7 @@ $result_trees{'info_js_dir_html_file'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -81,8 +80,7 @@ $result_trees{'info_js_dir_html_file'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -114,8 +112,7 @@ $result_trees{'info_js_dir_html_file'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -146,8 +143,7 @@ $result_trees{'info_js_dir_html_file'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
diff --git a/tp/t/results/html_tests/info_js_dir_html_text.pl 
b/tp/t/results/html_tests/info_js_dir_html_text.pl
index 97f12e011a..d4a6149750 100644
--- a/tp/t/results/html_tests/info_js_dir_html_text.pl
+++ b/tp/t/results/html_tests/info_js_dir_html_text.pl
@@ -39,8 +39,7 @@ $result_trees{'info_js_dir_html_text'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -76,8 +75,7 @@ $result_trees{'info_js_dir_html_text'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -109,8 +107,7 @@ $result_trees{'info_js_dir_html_text'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -141,8 +138,7 @@ $result_trees{'info_js_dir_html_text'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
diff --git a/tp/t/results/html_tests/itemize_arguments.pl 
b/tp/t/results/html_tests/itemize_arguments.pl
index aa791f48c7..3adcde5f88 100644
--- a/tp/t/results/html_tests/itemize_arguments.pl
+++ b/tp/t/results/html_tests/itemize_arguments.pl
@@ -63,8 +63,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -95,8 +94,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -107,8 +105,7 @@ $result_trees{'itemize_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -157,8 +154,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -189,8 +185,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
@@ -201,8 +196,7 @@ $result_trees{'itemize_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -228,8 +222,7 @@ $result_trees{'itemize_arguments'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 }
               ],
@@ -270,8 +263,7 @@ $result_trees{'itemize_arguments'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     },
                     {
@@ -287,8 +279,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -319,8 +310,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
@@ -331,8 +321,7 @@ $result_trees{'itemize_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -381,8 +370,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -413,8 +401,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
@@ -425,8 +412,7 @@ $result_trees{'itemize_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           }
         },
         {
@@ -475,8 +461,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -507,8 +492,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             }
           ],
@@ -519,8 +503,7 @@ $result_trees{'itemize_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           }
         },
         {
@@ -569,8 +552,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -601,8 +583,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             }
           ],
@@ -613,8 +594,7 @@ $result_trees{'itemize_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 22,
-            'macro' => ''
+            'line_nr' => 22
           }
         },
         {
@@ -630,8 +610,7 @@ $result_trees{'itemize_arguments'} = {
                   'cmdname' => 'today',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 26,
-                    'macro' => ''
+                    'line_nr' => 26
                   },
                   'type' => 'command_as_argument'
                 }
@@ -668,8 +647,7 @@ $result_trees{'itemize_arguments'} = {
                       'cmdname' => 'today',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 27,
-                        'macro' => ''
+                        'line_nr' => 27
                       }
                     },
                     {
@@ -685,8 +663,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             },
             {
@@ -717,8 +694,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             }
           ],
@@ -732,8 +708,7 @@ $result_trees{'itemize_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         },
         {
@@ -754,8 +729,7 @@ $result_trees{'itemize_arguments'} = {
                   'cmdname' => 'aa',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 30,
-                    'macro' => ''
+                    'line_nr' => 30
                   }
                 },
                 {
@@ -774,8 +748,7 @@ $result_trees{'itemize_arguments'} = {
                           'cmdname' => 'aa',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 30,
-                            'macro' => ''
+                            'line_nr' => 30
                           }
                         }
                       ],
@@ -785,8 +758,7 @@ $result_trees{'itemize_arguments'} = {
                   'cmdname' => 'sc',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 30,
-                    'macro' => ''
+                    'line_nr' => 30
                   }
                 }
               ],
@@ -822,8 +794,7 @@ $result_trees{'itemize_arguments'} = {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 31,
-                        'macro' => ''
+                        'line_nr' => 31
                       }
                     },
                     {
@@ -842,8 +813,7 @@ $result_trees{'itemize_arguments'} = {
                               'cmdname' => 'aa',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 31,
-                                'macro' => ''
+                                'line_nr' => 31
                               }
                             }
                           ],
@@ -853,8 +823,7 @@ $result_trees{'itemize_arguments'} = {
                       'cmdname' => 'sc',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 31,
-                        'macro' => ''
+                        'line_nr' => 31
                       }
                     },
                     {
@@ -870,8 +839,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               }
             },
             {
@@ -902,8 +870,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               }
             }
           ],
@@ -914,8 +881,7 @@ $result_trees{'itemize_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 30,
-            'macro' => ''
+            'line_nr' => 30
           }
         },
         {
@@ -936,8 +902,7 @@ $result_trees{'itemize_arguments'} = {
                   'cmdname' => 'tie',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 34,
-                    'macro' => ''
+                    'line_nr' => 34
                   },
                   'type' => 'command_as_argument'
                 }
@@ -974,8 +939,7 @@ $result_trees{'itemize_arguments'} = {
                       'cmdname' => 'tie',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 35,
-                        'macro' => ''
+                        'line_nr' => 35
                       }
                     },
                     {
@@ -991,8 +955,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             },
             {
@@ -1023,8 +986,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               }
             }
           ],
@@ -1038,8 +1000,7 @@ $result_trees{'itemize_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 34,
-            'macro' => ''
+            'line_nr' => 34
           }
         },
         {
@@ -1060,8 +1021,7 @@ $result_trees{'itemize_arguments'} = {
                   'cmdname' => 'tie',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 38,
-                    'macro' => ''
+                    'line_nr' => 38
                   }
                 },
                 {
@@ -1100,8 +1060,7 @@ $result_trees{'itemize_arguments'} = {
                       'cmdname' => 'tie',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 39,
-                        'macro' => ''
+                        'line_nr' => 39
                       }
                     },
                     {
@@ -1117,8 +1076,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 39,
-                'macro' => ''
+                'line_nr' => 39
               }
             },
             {
@@ -1149,8 +1107,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               }
             }
           ],
@@ -1161,8 +1118,7 @@ $result_trees{'itemize_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 38,
-            'macro' => ''
+            'line_nr' => 38
           }
         },
         {
@@ -1178,8 +1134,7 @@ $result_trees{'itemize_arguments'} = {
                   'cmdname' => 'atchar',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 42,
-                    'macro' => ''
+                    'line_nr' => 42
                   },
                   'type' => 'command_as_argument'
                 }
@@ -1217,8 +1172,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               }
             },
             {
@@ -1249,8 +1203,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             }
           ],
@@ -1264,8 +1217,7 @@ $result_trees{'itemize_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 42,
-            'macro' => ''
+            'line_nr' => 42
           }
         },
         {
@@ -1286,8 +1238,7 @@ $result_trees{'itemize_arguments'} = {
                   'cmdname' => 'atchar',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 46,
-                    'macro' => ''
+                    'line_nr' => 46
                   }
                 },
                 {
@@ -1326,8 +1277,7 @@ $result_trees{'itemize_arguments'} = {
                       'cmdname' => 'atchar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 47,
-                        'macro' => ''
+                        'line_nr' => 47
                       }
                     },
                     {
@@ -1343,8 +1293,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               }
             },
             {
@@ -1375,8 +1324,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               }
             }
           ],
@@ -1387,8 +1335,7 @@ $result_trees{'itemize_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 46,
-            'macro' => ''
+            'line_nr' => 46
           }
         },
         {
@@ -1443,8 +1390,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 51,
-                'macro' => ''
+                'line_nr' => 51
               }
             },
             {
@@ -1475,8 +1421,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               }
             }
           ],
@@ -1487,8 +1432,7 @@ $result_trees{'itemize_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 50,
-            'macro' => ''
+            'line_nr' => 50
           }
         },
         {
@@ -1543,8 +1487,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 55,
-                'macro' => ''
+                'line_nr' => 55
               }
             },
             {
@@ -1575,8 +1518,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             }
           ],
@@ -1587,8 +1529,7 @@ $result_trees{'itemize_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 54,
-            'macro' => ''
+            'line_nr' => 54
           }
         },
         {
@@ -1609,8 +1550,7 @@ $result_trees{'itemize_arguments'} = {
                   'cmdname' => 'registeredsymbol',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 58,
-                    'macro' => ''
+                    'line_nr' => 58
                   },
                   'type' => 'command_as_argument'
                 }
@@ -1647,8 +1587,7 @@ $result_trees{'itemize_arguments'} = {
                       'cmdname' => 'registeredsymbol',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 59,
-                        'macro' => ''
+                        'line_nr' => 59
                       }
                     },
                     {
@@ -1664,8 +1603,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             },
             {
@@ -1696,8 +1634,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 60,
-                'macro' => ''
+                'line_nr' => 60
               }
             }
           ],
@@ -1711,8 +1648,7 @@ $result_trees{'itemize_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 58,
-            'macro' => ''
+            'line_nr' => 58
           }
         },
         {
@@ -1733,8 +1669,7 @@ $result_trees{'itemize_arguments'} = {
                   'cmdname' => 'registeredsymbol',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 62,
-                    'macro' => ''
+                    'line_nr' => 62
                   }
                 },
                 {
@@ -1773,8 +1708,7 @@ $result_trees{'itemize_arguments'} = {
                       'cmdname' => 'registeredsymbol',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 63,
-                        'macro' => ''
+                        'line_nr' => 63
                       }
                     },
                     {
@@ -1790,8 +1724,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 63,
-                'macro' => ''
+                'line_nr' => 63
               }
             },
             {
@@ -1822,8 +1755,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             }
           ],
@@ -1834,8 +1766,7 @@ $result_trees{'itemize_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 62,
-            'macro' => ''
+            'line_nr' => 62
           }
         },
         {
@@ -1856,8 +1787,7 @@ $result_trees{'itemize_arguments'} = {
                   'cmdname' => 'enddots',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 66,
-                    'macro' => ''
+                    'line_nr' => 66
                   },
                   'type' => 'command_as_argument'
                 }
@@ -1894,8 +1824,7 @@ $result_trees{'itemize_arguments'} = {
                       'cmdname' => 'enddots',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 67,
-                        'macro' => ''
+                        'line_nr' => 67
                       }
                     },
                     {
@@ -1911,8 +1840,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 67,
-                'macro' => ''
+                'line_nr' => 67
               }
             },
             {
@@ -1943,8 +1871,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 68,
-                'macro' => ''
+                'line_nr' => 68
               }
             }
           ],
@@ -1958,8 +1885,7 @@ $result_trees{'itemize_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 66,
-            'macro' => ''
+            'line_nr' => 66
           }
         },
         {
@@ -1980,8 +1906,7 @@ $result_trees{'itemize_arguments'} = {
                   'cmdname' => 'enddots',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 70,
-                    'macro' => ''
+                    'line_nr' => 70
                   }
                 },
                 {
@@ -2020,8 +1945,7 @@ $result_trees{'itemize_arguments'} = {
                       'cmdname' => 'enddots',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 71,
-                        'macro' => ''
+                        'line_nr' => 71
                       }
                     },
                     {
@@ -2037,8 +1961,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             },
             {
@@ -2069,8 +1992,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 72,
-                'macro' => ''
+                'line_nr' => 72
               }
             }
           ],
@@ -2081,8 +2003,7 @@ $result_trees{'itemize_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 70,
-            'macro' => ''
+            'line_nr' => 70
           }
         },
         {
@@ -2108,8 +2029,7 @@ $result_trees{'itemize_arguments'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 74,
-                    'macro' => ''
+                    'line_nr' => 74
                   }
                 },
                 {
@@ -2133,8 +2053,7 @@ $result_trees{'itemize_arguments'} = {
                           'cmdname' => '^',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 74,
-                            'macro' => ''
+                            'line_nr' => 74
                           }
                         }
                       ],
@@ -2144,8 +2063,7 @@ $result_trees{'itemize_arguments'} = {
                   'cmdname' => 'sc',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 74,
-                    'macro' => ''
+                    'line_nr' => 74
                   }
                 }
               ],
@@ -2186,8 +2104,7 @@ $result_trees{'itemize_arguments'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 75,
-                        'macro' => ''
+                        'line_nr' => 75
                       }
                     },
                     {
@@ -2211,8 +2128,7 @@ $result_trees{'itemize_arguments'} = {
                               'cmdname' => '^',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 75,
-                                'macro' => ''
+                                'line_nr' => 75
                               }
                             }
                           ],
@@ -2222,8 +2138,7 @@ $result_trees{'itemize_arguments'} = {
                       'cmdname' => 'sc',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 75,
-                        'macro' => ''
+                        'line_nr' => 75
                       }
                     },
                     {
@@ -2239,8 +2154,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 75,
-                'macro' => ''
+                'line_nr' => 75
               }
             },
             {
@@ -2271,8 +2185,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 76,
-                'macro' => ''
+                'line_nr' => 76
               }
             }
           ],
@@ -2283,8 +2196,7 @@ $result_trees{'itemize_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 74,
-            'macro' => ''
+            'line_nr' => 74
           }
         },
         {
@@ -2310,8 +2222,7 @@ $result_trees{'itemize_arguments'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 78,
-                    'macro' => ''
+                    'line_nr' => 78
                   }
                 },
                 {
@@ -2335,8 +2246,7 @@ $result_trees{'itemize_arguments'} = {
                           'cmdname' => '^',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 78,
-                            'macro' => ''
+                            'line_nr' => 78
                           }
                         }
                       ],
@@ -2346,8 +2256,7 @@ $result_trees{'itemize_arguments'} = {
                   'cmdname' => 'sc',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 78,
-                    'macro' => ''
+                    'line_nr' => 78
                   }
                 }
               ],
@@ -2388,8 +2297,7 @@ $result_trees{'itemize_arguments'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 79,
-                        'macro' => ''
+                        'line_nr' => 79
                       }
                     },
                     {
@@ -2413,8 +2321,7 @@ $result_trees{'itemize_arguments'} = {
                               'cmdname' => '^',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 79,
-                                'macro' => ''
+                                'line_nr' => 79
                               }
                             }
                           ],
@@ -2424,8 +2331,7 @@ $result_trees{'itemize_arguments'} = {
                       'cmdname' => 'sc',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 79,
-                        'macro' => ''
+                        'line_nr' => 79
                       }
                     },
                     {
@@ -2441,8 +2347,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 79,
-                'macro' => ''
+                'line_nr' => 79
               }
             },
             {
@@ -2473,8 +2378,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 80,
-                'macro' => ''
+                'line_nr' => 80
               }
             }
           ],
@@ -2485,8 +2389,7 @@ $result_trees{'itemize_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 78,
-            'macro' => ''
+            'line_nr' => 78
           }
         },
         {
@@ -2516,8 +2419,7 @@ $result_trees{'itemize_arguments'} = {
                           'cmdname' => 'dotless',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 82,
-                            'macro' => ''
+                            'line_nr' => 82
                           }
                         }
                       ],
@@ -2527,8 +2429,7 @@ $result_trees{'itemize_arguments'} = {
                   'cmdname' => '~',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 82,
-                    'macro' => ''
+                    'line_nr' => 82
                   }
                 },
                 {
@@ -2548,8 +2449,7 @@ $result_trees{'itemize_arguments'} = {
                   'cmdname' => 'dotless',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 82,
-                    'macro' => ''
+                    'line_nr' => 82
                   }
                 },
                 {
@@ -2577,8 +2477,7 @@ $result_trees{'itemize_arguments'} = {
                                   'cmdname' => 'dotless',
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 82,
-                                    'macro' => ''
+                                    'line_nr' => 82
                                   }
                                 }
                               ],
@@ -2588,8 +2487,7 @@ $result_trees{'itemize_arguments'} = {
                           'cmdname' => '~',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 82,
-                            'macro' => ''
+                            'line_nr' => 82
                           }
                         },
                         {
@@ -2609,8 +2507,7 @@ $result_trees{'itemize_arguments'} = {
                           'cmdname' => 'dotless',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 82,
-                            'macro' => ''
+                            'line_nr' => 82
                           }
                         }
                       ],
@@ -2620,8 +2517,7 @@ $result_trees{'itemize_arguments'} = {
                   'cmdname' => 'sc',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 82,
-                    'macro' => ''
+                    'line_nr' => 82
                   }
                 }
               ],
@@ -2666,8 +2562,7 @@ $result_trees{'itemize_arguments'} = {
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 83,
-                                'macro' => ''
+                                'line_nr' => 83
                               }
                             }
                           ],
@@ -2677,8 +2572,7 @@ $result_trees{'itemize_arguments'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 83,
-                        'macro' => ''
+                        'line_nr' => 83
                       }
                     },
                     {
@@ -2698,8 +2592,7 @@ $result_trees{'itemize_arguments'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 83,
-                        'macro' => ''
+                        'line_nr' => 83
                       }
                     },
                     {
@@ -2727,8 +2620,7 @@ $result_trees{'itemize_arguments'} = {
                                       'cmdname' => 'dotless',
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 83,
-                                        'macro' => ''
+                                        'line_nr' => 83
                                       }
                                     }
                                   ],
@@ -2738,8 +2630,7 @@ $result_trees{'itemize_arguments'} = {
                               'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 83,
-                                'macro' => ''
+                                'line_nr' => 83
                               }
                             },
                             {
@@ -2759,8 +2650,7 @@ $result_trees{'itemize_arguments'} = {
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 83,
-                                'macro' => ''
+                                'line_nr' => 83
                               }
                             }
                           ],
@@ -2770,8 +2660,7 @@ $result_trees{'itemize_arguments'} = {
                       'cmdname' => 'sc',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 83,
-                        'macro' => ''
+                        'line_nr' => 83
                       }
                     },
                     {
@@ -2787,8 +2676,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 83,
-                'macro' => ''
+                'line_nr' => 83
               }
             },
             {
@@ -2819,8 +2707,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 84,
-                'macro' => ''
+                'line_nr' => 84
               }
             }
           ],
@@ -2831,8 +2718,7 @@ $result_trees{'itemize_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 82,
-            'macro' => ''
+            'line_nr' => 82
           }
         },
         {
@@ -2858,8 +2744,7 @@ $result_trees{'itemize_arguments'} = {
                   'cmdname' => 'udotaccent',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 86,
-                    'macro' => ''
+                    'line_nr' => 86
                   }
                 },
                 {
@@ -2883,8 +2768,7 @@ $result_trees{'itemize_arguments'} = {
                           'cmdname' => '\'',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 86,
-                            'macro' => ''
+                            'line_nr' => 86
                           }
                         }
                       ],
@@ -2894,8 +2778,7 @@ $result_trees{'itemize_arguments'} = {
                   'cmdname' => 'v',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 86,
-                    'macro' => ''
+                    'line_nr' => 86
                   }
                 },
                 {
@@ -2919,8 +2802,7 @@ $result_trees{'itemize_arguments'} = {
                           'cmdname' => 'udotaccent',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 86,
-                            'macro' => ''
+                            'line_nr' => 86
                           }
                         },
                         {
@@ -2944,8 +2826,7 @@ $result_trees{'itemize_arguments'} = {
                                   'cmdname' => '\'',
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 86,
-                                    'macro' => ''
+                                    'line_nr' => 86
                                   }
                                 }
                               ],
@@ -2955,8 +2836,7 @@ $result_trees{'itemize_arguments'} = {
                           'cmdname' => 'v',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 86,
-                            'macro' => ''
+                            'line_nr' => 86
                           }
                         }
                       ],
@@ -2966,8 +2846,7 @@ $result_trees{'itemize_arguments'} = {
                   'cmdname' => 'sc',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 86,
-                    'macro' => ''
+                    'line_nr' => 86
                   }
                 }
               ],
@@ -3008,8 +2887,7 @@ $result_trees{'itemize_arguments'} = {
                       'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 87,
-                        'macro' => ''
+                        'line_nr' => 87
                       }
                     },
                     {
@@ -3033,8 +2911,7 @@ $result_trees{'itemize_arguments'} = {
                               'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 87,
-                                'macro' => ''
+                                'line_nr' => 87
                               }
                             }
                           ],
@@ -3044,8 +2921,7 @@ $result_trees{'itemize_arguments'} = {
                       'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 87,
-                        'macro' => ''
+                        'line_nr' => 87
                       }
                     },
                     {
@@ -3069,8 +2945,7 @@ $result_trees{'itemize_arguments'} = {
                               'cmdname' => 'udotaccent',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 87,
-                                'macro' => ''
+                                'line_nr' => 87
                               }
                             },
                             {
@@ -3094,8 +2969,7 @@ $result_trees{'itemize_arguments'} = {
                                       'cmdname' => '\'',
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 87,
-                                        'macro' => ''
+                                        'line_nr' => 87
                                       }
                                     }
                                   ],
@@ -3105,8 +2979,7 @@ $result_trees{'itemize_arguments'} = {
                               'cmdname' => 'v',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 87,
-                                'macro' => ''
+                                'line_nr' => 87
                               }
                             }
                           ],
@@ -3116,8 +2989,7 @@ $result_trees{'itemize_arguments'} = {
                       'cmdname' => 'sc',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 87,
-                        'macro' => ''
+                        'line_nr' => 87
                       }
                     },
                     {
@@ -3133,8 +3005,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 87,
-                'macro' => ''
+                'line_nr' => 87
               }
             },
             {
@@ -3165,8 +3036,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 88,
-                'macro' => ''
+                'line_nr' => 88
               }
             }
           ],
@@ -3177,8 +3047,7 @@ $result_trees{'itemize_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 86,
-            'macro' => ''
+            'line_nr' => 86
           }
         },
         {
@@ -3212,8 +3081,7 @@ $result_trees{'itemize_arguments'} = {
                                   'cmdname' => '~',
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 90,
-                                    'macro' => ''
+                                    'line_nr' => 90
                                   }
                                 }
                               ],
@@ -3223,8 +3091,7 @@ $result_trees{'itemize_arguments'} = {
                           'cmdname' => ',',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 90,
-                            'macro' => ''
+                            'line_nr' => 90
                           }
                         }
                       ],
@@ -3234,8 +3101,7 @@ $result_trees{'itemize_arguments'} = {
                   'cmdname' => '=',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 90,
-                    'macro' => ''
+                    'line_nr' => 90
                   }
                 },
                 {
@@ -3270,8 +3136,7 @@ $result_trees{'itemize_arguments'} = {
                                           'cmdname' => '~',
                                           'source_info' => {
                                             'file_name' => '',
-                                            'line_nr' => 90,
-                                            'macro' => ''
+                                            'line_nr' => 90
                                           }
                                         }
                                       ],
@@ -3281,8 +3146,7 @@ $result_trees{'itemize_arguments'} = {
                                   'cmdname' => ',',
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 90,
-                                    'macro' => ''
+                                    'line_nr' => 90
                                   }
                                 }
                               ],
@@ -3292,8 +3156,7 @@ $result_trees{'itemize_arguments'} = {
                           'cmdname' => '=',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 90,
-                            'macro' => ''
+                            'line_nr' => 90
                           }
                         }
                       ],
@@ -3303,8 +3166,7 @@ $result_trees{'itemize_arguments'} = {
                   'cmdname' => 'sc',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 90,
-                    'macro' => ''
+                    'line_nr' => 90
                   }
                 }
               ],
@@ -3353,8 +3215,7 @@ $result_trees{'itemize_arguments'} = {
                                       'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 91,
-                                        'macro' => ''
+                                        'line_nr' => 91
                                       }
                                     }
                                   ],
@@ -3364,8 +3225,7 @@ $result_trees{'itemize_arguments'} = {
                               'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 91,
-                                'macro' => ''
+                                'line_nr' => 91
                               }
                             }
                           ],
@@ -3375,8 +3235,7 @@ $result_trees{'itemize_arguments'} = {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 91,
-                        'macro' => ''
+                        'line_nr' => 91
                       }
                     },
                     {
@@ -3411,8 +3270,7 @@ $result_trees{'itemize_arguments'} = {
                                               'cmdname' => '~',
                                               'source_info' => {
                                                 'file_name' => '',
-                                                'line_nr' => 91,
-                                                'macro' => ''
+                                                'line_nr' => 91
                                               }
                                             }
                                           ],
@@ -3422,8 +3280,7 @@ $result_trees{'itemize_arguments'} = {
                                       'cmdname' => ',',
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 91,
-                                        'macro' => ''
+                                        'line_nr' => 91
                                       }
                                     }
                                   ],
@@ -3433,8 +3290,7 @@ $result_trees{'itemize_arguments'} = {
                               'cmdname' => '=',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 91,
-                                'macro' => ''
+                                'line_nr' => 91
                               }
                             }
                           ],
@@ -3444,8 +3300,7 @@ $result_trees{'itemize_arguments'} = {
                       'cmdname' => 'sc',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 91,
-                        'macro' => ''
+                        'line_nr' => 91
                       }
                     },
                     {
@@ -3461,8 +3316,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 91,
-                'macro' => ''
+                'line_nr' => 91
               }
             },
             {
@@ -3493,8 +3347,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 92,
-                'macro' => ''
+                'line_nr' => 92
               }
             }
           ],
@@ -3505,8 +3358,7 @@ $result_trees{'itemize_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 90,
-            'macro' => ''
+            'line_nr' => 90
           }
         },
         {
@@ -3522,8 +3374,7 @@ $result_trees{'itemize_arguments'} = {
                   'cmdname' => 'asis',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 94,
-                    'macro' => ''
+                    'line_nr' => 94
                   },
                   'type' => 'command_as_argument'
                 }
@@ -3560,8 +3411,7 @@ $result_trees{'itemize_arguments'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 95,
-                        'macro' => ''
+                        'line_nr' => 95
                       }
                     },
                     {
@@ -3577,8 +3427,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 95,
-                'macro' => ''
+                'line_nr' => 95
               }
             },
             {
@@ -3609,8 +3458,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 96,
-                'macro' => ''
+                'line_nr' => 96
               }
             }
           ],
@@ -3624,8 +3472,7 @@ $result_trees{'itemize_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 94,
-            'macro' => ''
+            'line_nr' => 94
           }
         },
         {
@@ -3649,8 +3496,7 @@ $result_trees{'itemize_arguments'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 98,
-                    'macro' => ''
+                    'line_nr' => 98
                   },
                   'type' => 'command_as_argument'
                 }
@@ -3690,8 +3536,7 @@ $result_trees{'itemize_arguments'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 99,
-                        'macro' => ''
+                        'line_nr' => 99
                       }
                     },
                     {
@@ -3707,8 +3552,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 99,
-                'macro' => ''
+                'line_nr' => 99
               }
             },
             {
@@ -3739,8 +3583,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 100,
-                'macro' => ''
+                'line_nr' => 100
               }
             }
           ],
@@ -3754,8 +3597,7 @@ $result_trees{'itemize_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 98,
-            'macro' => ''
+            'line_nr' => 98
           }
         },
         {
@@ -3779,8 +3621,7 @@ $result_trees{'itemize_arguments'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 102,
-                    'macro' => ''
+                    'line_nr' => 102
                   }
                 },
                 {
@@ -3822,8 +3663,7 @@ $result_trees{'itemize_arguments'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 103,
-                        'macro' => ''
+                        'line_nr' => 103
                       }
                     },
                     {
@@ -3839,8 +3679,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 103,
-                'macro' => ''
+                'line_nr' => 103
               }
             },
             {
@@ -3871,8 +3710,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 104,
-                'macro' => ''
+                'line_nr' => 104
               }
             }
           ],
@@ -3883,8 +3721,7 @@ $result_trees{'itemize_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 102,
-            'macro' => ''
+            'line_nr' => 102
           }
         },
         {
@@ -3906,8 +3743,7 @@ $result_trees{'itemize_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 106,
-            'macro' => ''
+            'line_nr' => 106
           }
         },
         {
@@ -3931,8 +3767,7 @@ $result_trees{'itemize_arguments'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 108,
-                    'macro' => ''
+                    'line_nr' => 108
                   },
                   'type' => 'command_as_argument'
                 }
@@ -3972,8 +3807,7 @@ $result_trees{'itemize_arguments'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 109,
-                        'macro' => ''
+                        'line_nr' => 109
                       }
                     },
                     {
@@ -3989,8 +3823,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 109,
-                'macro' => ''
+                'line_nr' => 109
               }
             },
             {
@@ -4021,8 +3854,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 110,
-                'macro' => ''
+                'line_nr' => 110
               }
             }
           ],
@@ -4036,8 +3868,7 @@ $result_trees{'itemize_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 108,
-            'macro' => ''
+            'line_nr' => 108
           }
         },
         {
@@ -4061,8 +3892,7 @@ $result_trees{'itemize_arguments'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 112,
-                    'macro' => ''
+                    'line_nr' => 112
                   }
                 },
                 {
@@ -4104,8 +3934,7 @@ $result_trees{'itemize_arguments'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 113,
-                        'macro' => ''
+                        'line_nr' => 113
                       }
                     },
                     {
@@ -4121,8 +3950,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 113,
-                'macro' => ''
+                'line_nr' => 113
               }
             },
             {
@@ -4153,8 +3981,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 114,
-                'macro' => ''
+                'line_nr' => 114
               }
             }
           ],
@@ -4165,8 +3992,7 @@ $result_trees{'itemize_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 112,
-            'macro' => ''
+            'line_nr' => 112
           }
         },
         {
@@ -4187,8 +4013,7 @@ $result_trees{'itemize_arguments'} = {
                   'cmdname' => 'error',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 116,
-                    'macro' => ''
+                    'line_nr' => 116
                   },
                   'type' => 'command_as_argument'
                 }
@@ -4225,8 +4050,7 @@ $result_trees{'itemize_arguments'} = {
                       'cmdname' => 'error',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 117,
-                        'macro' => ''
+                        'line_nr' => 117
                       }
                     },
                     {
@@ -4242,8 +4066,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 117,
-                'macro' => ''
+                'line_nr' => 117
               }
             },
             {
@@ -4274,8 +4097,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 118,
-                'macro' => ''
+                'line_nr' => 118
               }
             }
           ],
@@ -4289,8 +4111,7 @@ $result_trees{'itemize_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 116,
-            'macro' => ''
+            'line_nr' => 116
           }
         },
         {
@@ -4311,8 +4132,7 @@ $result_trees{'itemize_arguments'} = {
                   'cmdname' => 'error',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 120,
-                    'macro' => ''
+                    'line_nr' => 120
                   }
                 },
                 {
@@ -4351,8 +4171,7 @@ $result_trees{'itemize_arguments'} = {
                       'cmdname' => 'error',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 121,
-                        'macro' => ''
+                        'line_nr' => 121
                       }
                     },
                     {
@@ -4368,8 +4187,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 121,
-                'macro' => ''
+                'line_nr' => 121
               }
             },
             {
@@ -4400,8 +4218,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 122,
-                'macro' => ''
+                'line_nr' => 122
               }
             }
           ],
@@ -4412,8 +4229,7 @@ $result_trees{'itemize_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 120,
-            'macro' => ''
+            'line_nr' => 120
           }
         },
         {
@@ -4449,8 +4265,7 @@ $result_trees{'itemize_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 124,
-            'macro' => ''
+            'line_nr' => 124
           }
         },
         {
@@ -4466,8 +4281,7 @@ $result_trees{'itemize_arguments'} = {
                   'cmdname' => 'error',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 125,
-                    'macro' => ''
+                    'line_nr' => 125
                   },
                   'type' => 'command_as_argument'
                 }
@@ -4504,8 +4318,7 @@ $result_trees{'itemize_arguments'} = {
                       'cmdname' => 'error',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 126,
-                        'macro' => ''
+                        'line_nr' => 126
                       }
                     },
                     {
@@ -4521,8 +4334,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 126,
-                'macro' => ''
+                'line_nr' => 126
               }
             },
             {
@@ -4553,8 +4365,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 127,
-                'macro' => ''
+                'line_nr' => 127
               }
             }
           ],
@@ -4568,8 +4379,7 @@ $result_trees{'itemize_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 125,
-            'macro' => ''
+            'line_nr' => 125
           }
         },
         {
@@ -4590,8 +4400,7 @@ $result_trees{'itemize_arguments'} = {
                   'cmdname' => 'error',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 129,
-                    'macro' => ''
+                    'line_nr' => 129
                   }
                 },
                 {
@@ -4630,8 +4439,7 @@ $result_trees{'itemize_arguments'} = {
                       'cmdname' => 'error',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 130,
-                        'macro' => ''
+                        'line_nr' => 130
                       }
                     },
                     {
@@ -4647,8 +4455,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 130,
-                'macro' => ''
+                'line_nr' => 130
               }
             },
             {
@@ -4679,8 +4486,7 @@ $result_trees{'itemize_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 131,
-                'macro' => ''
+                'line_nr' => 131
               }
             }
           ],
@@ -4691,8 +4497,7 @@ $result_trees{'itemize_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 129,
-            'macro' => ''
+            'line_nr' => 129
           }
         },
         {
diff --git a/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl 
b/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
index 51fb4f7a0b..e819bfeb56 100644
--- a/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
+++ b/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
@@ -63,8 +63,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -95,8 +94,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -107,8 +105,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -157,8 +154,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -189,8 +185,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
@@ -201,8 +196,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -228,8 +222,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 }
               ],
@@ -270,8 +263,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     },
                     {
@@ -287,8 +279,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -319,8 +310,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
@@ -331,8 +321,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -381,8 +370,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -413,8 +401,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
@@ -425,8 +412,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           }
         },
         {
@@ -475,8 +461,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -507,8 +492,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             }
           ],
@@ -519,8 +503,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           }
         },
         {
@@ -569,8 +552,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -601,8 +583,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             }
           ],
@@ -613,8 +594,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 22,
-            'macro' => ''
+            'line_nr' => 22
           }
         },
         {
@@ -630,8 +610,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'cmdname' => 'today',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 26,
-                    'macro' => ''
+                    'line_nr' => 26
                   },
                   'type' => 'command_as_argument'
                 }
@@ -668,8 +647,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'cmdname' => 'today',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 27,
-                        'macro' => ''
+                        'line_nr' => 27
                       }
                     },
                     {
@@ -685,8 +663,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             },
             {
@@ -717,8 +694,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             }
           ],
@@ -732,8 +708,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         },
         {
@@ -754,8 +729,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'cmdname' => 'aa',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 30,
-                    'macro' => ''
+                    'line_nr' => 30
                   }
                 },
                 {
@@ -774,8 +748,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                           'cmdname' => 'aa',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 30,
-                            'macro' => ''
+                            'line_nr' => 30
                           }
                         }
                       ],
@@ -785,8 +758,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'cmdname' => 'sc',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 30,
-                    'macro' => ''
+                    'line_nr' => 30
                   }
                 }
               ],
@@ -822,8 +794,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 31,
-                        'macro' => ''
+                        'line_nr' => 31
                       }
                     },
                     {
@@ -842,8 +813,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                               'cmdname' => 'aa',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 31,
-                                'macro' => ''
+                                'line_nr' => 31
                               }
                             }
                           ],
@@ -853,8 +823,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'cmdname' => 'sc',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 31,
-                        'macro' => ''
+                        'line_nr' => 31
                       }
                     },
                     {
@@ -870,8 +839,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               }
             },
             {
@@ -902,8 +870,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               }
             }
           ],
@@ -914,8 +881,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 30,
-            'macro' => ''
+            'line_nr' => 30
           }
         },
         {
@@ -936,8 +902,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'cmdname' => 'tie',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 34,
-                    'macro' => ''
+                    'line_nr' => 34
                   },
                   'type' => 'command_as_argument'
                 }
@@ -974,8 +939,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'cmdname' => 'tie',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 35,
-                        'macro' => ''
+                        'line_nr' => 35
                       }
                     },
                     {
@@ -991,8 +955,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             },
             {
@@ -1023,8 +986,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               }
             }
           ],
@@ -1038,8 +1000,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 34,
-            'macro' => ''
+            'line_nr' => 34
           }
         },
         {
@@ -1060,8 +1021,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'cmdname' => 'tie',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 38,
-                    'macro' => ''
+                    'line_nr' => 38
                   }
                 },
                 {
@@ -1100,8 +1060,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'cmdname' => 'tie',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 39,
-                        'macro' => ''
+                        'line_nr' => 39
                       }
                     },
                     {
@@ -1117,8 +1076,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 39,
-                'macro' => ''
+                'line_nr' => 39
               }
             },
             {
@@ -1149,8 +1107,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               }
             }
           ],
@@ -1161,8 +1118,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 38,
-            'macro' => ''
+            'line_nr' => 38
           }
         },
         {
@@ -1178,8 +1134,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'cmdname' => 'atchar',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 42,
-                    'macro' => ''
+                    'line_nr' => 42
                   },
                   'type' => 'command_as_argument'
                 }
@@ -1217,8 +1172,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               }
             },
             {
@@ -1249,8 +1203,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             }
           ],
@@ -1264,8 +1217,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 42,
-            'macro' => ''
+            'line_nr' => 42
           }
         },
         {
@@ -1286,8 +1238,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'cmdname' => 'atchar',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 46,
-                    'macro' => ''
+                    'line_nr' => 46
                   }
                 },
                 {
@@ -1326,8 +1277,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'cmdname' => 'atchar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 47,
-                        'macro' => ''
+                        'line_nr' => 47
                       }
                     },
                     {
@@ -1343,8 +1293,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               }
             },
             {
@@ -1375,8 +1324,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               }
             }
           ],
@@ -1387,8 +1335,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 46,
-            'macro' => ''
+            'line_nr' => 46
           }
         },
         {
@@ -1443,8 +1390,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 51,
-                'macro' => ''
+                'line_nr' => 51
               }
             },
             {
@@ -1475,8 +1421,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               }
             }
           ],
@@ -1487,8 +1432,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 50,
-            'macro' => ''
+            'line_nr' => 50
           }
         },
         {
@@ -1543,8 +1487,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 55,
-                'macro' => ''
+                'line_nr' => 55
               }
             },
             {
@@ -1575,8 +1518,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             }
           ],
@@ -1587,8 +1529,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 54,
-            'macro' => ''
+            'line_nr' => 54
           }
         },
         {
@@ -1609,8 +1550,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'cmdname' => 'registeredsymbol',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 58,
-                    'macro' => ''
+                    'line_nr' => 58
                   },
                   'type' => 'command_as_argument'
                 }
@@ -1647,8 +1587,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'cmdname' => 'registeredsymbol',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 59,
-                        'macro' => ''
+                        'line_nr' => 59
                       }
                     },
                     {
@@ -1664,8 +1603,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             },
             {
@@ -1696,8 +1634,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 60,
-                'macro' => ''
+                'line_nr' => 60
               }
             }
           ],
@@ -1711,8 +1648,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 58,
-            'macro' => ''
+            'line_nr' => 58
           }
         },
         {
@@ -1733,8 +1669,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'cmdname' => 'registeredsymbol',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 62,
-                    'macro' => ''
+                    'line_nr' => 62
                   }
                 },
                 {
@@ -1773,8 +1708,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'cmdname' => 'registeredsymbol',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 63,
-                        'macro' => ''
+                        'line_nr' => 63
                       }
                     },
                     {
@@ -1790,8 +1724,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 63,
-                'macro' => ''
+                'line_nr' => 63
               }
             },
             {
@@ -1822,8 +1755,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             }
           ],
@@ -1834,8 +1766,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 62,
-            'macro' => ''
+            'line_nr' => 62
           }
         },
         {
@@ -1856,8 +1787,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'cmdname' => 'enddots',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 66,
-                    'macro' => ''
+                    'line_nr' => 66
                   },
                   'type' => 'command_as_argument'
                 }
@@ -1894,8 +1824,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'cmdname' => 'enddots',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 67,
-                        'macro' => ''
+                        'line_nr' => 67
                       }
                     },
                     {
@@ -1911,8 +1840,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 67,
-                'macro' => ''
+                'line_nr' => 67
               }
             },
             {
@@ -1943,8 +1871,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 68,
-                'macro' => ''
+                'line_nr' => 68
               }
             }
           ],
@@ -1958,8 +1885,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 66,
-            'macro' => ''
+            'line_nr' => 66
           }
         },
         {
@@ -1980,8 +1906,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'cmdname' => 'enddots',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 70,
-                    'macro' => ''
+                    'line_nr' => 70
                   }
                 },
                 {
@@ -2020,8 +1945,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'cmdname' => 'enddots',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 71,
-                        'macro' => ''
+                        'line_nr' => 71
                       }
                     },
                     {
@@ -2037,8 +1961,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             },
             {
@@ -2069,8 +1992,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 72,
-                'macro' => ''
+                'line_nr' => 72
               }
             }
           ],
@@ -2081,8 +2003,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 70,
-            'macro' => ''
+            'line_nr' => 70
           }
         },
         {
@@ -2108,8 +2029,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 74,
-                    'macro' => ''
+                    'line_nr' => 74
                   }
                 },
                 {
@@ -2133,8 +2053,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                           'cmdname' => '^',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 74,
-                            'macro' => ''
+                            'line_nr' => 74
                           }
                         }
                       ],
@@ -2144,8 +2063,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'cmdname' => 'sc',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 74,
-                    'macro' => ''
+                    'line_nr' => 74
                   }
                 }
               ],
@@ -2186,8 +2104,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 75,
-                        'macro' => ''
+                        'line_nr' => 75
                       }
                     },
                     {
@@ -2211,8 +2128,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                               'cmdname' => '^',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 75,
-                                'macro' => ''
+                                'line_nr' => 75
                               }
                             }
                           ],
@@ -2222,8 +2138,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'cmdname' => 'sc',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 75,
-                        'macro' => ''
+                        'line_nr' => 75
                       }
                     },
                     {
@@ -2239,8 +2154,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 75,
-                'macro' => ''
+                'line_nr' => 75
               }
             },
             {
@@ -2271,8 +2185,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 76,
-                'macro' => ''
+                'line_nr' => 76
               }
             }
           ],
@@ -2283,8 +2196,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 74,
-            'macro' => ''
+            'line_nr' => 74
           }
         },
         {
@@ -2310,8 +2222,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 78,
-                    'macro' => ''
+                    'line_nr' => 78
                   }
                 },
                 {
@@ -2335,8 +2246,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                           'cmdname' => '^',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 78,
-                            'macro' => ''
+                            'line_nr' => 78
                           }
                         }
                       ],
@@ -2346,8 +2256,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'cmdname' => 'sc',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 78,
-                    'macro' => ''
+                    'line_nr' => 78
                   }
                 }
               ],
@@ -2388,8 +2297,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 79,
-                        'macro' => ''
+                        'line_nr' => 79
                       }
                     },
                     {
@@ -2413,8 +2321,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                               'cmdname' => '^',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 79,
-                                'macro' => ''
+                                'line_nr' => 79
                               }
                             }
                           ],
@@ -2424,8 +2331,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'cmdname' => 'sc',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 79,
-                        'macro' => ''
+                        'line_nr' => 79
                       }
                     },
                     {
@@ -2441,8 +2347,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 79,
-                'macro' => ''
+                'line_nr' => 79
               }
             },
             {
@@ -2473,8 +2378,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 80,
-                'macro' => ''
+                'line_nr' => 80
               }
             }
           ],
@@ -2485,8 +2389,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 78,
-            'macro' => ''
+            'line_nr' => 78
           }
         },
         {
@@ -2516,8 +2419,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                           'cmdname' => 'dotless',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 82,
-                            'macro' => ''
+                            'line_nr' => 82
                           }
                         }
                       ],
@@ -2527,8 +2429,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'cmdname' => '~',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 82,
-                    'macro' => ''
+                    'line_nr' => 82
                   }
                 },
                 {
@@ -2548,8 +2449,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'cmdname' => 'dotless',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 82,
-                    'macro' => ''
+                    'line_nr' => 82
                   }
                 },
                 {
@@ -2577,8 +2477,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                                   'cmdname' => 'dotless',
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 82,
-                                    'macro' => ''
+                                    'line_nr' => 82
                                   }
                                 }
                               ],
@@ -2588,8 +2487,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                           'cmdname' => '~',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 82,
-                            'macro' => ''
+                            'line_nr' => 82
                           }
                         },
                         {
@@ -2609,8 +2507,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                           'cmdname' => 'dotless',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 82,
-                            'macro' => ''
+                            'line_nr' => 82
                           }
                         }
                       ],
@@ -2620,8 +2517,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'cmdname' => 'sc',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 82,
-                    'macro' => ''
+                    'line_nr' => 82
                   }
                 }
               ],
@@ -2666,8 +2562,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 83,
-                                'macro' => ''
+                                'line_nr' => 83
                               }
                             }
                           ],
@@ -2677,8 +2572,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 83,
-                        'macro' => ''
+                        'line_nr' => 83
                       }
                     },
                     {
@@ -2698,8 +2592,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 83,
-                        'macro' => ''
+                        'line_nr' => 83
                       }
                     },
                     {
@@ -2727,8 +2620,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                                       'cmdname' => 'dotless',
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 83,
-                                        'macro' => ''
+                                        'line_nr' => 83
                                       }
                                     }
                                   ],
@@ -2738,8 +2630,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                               'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 83,
-                                'macro' => ''
+                                'line_nr' => 83
                               }
                             },
                             {
@@ -2759,8 +2650,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 83,
-                                'macro' => ''
+                                'line_nr' => 83
                               }
                             }
                           ],
@@ -2770,8 +2660,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'cmdname' => 'sc',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 83,
-                        'macro' => ''
+                        'line_nr' => 83
                       }
                     },
                     {
@@ -2787,8 +2676,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 83,
-                'macro' => ''
+                'line_nr' => 83
               }
             },
             {
@@ -2819,8 +2707,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 84,
-                'macro' => ''
+                'line_nr' => 84
               }
             }
           ],
@@ -2831,8 +2718,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 82,
-            'macro' => ''
+            'line_nr' => 82
           }
         },
         {
@@ -2858,8 +2744,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'cmdname' => 'udotaccent',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 86,
-                    'macro' => ''
+                    'line_nr' => 86
                   }
                 },
                 {
@@ -2883,8 +2768,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                           'cmdname' => '\'',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 86,
-                            'macro' => ''
+                            'line_nr' => 86
                           }
                         }
                       ],
@@ -2894,8 +2778,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'cmdname' => 'v',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 86,
-                    'macro' => ''
+                    'line_nr' => 86
                   }
                 },
                 {
@@ -2919,8 +2802,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                           'cmdname' => 'udotaccent',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 86,
-                            'macro' => ''
+                            'line_nr' => 86
                           }
                         },
                         {
@@ -2944,8 +2826,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                                   'cmdname' => '\'',
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 86,
-                                    'macro' => ''
+                                    'line_nr' => 86
                                   }
                                 }
                               ],
@@ -2955,8 +2836,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                           'cmdname' => 'v',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 86,
-                            'macro' => ''
+                            'line_nr' => 86
                           }
                         }
                       ],
@@ -2966,8 +2846,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'cmdname' => 'sc',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 86,
-                    'macro' => ''
+                    'line_nr' => 86
                   }
                 }
               ],
@@ -3008,8 +2887,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 87,
-                        'macro' => ''
+                        'line_nr' => 87
                       }
                     },
                     {
@@ -3033,8 +2911,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                               'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 87,
-                                'macro' => ''
+                                'line_nr' => 87
                               }
                             }
                           ],
@@ -3044,8 +2921,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 87,
-                        'macro' => ''
+                        'line_nr' => 87
                       }
                     },
                     {
@@ -3069,8 +2945,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                               'cmdname' => 'udotaccent',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 87,
-                                'macro' => ''
+                                'line_nr' => 87
                               }
                             },
                             {
@@ -3094,8 +2969,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                                       'cmdname' => '\'',
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 87,
-                                        'macro' => ''
+                                        'line_nr' => 87
                                       }
                                     }
                                   ],
@@ -3105,8 +2979,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                               'cmdname' => 'v',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 87,
-                                'macro' => ''
+                                'line_nr' => 87
                               }
                             }
                           ],
@@ -3116,8 +2989,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'cmdname' => 'sc',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 87,
-                        'macro' => ''
+                        'line_nr' => 87
                       }
                     },
                     {
@@ -3133,8 +3005,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 87,
-                'macro' => ''
+                'line_nr' => 87
               }
             },
             {
@@ -3165,8 +3036,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 88,
-                'macro' => ''
+                'line_nr' => 88
               }
             }
           ],
@@ -3177,8 +3047,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 86,
-            'macro' => ''
+            'line_nr' => 86
           }
         },
         {
@@ -3212,8 +3081,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                                   'cmdname' => '~',
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 90,
-                                    'macro' => ''
+                                    'line_nr' => 90
                                   }
                                 }
                               ],
@@ -3223,8 +3091,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                           'cmdname' => ',',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 90,
-                            'macro' => ''
+                            'line_nr' => 90
                           }
                         }
                       ],
@@ -3234,8 +3101,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'cmdname' => '=',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 90,
-                    'macro' => ''
+                    'line_nr' => 90
                   }
                 },
                 {
@@ -3270,8 +3136,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                                           'cmdname' => '~',
                                           'source_info' => {
                                             'file_name' => '',
-                                            'line_nr' => 90,
-                                            'macro' => ''
+                                            'line_nr' => 90
                                           }
                                         }
                                       ],
@@ -3281,8 +3146,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                                   'cmdname' => ',',
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 90,
-                                    'macro' => ''
+                                    'line_nr' => 90
                                   }
                                 }
                               ],
@@ -3292,8 +3156,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                           'cmdname' => '=',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 90,
-                            'macro' => ''
+                            'line_nr' => 90
                           }
                         }
                       ],
@@ -3303,8 +3166,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'cmdname' => 'sc',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 90,
-                    'macro' => ''
+                    'line_nr' => 90
                   }
                 }
               ],
@@ -3353,8 +3215,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                                       'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 91,
-                                        'macro' => ''
+                                        'line_nr' => 91
                                       }
                                     }
                                   ],
@@ -3364,8 +3225,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                               'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 91,
-                                'macro' => ''
+                                'line_nr' => 91
                               }
                             }
                           ],
@@ -3375,8 +3235,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 91,
-                        'macro' => ''
+                        'line_nr' => 91
                       }
                     },
                     {
@@ -3411,8 +3270,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                                               'cmdname' => '~',
                                               'source_info' => {
                                                 'file_name' => '',
-                                                'line_nr' => 91,
-                                                'macro' => ''
+                                                'line_nr' => 91
                                               }
                                             }
                                           ],
@@ -3422,8 +3280,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                                       'cmdname' => ',',
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 91,
-                                        'macro' => ''
+                                        'line_nr' => 91
                                       }
                                     }
                                   ],
@@ -3433,8 +3290,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                               'cmdname' => '=',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 91,
-                                'macro' => ''
+                                'line_nr' => 91
                               }
                             }
                           ],
@@ -3444,8 +3300,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'cmdname' => 'sc',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 91,
-                        'macro' => ''
+                        'line_nr' => 91
                       }
                     },
                     {
@@ -3461,8 +3316,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 91,
-                'macro' => ''
+                'line_nr' => 91
               }
             },
             {
@@ -3493,8 +3347,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 92,
-                'macro' => ''
+                'line_nr' => 92
               }
             }
           ],
@@ -3505,8 +3358,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 90,
-            'macro' => ''
+            'line_nr' => 90
           }
         },
         {
@@ -3522,8 +3374,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'cmdname' => 'asis',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 94,
-                    'macro' => ''
+                    'line_nr' => 94
                   },
                   'type' => 'command_as_argument'
                 }
@@ -3560,8 +3411,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 95,
-                        'macro' => ''
+                        'line_nr' => 95
                       }
                     },
                     {
@@ -3577,8 +3427,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 95,
-                'macro' => ''
+                'line_nr' => 95
               }
             },
             {
@@ -3609,8 +3458,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 96,
-                'macro' => ''
+                'line_nr' => 96
               }
             }
           ],
@@ -3624,8 +3472,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 94,
-            'macro' => ''
+            'line_nr' => 94
           }
         },
         {
@@ -3649,8 +3496,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 98,
-                    'macro' => ''
+                    'line_nr' => 98
                   },
                   'type' => 'command_as_argument'
                 }
@@ -3690,8 +3536,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 99,
-                        'macro' => ''
+                        'line_nr' => 99
                       }
                     },
                     {
@@ -3707,8 +3552,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 99,
-                'macro' => ''
+                'line_nr' => 99
               }
             },
             {
@@ -3739,8 +3583,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 100,
-                'macro' => ''
+                'line_nr' => 100
               }
             }
           ],
@@ -3754,8 +3597,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 98,
-            'macro' => ''
+            'line_nr' => 98
           }
         },
         {
@@ -3779,8 +3621,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 102,
-                    'macro' => ''
+                    'line_nr' => 102
                   }
                 },
                 {
@@ -3822,8 +3663,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 103,
-                        'macro' => ''
+                        'line_nr' => 103
                       }
                     },
                     {
@@ -3839,8 +3679,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 103,
-                'macro' => ''
+                'line_nr' => 103
               }
             },
             {
@@ -3871,8 +3710,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 104,
-                'macro' => ''
+                'line_nr' => 104
               }
             }
           ],
@@ -3883,8 +3721,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 102,
-            'macro' => ''
+            'line_nr' => 102
           }
         },
         {
@@ -3906,8 +3743,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 106,
-            'macro' => ''
+            'line_nr' => 106
           }
         },
         {
@@ -3931,8 +3767,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 108,
-                    'macro' => ''
+                    'line_nr' => 108
                   },
                   'type' => 'command_as_argument'
                 }
@@ -3972,8 +3807,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 109,
-                        'macro' => ''
+                        'line_nr' => 109
                       }
                     },
                     {
@@ -3989,8 +3823,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 109,
-                'macro' => ''
+                'line_nr' => 109
               }
             },
             {
@@ -4021,8 +3854,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 110,
-                'macro' => ''
+                'line_nr' => 110
               }
             }
           ],
@@ -4036,8 +3868,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 108,
-            'macro' => ''
+            'line_nr' => 108
           }
         },
         {
@@ -4061,8 +3892,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 112,
-                    'macro' => ''
+                    'line_nr' => 112
                   }
                 },
                 {
@@ -4104,8 +3934,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 113,
-                        'macro' => ''
+                        'line_nr' => 113
                       }
                     },
                     {
@@ -4121,8 +3950,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 113,
-                'macro' => ''
+                'line_nr' => 113
               }
             },
             {
@@ -4153,8 +3981,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 114,
-                'macro' => ''
+                'line_nr' => 114
               }
             }
           ],
@@ -4165,8 +3992,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 112,
-            'macro' => ''
+            'line_nr' => 112
           }
         },
         {
@@ -4187,8 +4013,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'cmdname' => 'error',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 116,
-                    'macro' => ''
+                    'line_nr' => 116
                   },
                   'type' => 'command_as_argument'
                 }
@@ -4225,8 +4050,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'cmdname' => 'error',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 117,
-                        'macro' => ''
+                        'line_nr' => 117
                       }
                     },
                     {
@@ -4242,8 +4066,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 117,
-                'macro' => ''
+                'line_nr' => 117
               }
             },
             {
@@ -4274,8 +4097,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 118,
-                'macro' => ''
+                'line_nr' => 118
               }
             }
           ],
@@ -4289,8 +4111,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 116,
-            'macro' => ''
+            'line_nr' => 116
           }
         },
         {
@@ -4311,8 +4132,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'cmdname' => 'error',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 120,
-                    'macro' => ''
+                    'line_nr' => 120
                   }
                 },
                 {
@@ -4351,8 +4171,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'cmdname' => 'error',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 121,
-                        'macro' => ''
+                        'line_nr' => 121
                       }
                     },
                     {
@@ -4368,8 +4187,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 121,
-                'macro' => ''
+                'line_nr' => 121
               }
             },
             {
@@ -4400,8 +4218,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 122,
-                'macro' => ''
+                'line_nr' => 122
               }
             }
           ],
@@ -4412,8 +4229,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 120,
-            'macro' => ''
+            'line_nr' => 120
           }
         },
         {
@@ -4449,8 +4265,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 124,
-            'macro' => ''
+            'line_nr' => 124
           }
         },
         {
@@ -4466,8 +4281,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'cmdname' => 'error',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 125,
-                    'macro' => ''
+                    'line_nr' => 125
                   },
                   'type' => 'command_as_argument'
                 }
@@ -4504,8 +4318,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'cmdname' => 'error',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 126,
-                        'macro' => ''
+                        'line_nr' => 126
                       }
                     },
                     {
@@ -4521,8 +4334,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 126,
-                'macro' => ''
+                'line_nr' => 126
               }
             },
             {
@@ -4553,8 +4365,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 127,
-                'macro' => ''
+                'line_nr' => 127
               }
             }
           ],
@@ -4568,8 +4379,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 125,
-            'macro' => ''
+            'line_nr' => 125
           }
         },
         {
@@ -4590,8 +4400,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'cmdname' => 'error',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 129,
-                    'macro' => ''
+                    'line_nr' => 129
                   }
                 },
                 {
@@ -4630,8 +4439,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'cmdname' => 'error',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 130,
-                        'macro' => ''
+                        'line_nr' => 130
                       }
                     },
                     {
@@ -4647,8 +4455,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 130,
-                'macro' => ''
+                'line_nr' => 130
               }
             },
             {
@@ -4679,8 +4486,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 131,
-                'macro' => ''
+                'line_nr' => 131
               }
             }
           ],
@@ -4691,8 +4497,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 129,
-            'macro' => ''
+            'line_nr' => 129
           }
         },
         {
diff --git a/tp/t/results/html_tests/mathjax_with_texinfo.pl 
b/tp/t/results/html_tests/mathjax_with_texinfo.pl
index 7fd4166538..a67ecb6616 100644
--- a/tp/t/results/html_tests/mathjax_with_texinfo.pl
+++ b/tp/t/results/html_tests/mathjax_with_texinfo.pl
@@ -41,8 +41,7 @@ $result_trees{'mathjax_with_texinfo'} = {
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       },
                       'type' => 'balanced_braces'
                     },
@@ -60,8 +59,7 @@ $result_trees{'mathjax_with_texinfo'} = {
                           'cmdname' => 'copyright',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 2,
-                            'macro' => ''
+                            'line_nr' => 2
                           }
                         },
                         {
@@ -70,8 +68,7 @@ $result_trees{'mathjax_with_texinfo'} = {
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       },
                       'type' => 'balanced_braces'
                     }
@@ -82,8 +79,7 @@ $result_trees{'mathjax_with_texinfo'} = {
               'cmdname' => 'sup',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -103,8 +99,7 @@ $result_trees{'mathjax_with_texinfo'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -139,15 +134,13 @@ $result_trees{'mathjax_with_texinfo'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -176,8 +169,7 @@ $result_trees{'mathjax_with_texinfo'} = {
                       'cmdname' => 'minus',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -192,8 +184,7 @@ $result_trees{'mathjax_with_texinfo'} = {
                       'cmdname' => 'geq',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -208,8 +199,7 @@ $result_trees{'mathjax_with_texinfo'} = {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -229,8 +219,7 @@ $result_trees{'mathjax_with_texinfo'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
@@ -240,8 +229,7 @@ $result_trees{'mathjax_with_texinfo'} = {
               'cmdname' => 'math',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
diff --git a/tp/t/results/html_tests/mathjax_with_texinfo_enable_encoding.pl 
b/tp/t/results/html_tests/mathjax_with_texinfo_enable_encoding.pl
index 33a347b101..05d9929e8c 100644
--- a/tp/t/results/html_tests/mathjax_with_texinfo_enable_encoding.pl
+++ b/tp/t/results/html_tests/mathjax_with_texinfo_enable_encoding.pl
@@ -44,8 +44,7 @@ $result_trees{'mathjax_with_texinfo_enable_encoding'} = {
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       },
                       'type' => 'balanced_braces'
                     },
@@ -63,8 +62,7 @@ $result_trees{'mathjax_with_texinfo_enable_encoding'} = {
                           'cmdname' => 'copyright',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 2,
-                            'macro' => ''
+                            'line_nr' => 2
                           }
                         },
                         {
@@ -73,8 +71,7 @@ $result_trees{'mathjax_with_texinfo_enable_encoding'} = {
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       },
                       'type' => 'balanced_braces'
                     }
@@ -85,8 +82,7 @@ $result_trees{'mathjax_with_texinfo_enable_encoding'} = {
               'cmdname' => 'sup',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -106,8 +102,7 @@ $result_trees{'mathjax_with_texinfo_enable_encoding'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -142,15 +137,13 @@ $result_trees{'mathjax_with_texinfo_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -179,8 +172,7 @@ $result_trees{'mathjax_with_texinfo_enable_encoding'} = {
                       'cmdname' => 'minus',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -195,8 +187,7 @@ $result_trees{'mathjax_with_texinfo_enable_encoding'} = {
                       'cmdname' => 'geq',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -211,8 +202,7 @@ $result_trees{'mathjax_with_texinfo_enable_encoding'} = {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -232,8 +222,7 @@ $result_trees{'mathjax_with_texinfo_enable_encoding'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
@@ -243,8 +232,7 @@ $result_trees{'mathjax_with_texinfo_enable_encoding'} = {
               'cmdname' => 'math',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
diff --git a/tp/t/results/html_tests/mathjax_with_texinfo_html_file.pl 
b/tp/t/results/html_tests/mathjax_with_texinfo_html_file.pl
index dd9ae5ba7f..f0b27fe5d1 100644
--- a/tp/t/results/html_tests/mathjax_with_texinfo_html_file.pl
+++ b/tp/t/results/html_tests/mathjax_with_texinfo_html_file.pl
@@ -44,8 +44,7 @@ $result_trees{'mathjax_with_texinfo_html_file'} = {
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       },
                       'type' => 'balanced_braces'
                     },
@@ -63,8 +62,7 @@ $result_trees{'mathjax_with_texinfo_html_file'} = {
                           'cmdname' => 'copyright',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 2,
-                            'macro' => ''
+                            'line_nr' => 2
                           }
                         },
                         {
@@ -73,8 +71,7 @@ $result_trees{'mathjax_with_texinfo_html_file'} = {
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       },
                       'type' => 'balanced_braces'
                     }
@@ -85,8 +82,7 @@ $result_trees{'mathjax_with_texinfo_html_file'} = {
               'cmdname' => 'sup',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -106,8 +102,7 @@ $result_trees{'mathjax_with_texinfo_html_file'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -142,15 +137,13 @@ $result_trees{'mathjax_with_texinfo_html_file'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -179,8 +172,7 @@ $result_trees{'mathjax_with_texinfo_html_file'} = {
                       'cmdname' => 'minus',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -195,8 +187,7 @@ $result_trees{'mathjax_with_texinfo_html_file'} = {
                       'cmdname' => 'geq',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -211,8 +202,7 @@ $result_trees{'mathjax_with_texinfo_html_file'} = {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -232,8 +222,7 @@ $result_trees{'mathjax_with_texinfo_html_file'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
@@ -243,8 +232,7 @@ $result_trees{'mathjax_with_texinfo_html_file'} = {
               'cmdname' => 'math',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
diff --git a/tp/t/results/html_tests/mathjax_with_texinfo_html_text.pl 
b/tp/t/results/html_tests/mathjax_with_texinfo_html_text.pl
index d236e05b07..06c435ce62 100644
--- a/tp/t/results/html_tests/mathjax_with_texinfo_html_text.pl
+++ b/tp/t/results/html_tests/mathjax_with_texinfo_html_text.pl
@@ -41,8 +41,7 @@ $result_trees{'mathjax_with_texinfo_html_text'} = {
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       },
                       'type' => 'balanced_braces'
                     },
@@ -60,8 +59,7 @@ $result_trees{'mathjax_with_texinfo_html_text'} = {
                           'cmdname' => 'copyright',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 2,
-                            'macro' => ''
+                            'line_nr' => 2
                           }
                         },
                         {
@@ -70,8 +68,7 @@ $result_trees{'mathjax_with_texinfo_html_text'} = {
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       },
                       'type' => 'balanced_braces'
                     }
@@ -82,8 +79,7 @@ $result_trees{'mathjax_with_texinfo_html_text'} = {
               'cmdname' => 'sup',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -103,8 +99,7 @@ $result_trees{'mathjax_with_texinfo_html_text'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -139,15 +134,13 @@ $result_trees{'mathjax_with_texinfo_html_text'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -176,8 +169,7 @@ $result_trees{'mathjax_with_texinfo_html_text'} = {
                       'cmdname' => 'minus',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -192,8 +184,7 @@ $result_trees{'mathjax_with_texinfo_html_text'} = {
                       'cmdname' => 'geq',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -208,8 +199,7 @@ $result_trees{'mathjax_with_texinfo_html_text'} = {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -229,8 +219,7 @@ $result_trees{'mathjax_with_texinfo_html_text'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
@@ -240,8 +229,7 @@ $result_trees{'mathjax_with_texinfo_html_text'} = {
               'cmdname' => 'math',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
diff --git 
a/tp/t/results/html_tests/mathjax_with_texinfo_no_convert_to_latex.pl 
b/tp/t/results/html_tests/mathjax_with_texinfo_no_convert_to_latex.pl
index e4d9b5d08a..9d6cd0b1c6 100644
--- a/tp/t/results/html_tests/mathjax_with_texinfo_no_convert_to_latex.pl
+++ b/tp/t/results/html_tests/mathjax_with_texinfo_no_convert_to_latex.pl
@@ -41,8 +41,7 @@ $result_trees{'mathjax_with_texinfo_no_convert_to_latex'} = {
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       },
                       'type' => 'balanced_braces'
                     },
@@ -60,8 +59,7 @@ $result_trees{'mathjax_with_texinfo_no_convert_to_latex'} = {
                           'cmdname' => 'copyright',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 2,
-                            'macro' => ''
+                            'line_nr' => 2
                           }
                         },
                         {
@@ -70,8 +68,7 @@ $result_trees{'mathjax_with_texinfo_no_convert_to_latex'} = {
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       },
                       'type' => 'balanced_braces'
                     }
@@ -82,8 +79,7 @@ $result_trees{'mathjax_with_texinfo_no_convert_to_latex'} = {
               'cmdname' => 'sup',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -103,8 +99,7 @@ $result_trees{'mathjax_with_texinfo_no_convert_to_latex'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -139,15 +134,13 @@ $result_trees{'mathjax_with_texinfo_no_convert_to_latex'} 
= {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -176,8 +169,7 @@ $result_trees{'mathjax_with_texinfo_no_convert_to_latex'} = 
{
                       'cmdname' => 'minus',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -192,8 +184,7 @@ $result_trees{'mathjax_with_texinfo_no_convert_to_latex'} = 
{
                       'cmdname' => 'geq',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -208,8 +199,7 @@ $result_trees{'mathjax_with_texinfo_no_convert_to_latex'} = 
{
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -229,8 +219,7 @@ $result_trees{'mathjax_with_texinfo_no_convert_to_latex'} = 
{
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
@@ -240,8 +229,7 @@ $result_trees{'mathjax_with_texinfo_no_convert_to_latex'} = 
{
               'cmdname' => 'math',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
diff --git a/tp/t/results/html_tests/menu.pl b/tp/t/results/html_tests/menu.pl
index 26dbbf195c..792cee66a8 100644
--- a/tp/t/results/html_tests/menu.pl
+++ b/tp/t/results/html_tests/menu.pl
@@ -46,8 +46,7 @@ $result_trees{'menu'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -167,8 +166,7 @@ $result_trees{'menu'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 8,
-                            'macro' => ''
+                            'line_nr' => 8
                           }
                         },
                         {
@@ -199,8 +197,7 @@ $result_trees{'menu'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 9,
-                            'macro' => ''
+                            'line_nr' => 9
                           }
                         }
                       ],
@@ -209,8 +206,7 @@ $result_trees{'menu'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     },
                     {
@@ -266,15 +262,13 @@ $result_trees{'menu'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 12,
-                                'macro' => ''
+                                'line_nr' => 12
                               }
                             }
                           ],
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 10,
-                            'macro' => ''
+                            'line_nr' => 10
                           }
                         },
                         {
@@ -290,8 +284,7 @@ $result_trees{'menu'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -358,8 +351,7 @@ $result_trees{'menu'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       }
                     },
                     {
@@ -390,8 +382,7 @@ $result_trees{'menu'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 19,
-                        'macro' => ''
+                        'line_nr' => 19
                       }
                     }
                   ],
@@ -400,8 +391,7 @@ $result_trees{'menu'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 17,
-                    'macro' => ''
+                    'line_nr' => 17
                   }
                 },
                 {
@@ -462,15 +452,13 @@ $result_trees{'menu'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 23,
-                            'macro' => ''
+                            'line_nr' => 23
                           }
                         }
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 21,
-                        'macro' => ''
+                        'line_nr' => 21
                       }
                     },
                     {
@@ -532,8 +520,7 @@ $result_trees{'menu'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       }
                     },
                     {
@@ -564,8 +551,7 @@ $result_trees{'menu'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 29,
-                        'macro' => ''
+                        'line_nr' => 29
                       }
                     }
                   ],
@@ -574,8 +560,7 @@ $result_trees{'menu'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 27,
-                    'macro' => ''
+                    'line_nr' => 27
                   }
                 }
               ],
@@ -629,8 +614,7 @@ $result_trees{'menu'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               },
               'type' => 'menu_entry'
             },
@@ -710,8 +694,7 @@ $result_trees{'menu'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               },
               'type' => 'menu_entry'
             },
@@ -763,8 +746,7 @@ $result_trees{'menu'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               },
               'type' => 'menu_entry'
             },
@@ -881,8 +863,7 @@ $result_trees{'menu'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 41,
-                                'macro' => ''
+                                'line_nr' => 41
                               }
                             },
                             {
@@ -913,8 +894,7 @@ $result_trees{'menu'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 42,
-                                'macro' => ''
+                                'line_nr' => 42
                               }
                             }
                           ],
@@ -923,8 +903,7 @@ $result_trees{'menu'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 40,
-                            'macro' => ''
+                            'line_nr' => 40
                           }
                         },
                         {
@@ -980,15 +959,13 @@ $result_trees{'menu'} = {
                                   },
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 45,
-                                    'macro' => ''
+                                    'line_nr' => 45
                                   }
                                 }
                               ],
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 43,
-                                'macro' => ''
+                                'line_nr' => 43
                               }
                             },
                             {
@@ -1004,8 +981,7 @@ $result_trees{'menu'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 39,
-                    'macro' => ''
+                    'line_nr' => 39
                   },
                   'type' => 'menu_entry'
                 },
@@ -1072,8 +1048,7 @@ $result_trees{'menu'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 51,
-                            'macro' => ''
+                            'line_nr' => 51
                           }
                         },
                         {
@@ -1104,8 +1079,7 @@ $result_trees{'menu'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 52,
-                            'macro' => ''
+                            'line_nr' => 52
                           }
                         }
                       ],
@@ -1114,8 +1088,7 @@ $result_trees{'menu'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 50,
-                        'macro' => ''
+                        'line_nr' => 50
                       }
                     },
                     {
@@ -1176,15 +1149,13 @@ $result_trees{'menu'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 56,
-                                'macro' => ''
+                                'line_nr' => 56
                               }
                             }
                           ],
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 54,
-                            'macro' => ''
+                            'line_nr' => 54
                           }
                         },
                         {
@@ -1246,8 +1217,7 @@ $result_trees{'menu'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 61,
-                            'macro' => ''
+                            'line_nr' => 61
                           }
                         },
                         {
@@ -1278,8 +1248,7 @@ $result_trees{'menu'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 62,
-                            'macro' => ''
+                            'line_nr' => 62
                           }
                         }
                       ],
@@ -1288,8 +1257,7 @@ $result_trees{'menu'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 60,
-                        'macro' => ''
+                        'line_nr' => 60
                       }
                     }
                   ],
@@ -1343,8 +1311,7 @@ $result_trees{'menu'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 63,
-                    'macro' => ''
+                    'line_nr' => 63
                   },
                   'type' => 'menu_entry'
                 },
@@ -1424,8 +1391,7 @@ $result_trees{'menu'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 67,
-                    'macro' => ''
+                    'line_nr' => 67
                   },
                   'type' => 'menu_entry'
                 },
@@ -1477,8 +1443,7 @@ $result_trees{'menu'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 69,
-                    'macro' => ''
+                    'line_nr' => 69
                   },
                   'type' => 'menu_entry'
                 },
@@ -1525,15 +1490,13 @@ $result_trees{'menu'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 71,
-                    'macro' => ''
+                    'line_nr' => 71
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               }
             },
             {
@@ -1564,23 +1527,20 @@ $result_trees{'menu'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 72,
-                'macro' => ''
+                'line_nr' => 72
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
       'extra' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     }
   ],
diff --git a/tp/t/results/html_tests/menu_in_example.pl 
b/tp/t/results/html_tests/menu_in_example.pl
index 13fb002f85..199fd3d28a 100644
--- a/tp/t/results/html_tests/menu_in_example.pl
+++ b/tp/t/results/html_tests/menu_in_example.pl
@@ -155,15 +155,13 @@ $result_trees{'menu_in_example'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 8,
-                                'macro' => ''
+                                'line_nr' => 8
                               }
                             }
                           ],
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 6,
-                            'macro' => ''
+                            'line_nr' => 6
                           }
                         }
                       ],
@@ -172,8 +170,7 @@ $result_trees{'menu_in_example'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   },
                   'type' => 'menu_entry'
                 },
@@ -240,15 +237,13 @@ $result_trees{'menu_in_example'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 12,
-                            'macro' => ''
+                            'line_nr' => 12
                           }
                         }
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     },
                     {
@@ -324,8 +319,7 @@ $result_trees{'menu_in_example'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 14,
-                    'macro' => ''
+                    'line_nr' => 14
                   },
                   'type' => 'menu_entry'
                 },
@@ -401,8 +395,7 @@ $result_trees{'menu_in_example'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 15,
-                    'macro' => ''
+                    'line_nr' => 15
                   },
                   'type' => 'menu_entry'
                 },
@@ -434,15 +427,13 @@ $result_trees{'menu_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 16,
-                    'macro' => ''
+                    'line_nr' => 16
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -473,15 +464,13 @@ $result_trees{'menu_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         }
       ],
@@ -496,8 +485,7 @@ $result_trees{'menu_in_example'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
@@ -562,7 +550,6 @@ $result_errors{'menu_in_example'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '@menu in invalid context',
     'type' => 'warning'
   }
diff --git a/tp/t/results/html_tests/no_content.pl 
b/tp/t/results/html_tests/no_content.pl
index c50b0e140d..2075aa50f1 100644
--- a/tp/t/results/html_tests/no_content.pl
+++ b/tp/t/results/html_tests/no_content.pl
@@ -59,8 +59,7 @@ $result_trees{'no_content'} = {
       },
       'source_info' => {
         'file_name' => 'no_content.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -158,8 +157,7 @@ $result_trees{'no_content'} = {
               ],
               'source_info' => {
                 'file_name' => 'no_content.texi',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -191,15 +189,13 @@ $result_trees{'no_content'} = {
               },
               'source_info' => {
                 'file_name' => 'no_content.texi',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
           'source_info' => {
             'file_name' => 'no_content.texi',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -216,8 +212,7 @@ $result_trees{'no_content'} = {
       },
       'source_info' => {
         'file_name' => 'no_content.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -249,8 +244,7 @@ $result_trees{'no_content'} = {
       },
       'source_info' => {
         'file_name' => 'no_content.texi',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -302,8 +296,7 @@ $result_trees{'no_content'} = {
       },
       'source_info' => {
         'file_name' => 'no_content.texi',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
diff --git a/tp/t/results/html_tests/no_content_do_contents.pl 
b/tp/t/results/html_tests/no_content_do_contents.pl
index bf5c60467d..b8470918d7 100644
--- a/tp/t/results/html_tests/no_content_do_contents.pl
+++ b/tp/t/results/html_tests/no_content_do_contents.pl
@@ -59,8 +59,7 @@ $result_trees{'no_content_do_contents'} = {
       },
       'source_info' => {
         'file_name' => 'no_content.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -158,8 +157,7 @@ $result_trees{'no_content_do_contents'} = {
               ],
               'source_info' => {
                 'file_name' => 'no_content.texi',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -191,15 +189,13 @@ $result_trees{'no_content_do_contents'} = {
               },
               'source_info' => {
                 'file_name' => 'no_content.texi',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
           'source_info' => {
             'file_name' => 'no_content.texi',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -216,8 +212,7 @@ $result_trees{'no_content_do_contents'} = {
       },
       'source_info' => {
         'file_name' => 'no_content.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -249,8 +244,7 @@ $result_trees{'no_content_do_contents'} = {
       },
       'source_info' => {
         'file_name' => 'no_content.texi',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -302,8 +296,7 @@ $result_trees{'no_content_do_contents'} = {
       },
       'source_info' => {
         'file_name' => 'no_content.texi',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
diff --git a/tp/t/results/html_tests/no_content_do_contents_inline.pl 
b/tp/t/results/html_tests/no_content_do_contents_inline.pl
index b51de1733a..43c269da99 100644
--- a/tp/t/results/html_tests/no_content_do_contents_inline.pl
+++ b/tp/t/results/html_tests/no_content_do_contents_inline.pl
@@ -59,8 +59,7 @@ $result_trees{'no_content_do_contents_inline'} = {
       },
       'source_info' => {
         'file_name' => 'no_content.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -158,8 +157,7 @@ $result_trees{'no_content_do_contents_inline'} = {
               ],
               'source_info' => {
                 'file_name' => 'no_content.texi',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -191,15 +189,13 @@ $result_trees{'no_content_do_contents_inline'} = {
               },
               'source_info' => {
                 'file_name' => 'no_content.texi',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
           'source_info' => {
             'file_name' => 'no_content.texi',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -216,8 +212,7 @@ $result_trees{'no_content_do_contents_inline'} = {
       },
       'source_info' => {
         'file_name' => 'no_content.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -249,8 +244,7 @@ $result_trees{'no_content_do_contents_inline'} = {
       },
       'source_info' => {
         'file_name' => 'no_content.texi',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -302,8 +296,7 @@ $result_trees{'no_content_do_contents_inline'} = {
       },
       'source_info' => {
         'file_name' => 'no_content.texi',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
diff --git a/tp/t/results/html_tests/no_content_do_contents_separate_element.pl 
b/tp/t/results/html_tests/no_content_do_contents_separate_element.pl
index 98829d48ea..75d2d8234d 100644
--- a/tp/t/results/html_tests/no_content_do_contents_separate_element.pl
+++ b/tp/t/results/html_tests/no_content_do_contents_separate_element.pl
@@ -59,8 +59,7 @@ $result_trees{'no_content_do_contents_separate_element'} = {
       },
       'source_info' => {
         'file_name' => 'no_content.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -158,8 +157,7 @@ $result_trees{'no_content_do_contents_separate_element'} = {
               ],
               'source_info' => {
                 'file_name' => 'no_content.texi',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -191,15 +189,13 @@ $result_trees{'no_content_do_contents_separate_element'} 
= {
               },
               'source_info' => {
                 'file_name' => 'no_content.texi',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
           'source_info' => {
             'file_name' => 'no_content.texi',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -216,8 +212,7 @@ $result_trees{'no_content_do_contents_separate_element'} = {
       },
       'source_info' => {
         'file_name' => 'no_content.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -249,8 +244,7 @@ $result_trees{'no_content_do_contents_separate_element'} = {
       },
       'source_info' => {
         'file_name' => 'no_content.texi',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -302,8 +296,7 @@ $result_trees{'no_content_do_contents_separate_element'} = {
       },
       'source_info' => {
         'file_name' => 'no_content.texi',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
diff --git a/tp/t/results/html_tests/no_content_inline.pl 
b/tp/t/results/html_tests/no_content_inline.pl
index f9fb7d081c..d253a876c6 100644
--- a/tp/t/results/html_tests/no_content_inline.pl
+++ b/tp/t/results/html_tests/no_content_inline.pl
@@ -59,8 +59,7 @@ $result_trees{'no_content_inline'} = {
       },
       'source_info' => {
         'file_name' => 'no_content.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -158,8 +157,7 @@ $result_trees{'no_content_inline'} = {
               ],
               'source_info' => {
                 'file_name' => 'no_content.texi',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -191,15 +189,13 @@ $result_trees{'no_content_inline'} = {
               },
               'source_info' => {
                 'file_name' => 'no_content.texi',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
           'source_info' => {
             'file_name' => 'no_content.texi',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -216,8 +212,7 @@ $result_trees{'no_content_inline'} = {
       },
       'source_info' => {
         'file_name' => 'no_content.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -249,8 +244,7 @@ $result_trees{'no_content_inline'} = {
       },
       'source_info' => {
         'file_name' => 'no_content.texi',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -302,8 +296,7 @@ $result_trees{'no_content_inline'} = {
       },
       'source_info' => {
         'file_name' => 'no_content.texi',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
diff --git a/tp/t/results/html_tests/no_content_separate_element.pl 
b/tp/t/results/html_tests/no_content_separate_element.pl
index 2c1df729ad..c7a9880907 100644
--- a/tp/t/results/html_tests/no_content_separate_element.pl
+++ b/tp/t/results/html_tests/no_content_separate_element.pl
@@ -59,8 +59,7 @@ $result_trees{'no_content_separate_element'} = {
       },
       'source_info' => {
         'file_name' => 'no_content.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -158,8 +157,7 @@ $result_trees{'no_content_separate_element'} = {
               ],
               'source_info' => {
                 'file_name' => 'no_content.texi',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -191,15 +189,13 @@ $result_trees{'no_content_separate_element'} = {
               },
               'source_info' => {
                 'file_name' => 'no_content.texi',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
           'source_info' => {
             'file_name' => 'no_content.texi',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -216,8 +212,7 @@ $result_trees{'no_content_separate_element'} = {
       },
       'source_info' => {
         'file_name' => 'no_content.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -249,8 +244,7 @@ $result_trees{'no_content_separate_element'} = {
       },
       'source_info' => {
         'file_name' => 'no_content.texi',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -302,8 +296,7 @@ $result_trees{'no_content_separate_element'} = {
       },
       'source_info' => {
         'file_name' => 'no_content.texi',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
diff --git a/tp/t/results/html_tests/no_use_iso.pl 
b/tp/t/results/html_tests/no_use_iso.pl
index 53e7196a4a..7428237642 100644
--- a/tp/t/results/html_tests/no_use_iso.pl
+++ b/tp/t/results/html_tests/no_use_iso.pl
@@ -28,8 +28,7 @@ $result_trees{'no_use_iso'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
diff --git a/tp/t/results/html_tests/node_footnote_end.pl 
b/tp/t/results/html_tests/node_footnote_end.pl
index 97006dd6c1..e4fda64d7f 100644
--- a/tp/t/results/html_tests/node_footnote_end.pl
+++ b/tp/t/results/html_tests/node_footnote_end.pl
@@ -107,8 +107,7 @@ $result_trees{'node_footnote_end'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 'node_footnote.texi',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     }
                   ],
@@ -143,8 +142,7 @@ $result_trees{'node_footnote_end'} = {
               ],
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               },
               'type' => 'menu_entry'
             },
@@ -170,8 +168,7 @@ $result_trees{'node_footnote_end'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 'node_footnote.texi',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     }
                   ],
@@ -206,8 +203,7 @@ $result_trees{'node_footnote_end'} = {
               ],
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -254,8 +250,7 @@ $result_trees{'node_footnote_end'} = {
               ],
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'menu_entry'
             },
@@ -281,8 +276,7 @@ $result_trees{'node_footnote_end'} = {
                       'cmdname' => '`',
                       'source_info' => {
                         'file_name' => 'node_footnote.texi',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     }
                   ],
@@ -317,8 +311,7 @@ $result_trees{'node_footnote_end'} = {
               ],
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -350,15 +343,13 @@ $result_trees{'node_footnote_end'} = {
               },
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => 'node_footnote.texi',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -378,8 +369,7 @@ $result_trees{'node_footnote_end'} = {
       },
       'source_info' => {
         'file_name' => 'node_footnote.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -400,8 +390,7 @@ $result_trees{'node_footnote_end'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
@@ -440,8 +429,7 @@ $result_trees{'node_footnote_end'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -474,8 +462,7 @@ $result_trees{'node_footnote_end'} = {
                           'cmdname' => '\'',
                           'source_info' => {
                             'file_name' => 'node_footnote.texi',
-                            'line_nr' => 17,
-                            'macro' => ''
+                            'line_nr' => 17
                           }
                         }
                       ],
@@ -488,8 +475,7 @@ $result_trees{'node_footnote_end'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -516,8 +502,7 @@ $result_trees{'node_footnote_end'} = {
       },
       'source_info' => {
         'file_name' => 'node_footnote.texi',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -538,8 +523,7 @@ $result_trees{'node_footnote_end'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             }
           ],
@@ -578,8 +562,7 @@ $result_trees{'node_footnote_end'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -612,8 +595,7 @@ $result_trees{'node_footnote_end'} = {
                           'cmdname' => '^',
                           'source_info' => {
                             'file_name' => 'node_footnote.texi',
-                            'line_nr' => 22,
-                            'macro' => ''
+                            'line_nr' => 22
                           }
                         }
                       ],
@@ -626,8 +608,7 @@ $result_trees{'node_footnote_end'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -654,8 +635,7 @@ $result_trees{'node_footnote_end'} = {
       },
       'source_info' => {
         'file_name' => 'node_footnote.texi',
-        'line_nr' => 19,
-        'macro' => ''
+        'line_nr' => 19
       }
     },
     {
@@ -687,8 +667,7 @@ $result_trees{'node_footnote_end'} = {
       },
       'source_info' => {
         'file_name' => 'node_footnote.texi',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     {
@@ -751,8 +730,7 @@ $result_trees{'node_footnote_end'} = {
                       'cmdname' => '`',
                       'source_info' => {
                         'file_name' => 'node_footnote.texi',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       }
                     }
                   ],
@@ -787,8 +765,7 @@ $result_trees{'node_footnote_end'} = {
               ],
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               },
               'type' => 'menu_entry'
             },
@@ -820,15 +797,13 @@ $result_trees{'node_footnote_end'} = {
               },
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             }
           ],
           'source_info' => {
             'file_name' => 'node_footnote.texi',
-            'line_nr' => 27,
-            'macro' => ''
+            'line_nr' => 27
           }
         },
         {
@@ -847,8 +822,7 @@ $result_trees{'node_footnote_end'} = {
       },
       'source_info' => {
         'file_name' => 'node_footnote.texi',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
@@ -869,8 +843,7 @@ $result_trees{'node_footnote_end'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               }
             }
           ],
@@ -909,8 +882,7 @@ $result_trees{'node_footnote_end'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               }
             },
             {
@@ -943,8 +915,7 @@ $result_trees{'node_footnote_end'} = {
                           'cmdname' => '`',
                           'source_info' => {
                             'file_name' => 'node_footnote.texi',
-                            'line_nr' => 34,
-                            'macro' => ''
+                            'line_nr' => 34
                           }
                         }
                       ],
@@ -957,8 +928,7 @@ $result_trees{'node_footnote_end'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             },
             {
@@ -985,8 +955,7 @@ $result_trees{'node_footnote_end'} = {
       },
       'source_info' => {
         'file_name' => 'node_footnote.texi',
-        'line_nr' => 31,
-        'macro' => ''
+        'line_nr' => 31
       }
     },
     {
@@ -1237,7 +1206,6 @@ $result_errors{'node_footnote_end'} = [
 ',
     'file_name' => 'node_footnote.texi',
     'line_nr' => 24,
-    'macro' => '',
     'text' => 'node `@`a\' is next for `chapter\' in menu but not in 
sectioning',
     'type' => 'warning'
   },
@@ -1246,7 +1214,6 @@ $result_errors{'node_footnote_end'} = [
 ',
     'file_name' => 'node_footnote.texi',
     'line_nr' => 24,
-    'macro' => '',
     'text' => 'node `@^a\' is prev for `chapter\' in menu but not in 
sectioning',
     'type' => 'warning'
   },
@@ -1255,7 +1222,6 @@ $result_errors{'node_footnote_end'} = [
 ',
     'file_name' => 'node_footnote.texi',
     'line_nr' => 24,
-    'macro' => '',
     'text' => 'node `Top\' is up for `chapter\' in menu but not in sectioning',
     'type' => 'warning'
   }
diff --git a/tp/t/results/html_tests/node_footnote_separated.pl 
b/tp/t/results/html_tests/node_footnote_separated.pl
index 456b1d31c5..0e1b9586a2 100644
--- a/tp/t/results/html_tests/node_footnote_separated.pl
+++ b/tp/t/results/html_tests/node_footnote_separated.pl
@@ -107,8 +107,7 @@ $result_trees{'node_footnote_separated'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 'node_footnote.texi',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     }
                   ],
@@ -143,8 +142,7 @@ $result_trees{'node_footnote_separated'} = {
               ],
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               },
               'type' => 'menu_entry'
             },
@@ -170,8 +168,7 @@ $result_trees{'node_footnote_separated'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 'node_footnote.texi',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     }
                   ],
@@ -206,8 +203,7 @@ $result_trees{'node_footnote_separated'} = {
               ],
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -254,8 +250,7 @@ $result_trees{'node_footnote_separated'} = {
               ],
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'menu_entry'
             },
@@ -281,8 +276,7 @@ $result_trees{'node_footnote_separated'} = {
                       'cmdname' => '`',
                       'source_info' => {
                         'file_name' => 'node_footnote.texi',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     }
                   ],
@@ -317,8 +311,7 @@ $result_trees{'node_footnote_separated'} = {
               ],
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -350,15 +343,13 @@ $result_trees{'node_footnote_separated'} = {
               },
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => 'node_footnote.texi',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -378,8 +369,7 @@ $result_trees{'node_footnote_separated'} = {
       },
       'source_info' => {
         'file_name' => 'node_footnote.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -400,8 +390,7 @@ $result_trees{'node_footnote_separated'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
@@ -440,8 +429,7 @@ $result_trees{'node_footnote_separated'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -474,8 +462,7 @@ $result_trees{'node_footnote_separated'} = {
                           'cmdname' => '\'',
                           'source_info' => {
                             'file_name' => 'node_footnote.texi',
-                            'line_nr' => 17,
-                            'macro' => ''
+                            'line_nr' => 17
                           }
                         }
                       ],
@@ -488,8 +475,7 @@ $result_trees{'node_footnote_separated'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -516,8 +502,7 @@ $result_trees{'node_footnote_separated'} = {
       },
       'source_info' => {
         'file_name' => 'node_footnote.texi',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -538,8 +523,7 @@ $result_trees{'node_footnote_separated'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             }
           ],
@@ -578,8 +562,7 @@ $result_trees{'node_footnote_separated'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -612,8 +595,7 @@ $result_trees{'node_footnote_separated'} = {
                           'cmdname' => '^',
                           'source_info' => {
                             'file_name' => 'node_footnote.texi',
-                            'line_nr' => 22,
-                            'macro' => ''
+                            'line_nr' => 22
                           }
                         }
                       ],
@@ -626,8 +608,7 @@ $result_trees{'node_footnote_separated'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -654,8 +635,7 @@ $result_trees{'node_footnote_separated'} = {
       },
       'source_info' => {
         'file_name' => 'node_footnote.texi',
-        'line_nr' => 19,
-        'macro' => ''
+        'line_nr' => 19
       }
     },
     {
@@ -687,8 +667,7 @@ $result_trees{'node_footnote_separated'} = {
       },
       'source_info' => {
         'file_name' => 'node_footnote.texi',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     {
@@ -751,8 +730,7 @@ $result_trees{'node_footnote_separated'} = {
                       'cmdname' => '`',
                       'source_info' => {
                         'file_name' => 'node_footnote.texi',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       }
                     }
                   ],
@@ -787,8 +765,7 @@ $result_trees{'node_footnote_separated'} = {
               ],
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               },
               'type' => 'menu_entry'
             },
@@ -820,15 +797,13 @@ $result_trees{'node_footnote_separated'} = {
               },
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             }
           ],
           'source_info' => {
             'file_name' => 'node_footnote.texi',
-            'line_nr' => 27,
-            'macro' => ''
+            'line_nr' => 27
           }
         },
         {
@@ -847,8 +822,7 @@ $result_trees{'node_footnote_separated'} = {
       },
       'source_info' => {
         'file_name' => 'node_footnote.texi',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
@@ -869,8 +843,7 @@ $result_trees{'node_footnote_separated'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               }
             }
           ],
@@ -909,8 +882,7 @@ $result_trees{'node_footnote_separated'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               }
             },
             {
@@ -943,8 +915,7 @@ $result_trees{'node_footnote_separated'} = {
                           'cmdname' => '`',
                           'source_info' => {
                             'file_name' => 'node_footnote.texi',
-                            'line_nr' => 34,
-                            'macro' => ''
+                            'line_nr' => 34
                           }
                         }
                       ],
@@ -957,8 +928,7 @@ $result_trees{'node_footnote_separated'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             },
             {
@@ -985,8 +955,7 @@ $result_trees{'node_footnote_separated'} = {
       },
       'source_info' => {
         'file_name' => 'node_footnote.texi',
-        'line_nr' => 31,
-        'macro' => ''
+        'line_nr' => 31
       }
     },
     {
diff --git a/tp/t/results/html_tests/node_footnote_use_node.pl 
b/tp/t/results/html_tests/node_footnote_use_node.pl
index b0e59c2502..64b2ab8cae 100644
--- a/tp/t/results/html_tests/node_footnote_use_node.pl
+++ b/tp/t/results/html_tests/node_footnote_use_node.pl
@@ -107,8 +107,7 @@ $result_trees{'node_footnote_use_node'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 'node_footnote.texi',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     }
                   ],
@@ -143,8 +142,7 @@ $result_trees{'node_footnote_use_node'} = {
               ],
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               },
               'type' => 'menu_entry'
             },
@@ -170,8 +168,7 @@ $result_trees{'node_footnote_use_node'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 'node_footnote.texi',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     }
                   ],
@@ -206,8 +203,7 @@ $result_trees{'node_footnote_use_node'} = {
               ],
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -254,8 +250,7 @@ $result_trees{'node_footnote_use_node'} = {
               ],
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'menu_entry'
             },
@@ -281,8 +276,7 @@ $result_trees{'node_footnote_use_node'} = {
                       'cmdname' => '`',
                       'source_info' => {
                         'file_name' => 'node_footnote.texi',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     }
                   ],
@@ -317,8 +311,7 @@ $result_trees{'node_footnote_use_node'} = {
               ],
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -350,15 +343,13 @@ $result_trees{'node_footnote_use_node'} = {
               },
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => 'node_footnote.texi',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -378,8 +369,7 @@ $result_trees{'node_footnote_use_node'} = {
       },
       'source_info' => {
         'file_name' => 'node_footnote.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -400,8 +390,7 @@ $result_trees{'node_footnote_use_node'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
@@ -440,8 +429,7 @@ $result_trees{'node_footnote_use_node'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -474,8 +462,7 @@ $result_trees{'node_footnote_use_node'} = {
                           'cmdname' => '\'',
                           'source_info' => {
                             'file_name' => 'node_footnote.texi',
-                            'line_nr' => 17,
-                            'macro' => ''
+                            'line_nr' => 17
                           }
                         }
                       ],
@@ -488,8 +475,7 @@ $result_trees{'node_footnote_use_node'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -516,8 +502,7 @@ $result_trees{'node_footnote_use_node'} = {
       },
       'source_info' => {
         'file_name' => 'node_footnote.texi',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -538,8 +523,7 @@ $result_trees{'node_footnote_use_node'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             }
           ],
@@ -578,8 +562,7 @@ $result_trees{'node_footnote_use_node'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -612,8 +595,7 @@ $result_trees{'node_footnote_use_node'} = {
                           'cmdname' => '^',
                           'source_info' => {
                             'file_name' => 'node_footnote.texi',
-                            'line_nr' => 22,
-                            'macro' => ''
+                            'line_nr' => 22
                           }
                         }
                       ],
@@ -626,8 +608,7 @@ $result_trees{'node_footnote_use_node'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -654,8 +635,7 @@ $result_trees{'node_footnote_use_node'} = {
       },
       'source_info' => {
         'file_name' => 'node_footnote.texi',
-        'line_nr' => 19,
-        'macro' => ''
+        'line_nr' => 19
       }
     },
     {
@@ -687,8 +667,7 @@ $result_trees{'node_footnote_use_node'} = {
       },
       'source_info' => {
         'file_name' => 'node_footnote.texi',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     {
@@ -751,8 +730,7 @@ $result_trees{'node_footnote_use_node'} = {
                       'cmdname' => '`',
                       'source_info' => {
                         'file_name' => 'node_footnote.texi',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       }
                     }
                   ],
@@ -787,8 +765,7 @@ $result_trees{'node_footnote_use_node'} = {
               ],
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               },
               'type' => 'menu_entry'
             },
@@ -820,15 +797,13 @@ $result_trees{'node_footnote_use_node'} = {
               },
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             }
           ],
           'source_info' => {
             'file_name' => 'node_footnote.texi',
-            'line_nr' => 27,
-            'macro' => ''
+            'line_nr' => 27
           }
         },
         {
@@ -847,8 +822,7 @@ $result_trees{'node_footnote_use_node'} = {
       },
       'source_info' => {
         'file_name' => 'node_footnote.texi',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
@@ -869,8 +843,7 @@ $result_trees{'node_footnote_use_node'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               }
             }
           ],
@@ -909,8 +882,7 @@ $result_trees{'node_footnote_use_node'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               }
             },
             {
@@ -943,8 +915,7 @@ $result_trees{'node_footnote_use_node'} = {
                           'cmdname' => '`',
                           'source_info' => {
                             'file_name' => 'node_footnote.texi',
-                            'line_nr' => 34,
-                            'macro' => ''
+                            'line_nr' => 34
                           }
                         }
                       ],
@@ -957,8 +928,7 @@ $result_trees{'node_footnote_use_node'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             },
             {
@@ -985,8 +955,7 @@ $result_trees{'node_footnote_use_node'} = {
       },
       'source_info' => {
         'file_name' => 'node_footnote.texi',
-        'line_nr' => 31,
-        'macro' => ''
+        'line_nr' => 31
       }
     },
     {
diff --git a/tp/t/results/html_tests/node_footnote_use_node_separate.pl 
b/tp/t/results/html_tests/node_footnote_use_node_separate.pl
index 78a8c3e7be..1fb5ca88f3 100644
--- a/tp/t/results/html_tests/node_footnote_use_node_separate.pl
+++ b/tp/t/results/html_tests/node_footnote_use_node_separate.pl
@@ -107,8 +107,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 'node_footnote.texi',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     }
                   ],
@@ -143,8 +142,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
               ],
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               },
               'type' => 'menu_entry'
             },
@@ -170,8 +168,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 'node_footnote.texi',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     }
                   ],
@@ -206,8 +203,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
               ],
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -254,8 +250,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
               ],
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'menu_entry'
             },
@@ -281,8 +276,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
                       'cmdname' => '`',
                       'source_info' => {
                         'file_name' => 'node_footnote.texi',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     }
                   ],
@@ -317,8 +311,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
               ],
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -350,15 +343,13 @@ $result_trees{'node_footnote_use_node_separate'} = {
               },
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => 'node_footnote.texi',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -378,8 +369,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
       },
       'source_info' => {
         'file_name' => 'node_footnote.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -400,8 +390,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
@@ -440,8 +429,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -474,8 +462,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
                           'cmdname' => '\'',
                           'source_info' => {
                             'file_name' => 'node_footnote.texi',
-                            'line_nr' => 17,
-                            'macro' => ''
+                            'line_nr' => 17
                           }
                         }
                       ],
@@ -488,8 +475,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -516,8 +502,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
       },
       'source_info' => {
         'file_name' => 'node_footnote.texi',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -538,8 +523,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             }
           ],
@@ -578,8 +562,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -612,8 +595,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
                           'cmdname' => '^',
                           'source_info' => {
                             'file_name' => 'node_footnote.texi',
-                            'line_nr' => 22,
-                            'macro' => ''
+                            'line_nr' => 22
                           }
                         }
                       ],
@@ -626,8 +608,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -654,8 +635,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
       },
       'source_info' => {
         'file_name' => 'node_footnote.texi',
-        'line_nr' => 19,
-        'macro' => ''
+        'line_nr' => 19
       }
     },
     {
@@ -687,8 +667,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
       },
       'source_info' => {
         'file_name' => 'node_footnote.texi',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     {
@@ -751,8 +730,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
                       'cmdname' => '`',
                       'source_info' => {
                         'file_name' => 'node_footnote.texi',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       }
                     }
                   ],
@@ -787,8 +765,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
               ],
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               },
               'type' => 'menu_entry'
             },
@@ -820,15 +797,13 @@ $result_trees{'node_footnote_use_node_separate'} = {
               },
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             }
           ],
           'source_info' => {
             'file_name' => 'node_footnote.texi',
-            'line_nr' => 27,
-            'macro' => ''
+            'line_nr' => 27
           }
         },
         {
@@ -847,8 +822,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
       },
       'source_info' => {
         'file_name' => 'node_footnote.texi',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
@@ -869,8 +843,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               }
             }
           ],
@@ -909,8 +882,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               }
             },
             {
@@ -943,8 +915,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
                           'cmdname' => '`',
                           'source_info' => {
                             'file_name' => 'node_footnote.texi',
-                            'line_nr' => 34,
-                            'macro' => ''
+                            'line_nr' => 34
                           }
                         }
                       ],
@@ -957,8 +928,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             },
             {
@@ -985,8 +955,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
       },
       'source_info' => {
         'file_name' => 'node_footnote.texi',
-        'line_nr' => 31,
-        'macro' => ''
+        'line_nr' => 31
       }
     },
     {
diff --git a/tp/t/results/html_tests/raw_html.pl 
b/tp/t/results/html_tests/raw_html.pl
index f136bf3f6d..af73e1e4c0 100644
--- a/tp/t/results/html_tests/raw_html.pl
+++ b/tp/t/results/html_tests/raw_html.pl
@@ -60,15 +60,13 @@ $result_trees{'raw_html'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/html_tests/redirection_same_labels.pl 
b/tp/t/results/html_tests/redirection_same_labels.pl
index 9e1216c925..e12bed8c21 100644
--- a/tp/t/results/html_tests/redirection_same_labels.pl
+++ b/tp/t/results/html_tests/redirection_same_labels.pl
@@ -128,8 +128,7 @@ $result_trees{'redirection_same_labels'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               },
               'type' => 'menu_entry'
             },
@@ -176,8 +175,7 @@ $result_trees{'redirection_same_labels'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -209,15 +207,13 @@ $result_trees{'redirection_same_labels'} = [
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -234,8 +230,7 @@ $result_trees{'redirection_same_labels'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     'unit_contents' => [
@@ -276,8 +271,7 @@ $result_trees{'redirection_same_labels'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 1,
-          'macro' => ''
+          'line_nr' => 1
         }
       },
       {}
@@ -345,8 +339,7 @@ $result_trees{'redirection_same_labels'} = [
                       'cmdname' => '"',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     }
                   ],
@@ -381,8 +374,7 @@ $result_trees{'redirection_same_labels'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               },
               'type' => 'menu_entry'
             },
@@ -412,8 +404,7 @@ $result_trees{'redirection_same_labels'} = [
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 17,
-                                'macro' => ''
+                                'line_nr' => 17
                               }
                             }
                           ],
@@ -423,8 +414,7 @@ $result_trees{'redirection_same_labels'} = [
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     }
                   ],
@@ -459,8 +449,7 @@ $result_trees{'redirection_same_labels'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               },
               'type' => 'menu_entry'
             },
@@ -492,15 +481,13 @@ $result_trees{'redirection_same_labels'} = [
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         },
         {
@@ -519,8 +506,7 @@ $result_trees{'redirection_same_labels'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     'unit_contents' => [
@@ -553,8 +539,7 @@ $result_trees{'redirection_same_labels'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 12,
-          'macro' => ''
+          'line_nr' => 12
         }
       },
       {},
@@ -576,8 +561,7 @@ $result_trees{'redirection_same_labels'} = [
                 'cmdname' => '"',
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 20,
-                  'macro' => ''
+                  'line_nr' => 20
                 }
               }
             ],
@@ -609,8 +593,7 @@ $result_trees{'redirection_same_labels'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 20,
-          'macro' => ''
+          'line_nr' => 20
         }
       },
       {
@@ -635,8 +618,7 @@ $result_trees{'redirection_same_labels'} = [
                         'cmdname' => 'dotless',
                         'source_info' => {
                           'file_name' => '',
-                          'line_nr' => 22,
-                          'macro' => ''
+                          'line_nr' => 22
                         }
                       }
                     ],
@@ -646,8 +628,7 @@ $result_trees{'redirection_same_labels'} = [
                 'cmdname' => '~',
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 22,
-                  'macro' => ''
+                  'line_nr' => 22
                 }
               }
             ],
@@ -679,8 +660,7 @@ $result_trees{'redirection_same_labels'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 22,
-          'macro' => ''
+          'line_nr' => 22
         }
       }
     ],
@@ -747,8 +727,7 @@ $result_trees{'redirection_same_labels'} = [
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       }
                     }
                   ],
@@ -783,8 +762,7 @@ $result_trees{'redirection_same_labels'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               },
               'type' => 'menu_entry'
             },
@@ -816,15 +794,13 @@ $result_trees{'redirection_same_labels'} = [
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 27,
-            'macro' => ''
+            'line_nr' => 27
           }
         },
         {
@@ -843,8 +819,7 @@ $result_trees{'redirection_same_labels'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     'unit_contents' => [
@@ -877,8 +852,7 @@ $result_trees{'redirection_same_labels'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 24,
-          'macro' => ''
+          'line_nr' => 24
         }
       },
       {},
@@ -900,8 +874,7 @@ $result_trees{'redirection_same_labels'} = [
                 'cmdname' => '^',
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 31,
-                  'macro' => ''
+                  'line_nr' => 31
                 }
               }
             ],
@@ -926,8 +899,7 @@ $result_trees{'redirection_same_labels'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 31,
-          'macro' => ''
+          'line_nr' => 31
         }
       }
     ],
@@ -1660,7 +1632,6 @@ 
$result_converted_errors{'file_html'}->{'redirection_same_labels'} = [
 ',
     'file_name' => '',
     'line_nr' => 20,
-    'macro' => '',
     'text' => '@node `@"i\' file i.html for redirection exists',
     'type' => 'warning'
   },
@@ -1670,7 +1641,6 @@ 
$result_converted_errors{'file_html'}->{'redirection_same_labels'} = [
 ',
     'file_name' => '',
     'line_nr' => 31,
-    'macro' => '',
     'text' => 'conflict with @node `@^i\' redirection file',
     'type' => 'warning'
   },
@@ -1679,7 +1649,6 @@ 
$result_converted_errors{'file_html'}->{'redirection_same_labels'} = [
 ',
     'file_name' => '',
     'line_nr' => 22,
-    'macro' => '',
     'text' => '@node `@~{@dotless{i}}\' file i.html for redirection exists',
     'type' => 'warning'
   },
@@ -1689,7 +1658,6 @@ 
$result_converted_errors{'file_html'}->{'redirection_same_labels'} = [
 ',
     'file_name' => '',
     'line_nr' => 31,
-    'macro' => '',
     'text' => 'conflict with @node `@^i\' redirection file',
     'type' => 'warning'
   }
diff --git a/tp/t/results/html_tests/ref_in_preformatted.pl 
b/tp/t/results/html_tests/ref_in_preformatted.pl
index ac97137d16..5219c0bd49 100644
--- a/tp/t/results/html_tests/ref_in_preformatted.pl
+++ b/tp/t/results/html_tests/ref_in_preformatted.pl
@@ -91,8 +91,7 @@ $result_trees{'ref_in_preformatted'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -124,15 +123,13 @@ $result_trees{'ref_in_preformatted'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -186,8 +183,7 @@ $result_trees{'ref_in_preformatted'} = {
                   'cmdname' => 'ref',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 8,
-                    'macro' => ''
+                    'line_nr' => 8
                   }
                 },
                 {
@@ -225,15 +221,13 @@ $result_trees{'ref_in_preformatted'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -253,8 +247,7 @@ $result_trees{'ref_in_preformatted'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -286,8 +279,7 @@ $result_trees{'ref_in_preformatted'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     }
   ],
diff --git a/tp/t/results/html_tests/sectioning_check_menu_structure.pl 
b/tp/t/results/html_tests/sectioning_check_menu_structure.pl
index 6c7c21028d..20f37a6d9b 100644
--- a/tp/t/results/html_tests/sectioning_check_menu_structure.pl
+++ b/tp/t/results/html_tests/sectioning_check_menu_structure.pl
@@ -96,8 +96,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
       },
       'source_info' => {
         'file_name' => 'sectioning.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -191,8 +190,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
                                   'cmdname' => 'dotless',
                                   'source_info' => {
                                     'file_name' => 'sectioning.texi',
-                                    'line_nr' => 9,
-                                    'macro' => ''
+                                    'line_nr' => 9
                                   }
                                 }
                               ],
@@ -202,8 +200,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
                           'cmdname' => '^',
                           'source_info' => {
                             'file_name' => 'sectioning.texi',
-                            'line_nr' => 9,
-                            'macro' => ''
+                            'line_nr' => 9
                           }
                         },
                         {
@@ -227,8 +224,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
                           'cmdname' => 'cite',
                           'source_info' => {
                             'file_name' => 'sectioning.texi',
-                            'line_nr' => 10,
-                            'macro' => ''
+                            'line_nr' => 10
                           }
                         },
                         {
@@ -244,8 +240,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               ],
               'source_info' => {
                 'file_name' => 'sectioning.texi',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -315,8 +310,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               ],
               'source_info' => {
                 'file_name' => 'sectioning.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               },
               'type' => 'menu_entry'
             },
@@ -386,8 +380,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               ],
               'source_info' => {
                 'file_name' => 'sectioning.texi',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               },
               'type' => 'menu_entry'
             },
@@ -458,8 +451,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               ],
               'source_info' => {
                 'file_name' => 'sectioning.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               },
               'type' => 'menu_entry'
             },
@@ -506,8 +498,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               ],
               'source_info' => {
                 'file_name' => 'sectioning.texi',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               },
               'type' => 'menu_entry'
             },
@@ -563,15 +554,13 @@ $result_trees{'sectioning_check_menu_structure'} = {
               },
               'source_info' => {
                 'file_name' => 'sectioning.texi',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             }
           ],
           'source_info' => {
             'file_name' => 'sectioning.texi',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -583,8 +572,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
       'extra' => {},
       'source_info' => {
         'file_name' => 'sectioning.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -651,8 +639,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
       },
       'source_info' => {
         'file_name' => 'sectioning.texi',
-        'line_nr' => 29,
-        'macro' => ''
+        'line_nr' => 29
       }
     },
     {
@@ -745,8 +732,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               ],
               'source_info' => {
                 'file_name' => 'sectioning.texi',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               },
               'type' => 'menu_entry'
             },
@@ -793,8 +779,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               ],
               'source_info' => {
                 'file_name' => 'sectioning.texi',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               },
               'type' => 'menu_entry'
             },
@@ -841,8 +826,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               ],
               'source_info' => {
                 'file_name' => 'sectioning.texi',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               },
               'type' => 'menu_entry'
             },
@@ -889,15 +873,13 @@ $result_trees{'sectioning_check_menu_structure'} = {
               },
               'source_info' => {
                 'file_name' => 'sectioning.texi',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               }
             }
           ],
           'source_info' => {
             'file_name' => 'sectioning.texi',
-            'line_nr' => 33,
-            'macro' => ''
+            'line_nr' => 33
           }
         },
         {
@@ -916,8 +898,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
       },
       'source_info' => {
         'file_name' => 'sectioning.texi',
-        'line_nr' => 30,
-        'macro' => ''
+        'line_nr' => 30
       }
     },
     {
@@ -949,8 +930,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
       },
       'source_info' => {
         'file_name' => 'sectioning.texi',
-        'line_nr' => 40,
-        'macro' => ''
+        'line_nr' => 40
       }
     },
     {
@@ -1034,8 +1014,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               ],
               'source_info' => {
                 'file_name' => 'sectioning.texi',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               },
               'type' => 'menu_entry'
             },
@@ -1082,8 +1061,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               ],
               'source_info' => {
                 'file_name' => 'sectioning.texi',
-                'line_nr' => 45,
-                'macro' => ''
+                'line_nr' => 45
               },
               'type' => 'menu_entry'
             },
@@ -1130,8 +1108,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               ],
               'source_info' => {
                 'file_name' => 'sectioning.texi',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               },
               'type' => 'menu_entry'
             },
@@ -1178,8 +1155,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               ],
               'source_info' => {
                 'file_name' => 'sectioning.texi',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               },
               'type' => 'menu_entry'
             },
@@ -1211,15 +1187,13 @@ $result_trees{'sectioning_check_menu_structure'} = {
               },
               'source_info' => {
                 'file_name' => 'sectioning.texi',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               }
             }
           ],
           'source_info' => {
             'file_name' => 'sectioning.texi',
-            'line_nr' => 43,
-            'macro' => ''
+            'line_nr' => 43
           }
         },
         {
@@ -1236,8 +1210,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
       },
       'source_info' => {
         'file_name' => 'sectioning.texi',
-        'line_nr' => 41,
-        'macro' => ''
+        'line_nr' => 41
       }
     },
     {
@@ -1269,8 +1242,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
       },
       'source_info' => {
         'file_name' => 'sectioning.texi',
-        'line_nr' => 50,
-        'macro' => ''
+        'line_nr' => 50
       }
     },
     {
@@ -1306,8 +1278,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
       },
       'source_info' => {
         'file_name' => 'sectioning.texi',
-        'line_nr' => 51,
-        'macro' => ''
+        'line_nr' => 51
       }
     },
     {
@@ -1339,8 +1310,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
       },
       'source_info' => {
         'file_name' => 'sectioning.texi',
-        'line_nr' => 53,
-        'macro' => ''
+        'line_nr' => 53
       }
     },
     {
@@ -1376,8 +1346,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
       },
       'source_info' => {
         'file_name' => 'sectioning.texi',
-        'line_nr' => 54,
-        'macro' => ''
+        'line_nr' => 54
       }
     },
     {
@@ -1409,8 +1378,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
       },
       'source_info' => {
         'file_name' => 'sectioning.texi',
-        'line_nr' => 56,
-        'macro' => ''
+        'line_nr' => 56
       }
     },
     {
@@ -1446,8 +1414,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
       },
       'source_info' => {
         'file_name' => 'sectioning.texi',
-        'line_nr' => 57,
-        'macro' => ''
+        'line_nr' => 57
       }
     },
     {
@@ -1479,8 +1446,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
       },
       'source_info' => {
         'file_name' => 'sectioning.texi',
-        'line_nr' => 59,
-        'macro' => ''
+        'line_nr' => 59
       }
     },
     {
@@ -1516,8 +1482,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
       },
       'source_info' => {
         'file_name' => 'sectioning.texi',
-        'line_nr' => 60,
-        'macro' => ''
+        'line_nr' => 60
       }
     },
     {
@@ -1549,8 +1514,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
       },
       'source_info' => {
         'file_name' => 'sectioning.texi',
-        'line_nr' => 62,
-        'macro' => ''
+        'line_nr' => 62
       }
     },
     {
@@ -1634,8 +1598,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               ],
               'source_info' => {
                 'file_name' => 'sectioning.texi',
-                'line_nr' => 66,
-                'macro' => ''
+                'line_nr' => 66
               },
               'type' => 'menu_entry'
             },
@@ -1667,15 +1630,13 @@ $result_trees{'sectioning_check_menu_structure'} = {
               },
               'source_info' => {
                 'file_name' => 'sectioning.texi',
-                'line_nr' => 67,
-                'macro' => ''
+                'line_nr' => 67
               }
             }
           ],
           'source_info' => {
             'file_name' => 'sectioning.texi',
-            'line_nr' => 65,
-            'macro' => ''
+            'line_nr' => 65
           }
         },
         {
@@ -1692,8 +1653,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
       },
       'source_info' => {
         'file_name' => 'sectioning.texi',
-        'line_nr' => 63,
-        'macro' => ''
+        'line_nr' => 63
       }
     },
     {
@@ -1725,8 +1685,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
       },
       'source_info' => {
         'file_name' => 'sectioning.texi',
-        'line_nr' => 69,
-        'macro' => ''
+        'line_nr' => 69
       }
     },
     {
@@ -1767,8 +1726,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
       },
       'source_info' => {
         'file_name' => 'sectioning.texi',
-        'line_nr' => 70,
-        'macro' => ''
+        'line_nr' => 70
       }
     },
     {
@@ -1800,8 +1758,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
       },
       'source_info' => {
         'file_name' => 'sectioning.texi',
-        'line_nr' => 73,
-        'macro' => ''
+        'line_nr' => 73
       }
     },
     {
@@ -1839,8 +1796,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
       },
       'source_info' => {
         'file_name' => 'sectioning.texi',
-        'line_nr' => 74,
-        'macro' => ''
+        'line_nr' => 74
       }
     },
     {
@@ -1915,8 +1871,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
       },
       'source_info' => {
         'file_name' => 'sectioning.texi',
-        'line_nr' => 76,
-        'macro' => ''
+        'line_nr' => 76
       }
     },
     {
@@ -2004,8 +1959,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
       },
       'source_info' => {
         'file_name' => 'sectioning.texi',
-        'line_nr' => 80,
-        'macro' => ''
+        'line_nr' => 80
       }
     },
     {
@@ -2057,8 +2011,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
       },
       'source_info' => {
         'file_name' => 'sectioning.texi',
-        'line_nr' => 84,
-        'macro' => ''
+        'line_nr' => 84
       }
     },
     {
@@ -2090,8 +2043,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
       },
       'source_info' => {
         'file_name' => 'sectioning.texi',
-        'line_nr' => 88,
-        'macro' => ''
+        'line_nr' => 88
       }
     },
     {
@@ -2146,8 +2098,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
       },
       'source_info' => {
         'file_name' => 'sectioning.texi',
-        'line_nr' => 89,
-        'macro' => ''
+        'line_nr' => 89
       }
     },
     {
@@ -2220,8 +2171,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'sectioning.texi',
-            'line_nr' => 96,
-            'macro' => ''
+            'line_nr' => 96
           }
         }
       ],
@@ -2236,8 +2186,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
       },
       'source_info' => {
         'file_name' => 'sectioning.texi',
-        'line_nr' => 94,
-        'macro' => ''
+        'line_nr' => 94
       }
     },
     {
@@ -3124,7 +3073,6 @@ $result_errors{'sectioning_check_menu_structure'} = [
 ',
     'file_name' => 'sectioning.texi',
     'line_nr' => 88,
-    'macro' => '',
     'text' => 'node `Last node no description\' is next for `Third node 
unnumbered\' in menu but not in sectioning',
     'type' => 'warning'
   }
diff --git a/tp/t/results/html_tests/shortcontents_no_top.pl 
b/tp/t/results/html_tests/shortcontents_no_top.pl
index 37929a7e19..639b471f57 100644
--- a/tp/t/results/html_tests/shortcontents_no_top.pl
+++ b/tp/t/results/html_tests/shortcontents_no_top.pl
@@ -45,8 +45,7 @@ $result_trees{'shortcontents_no_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -84,8 +83,7 @@ $result_trees{'shortcontents_no_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -123,8 +121,7 @@ $result_trees{'shortcontents_no_top'} = {
           'cmdname' => 'shortcontents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         }
       ],
@@ -138,8 +135,7 @@ $result_trees{'shortcontents_no_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
diff --git a/tp/t/results/html_tests/shorttitlepage.pl 
b/tp/t/results/html_tests/shorttitlepage.pl
index 3d672105bf..0d2bcf8450 100644
--- a/tp/t/results/html_tests/shorttitlepage.pl
+++ b/tp/t/results/html_tests/shorttitlepage.pl
@@ -38,8 +38,7 @@ $result_trees{'shorttitlepage'} = {
                   'cmdname' => 'sc',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   }
                 },
                 {
@@ -59,8 +58,7 @@ $result_trees{'shorttitlepage'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   }
                 }
               ],
@@ -81,8 +79,7 @@ $result_trees{'shorttitlepage'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -122,8 +119,7 @@ $result_trees{'shorttitlepage'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -153,8 +149,7 @@ $result_trees{'shorttitlepage'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -174,8 +169,7 @@ $result_trees{'shorttitlepage'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -227,8 +221,7 @@ $result_trees{'shorttitlepage'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
diff --git a/tp/t/results/html_tests/simplest_test_date_in_header.pl 
b/tp/t/results/html_tests/simplest_test_date_in_header.pl
index 0d17de3b5f..c4787bf133 100644
--- a/tp/t/results/html_tests/simplest_test_date_in_header.pl
+++ b/tp/t/results/html_tests/simplest_test_date_in_header.pl
@@ -86,8 +86,7 @@ $result_trees{'simplest_test_date_in_header'} = {
       },
       'source_info' => {
         'file_name' => 'simplest.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
diff --git a/tp/t/results/html_tests/spaces_in_line_break_in_verb_w.pl 
b/tp/t/results/html_tests/spaces_in_line_break_in_verb_w.pl
index dc7504a4bb..64e3ea3d11 100644
--- a/tp/t/results/html_tests/spaces_in_line_break_in_verb_w.pl
+++ b/tp/t/results/html_tests/spaces_in_line_break_in_verb_w.pl
@@ -29,8 +29,7 @@ $result_trees{'spaces_in_line_break_in_verb_w'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -70,8 +69,7 @@ $result_trees{'spaces_in_line_break_in_verb_w'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
diff --git a/tp/t/results/html_tests/split_html_text.pl 
b/tp/t/results/html_tests/split_html_text.pl
index 746604cd5e..dcdf26e712 100644
--- a/tp/t/results/html_tests/split_html_text.pl
+++ b/tp/t/results/html_tests/split_html_text.pl
@@ -36,8 +36,7 @@ $result_trees{'split_html_text'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     'unit_contents' => [
@@ -87,8 +86,7 @@ $result_trees{'split_html_text'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 2,
-          'macro' => ''
+          'line_nr' => 2
         }
       }
     ],
@@ -124,8 +122,7 @@ $result_trees{'split_html_text'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     'unit_contents' => [
@@ -158,8 +155,7 @@ $result_trees{'split_html_text'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 6,
-          'macro' => ''
+          'line_nr' => 6
         }
       }
     ],
diff --git a/tp/t/results/html_tests/test_accents_sc_default.pl 
b/tp/t/results/html_tests/test_accents_sc_default.pl
index 895e6bd9e4..ab0371d130 100644
--- a/tp/t/results/html_tests/test_accents_sc_default.pl
+++ b/tp/t/results/html_tests/test_accents_sc_default.pl
@@ -59,8 +59,7 @@ $result_trees{'test_accents_sc_default'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_utf8.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -96,8 +95,7 @@ $result_trees{'test_accents_sc_default'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_utf8.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -129,8 +127,7 @@ $result_trees{'test_accents_sc_default'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_utf8.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -187,8 +184,7 @@ $result_trees{'test_accents_sc_default'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -208,8 +204,7 @@ $result_trees{'test_accents_sc_default'} = {
               'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -229,8 +224,7 @@ $result_trees{'test_accents_sc_default'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -250,8 +244,7 @@ $result_trees{'test_accents_sc_default'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -266,8 +259,7 @@ $result_trees{'test_accents_sc_default'} = {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -282,8 +274,7 @@ $result_trees{'test_accents_sc_default'} = {
               'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -298,8 +289,7 @@ $result_trees{'test_accents_sc_default'} = {
               'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -325,8 +315,7 @@ $result_trees{'test_accents_sc_default'} = {
               'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -341,8 +330,7 @@ $result_trees{'test_accents_sc_default'} = {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -357,8 +345,7 @@ $result_trees{'test_accents_sc_default'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -378,8 +365,7 @@ $result_trees{'test_accents_sc_default'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -399,8 +385,7 @@ $result_trees{'test_accents_sc_default'} = {
               'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -415,8 +400,7 @@ $result_trees{'test_accents_sc_default'} = {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -431,8 +415,7 @@ $result_trees{'test_accents_sc_default'} = {
               'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -447,8 +430,7 @@ $result_trees{'test_accents_sc_default'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -464,8 +446,7 @@ $result_trees{'test_accents_sc_default'} = {
               'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -480,8 +461,7 @@ $result_trees{'test_accents_sc_default'} = {
               'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -496,8 +476,7 @@ $result_trees{'test_accents_sc_default'} = {
               'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -513,8 +492,7 @@ $result_trees{'test_accents_sc_default'} = {
               'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -529,8 +507,7 @@ $result_trees{'test_accents_sc_default'} = {
               'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -566,8 +543,7 @@ $result_trees{'test_accents_sc_default'} = {
               'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -588,8 +564,7 @@ $result_trees{'test_accents_sc_default'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -605,8 +580,7 @@ $result_trees{'test_accents_sc_default'} = {
               'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -621,8 +595,7 @@ $result_trees{'test_accents_sc_default'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -642,8 +615,7 @@ $result_trees{'test_accents_sc_default'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -663,8 +635,7 @@ $result_trees{'test_accents_sc_default'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -688,8 +659,7 @@ $result_trees{'test_accents_sc_default'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     }
                   ],
@@ -699,8 +669,7 @@ $result_trees{'test_accents_sc_default'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -720,8 +689,7 @@ $result_trees{'test_accents_sc_default'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -741,8 +709,7 @@ $result_trees{'test_accents_sc_default'} = {
               'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -766,8 +733,7 @@ $result_trees{'test_accents_sc_default'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     }
                   ],
@@ -777,8 +743,7 @@ $result_trees{'test_accents_sc_default'} = {
               'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -806,8 +771,7 @@ $result_trees{'test_accents_sc_default'} = {
                               'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                                'line_nr' => 20,
-                                'macro' => ''
+                                'line_nr' => 20
                               }
                             }
                           ],
@@ -817,8 +781,7 @@ $result_trees{'test_accents_sc_default'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     }
                   ],
@@ -828,8 +791,7 @@ $result_trees{'test_accents_sc_default'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -845,8 +807,7 @@ $result_trees{'test_accents_sc_default'} = {
               'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -866,8 +827,7 @@ $result_trees{'test_accents_sc_default'} = {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -882,8 +842,7 @@ $result_trees{'test_accents_sc_default'} = {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -903,8 +862,7 @@ $result_trees{'test_accents_sc_default'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -924,8 +882,7 @@ $result_trees{'test_accents_sc_default'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -949,8 +906,7 @@ $result_trees{'test_accents_sc_default'} = {
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                                'line_nr' => 22,
-                                'macro' => ''
+                                'line_nr' => 22
                               }
                             }
                           ],
@@ -960,8 +916,7 @@ $result_trees{'test_accents_sc_default'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -981,8 +936,7 @@ $result_trees{'test_accents_sc_default'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -1002,8 +956,7 @@ $result_trees{'test_accents_sc_default'} = {
                       'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -1027,8 +980,7 @@ $result_trees{'test_accents_sc_default'} = {
                               'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                                'line_nr' => 22,
-                                'macro' => ''
+                                'line_nr' => 22
                               }
                             }
                           ],
@@ -1038,8 +990,7 @@ $result_trees{'test_accents_sc_default'} = {
                       'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -1067,8 +1018,7 @@ $result_trees{'test_accents_sc_default'} = {
                                       'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                                        'line_nr' => 22,
-                                        'macro' => ''
+                                        'line_nr' => 22
                                       }
                                     }
                                   ],
@@ -1078,8 +1028,7 @@ $result_trees{'test_accents_sc_default'} = {
                               'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                                'line_nr' => 22,
-                                'macro' => ''
+                                'line_nr' => 22
                               }
                             }
                           ],
@@ -1089,8 +1038,7 @@ $result_trees{'test_accents_sc_default'} = {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -1100,8 +1048,7 @@ $result_trees{'test_accents_sc_default'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -1127,8 +1074,7 @@ $result_trees{'test_accents_sc_default'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_utf8.texi',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     }
   ],
diff --git a/tp/t/results/html_tests/test_accents_sc_default_latin1.pl 
b/tp/t/results/html_tests/test_accents_sc_default_latin1.pl
index 00d77a996f..751ac583a6 100644
--- a/tp/t/results/html_tests/test_accents_sc_default_latin1.pl
+++ b/tp/t/results/html_tests/test_accents_sc_default_latin1.pl
@@ -55,8 +55,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               },
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -99,8 +98,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_latin1.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -136,8 +134,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_latin1.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -169,8 +166,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_latin1.texi',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -227,8 +223,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -248,8 +243,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -269,8 +263,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -290,8 +283,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -306,8 +298,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -322,8 +313,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -338,8 +328,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -365,8 +354,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -381,8 +369,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -397,8 +384,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -418,8 +404,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -439,8 +424,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -455,8 +439,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -471,8 +454,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -487,8 +469,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -504,8 +485,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -520,8 +500,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -536,8 +515,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -553,8 +531,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -569,8 +546,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -606,8 +582,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -628,8 +603,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -645,8 +619,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -661,8 +634,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -682,8 +654,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -703,8 +674,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -728,8 +698,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -739,8 +708,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -760,8 +728,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -781,8 +748,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -806,8 +772,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -817,8 +782,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -846,8 +810,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                               'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                'line_nr' => 22,
-                                'macro' => ''
+                                'line_nr' => 22
                               }
                             }
                           ],
@@ -857,8 +820,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -868,8 +830,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -885,8 +846,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -906,8 +866,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -922,8 +881,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -943,8 +901,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -964,8 +921,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -989,8 +945,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1000,8 +955,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1021,8 +975,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1042,8 +995,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                       'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1067,8 +1019,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                               'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1078,8 +1029,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                       'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1107,8 +1057,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                                       'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                        'line_nr' => 24,
-                                        'macro' => ''
+                                        'line_nr' => 24
                                       }
                                     }
                                   ],
@@ -1118,8 +1067,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                               'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1129,8 +1077,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     }
                   ],
@@ -1140,8 +1087,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -1167,8 +1113,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_latin1.texi',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     }
   ],
diff --git a/tp/t/results/html_tests/test_accents_sc_default_usascii.pl 
b/tp/t/results/html_tests/test_accents_sc_default_usascii.pl
index f2bc389aaa..bb7ec076d4 100644
--- a/tp/t/results/html_tests/test_accents_sc_default_usascii.pl
+++ b/tp/t/results/html_tests/test_accents_sc_default_usascii.pl
@@ -55,8 +55,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               },
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -99,8 +98,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -136,8 +134,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -169,8 +166,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -227,8 +223,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -248,8 +243,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -269,8 +263,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -290,8 +283,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -311,8 +303,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -327,8 +318,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -343,8 +333,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -359,8 +348,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -386,8 +374,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -402,8 +389,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -418,8 +404,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -439,8 +424,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -460,8 +444,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -476,8 +459,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -492,8 +474,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -508,8 +489,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -525,8 +505,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -541,8 +520,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -557,8 +535,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -574,8 +551,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -590,8 +566,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -627,8 +602,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -649,8 +623,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -666,8 +639,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -682,8 +654,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -703,8 +674,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -724,8 +694,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -749,8 +718,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -760,8 +728,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -781,8 +748,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -802,8 +768,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -827,8 +792,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -838,8 +802,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -867,8 +830,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                               'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                'line_nr' => 22,
-                                'macro' => ''
+                                'line_nr' => 22
                               }
                             }
                           ],
@@ -878,8 +840,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -889,8 +850,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -906,8 +866,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -927,8 +886,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -943,8 +901,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -964,8 +921,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -985,8 +941,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1010,8 +965,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1021,8 +975,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1042,8 +995,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1063,8 +1015,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                       'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1088,8 +1039,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                               'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1099,8 +1049,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                       'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1128,8 +1077,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                                       'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                        'line_nr' => 24,
-                                        'macro' => ''
+                                        'line_nr' => 24
                                       }
                                     }
                                   ],
@@ -1139,8 +1087,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                               'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1150,8 +1097,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     }
                   ],
@@ -1161,8 +1107,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -1188,8 +1133,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     }
   ],
diff --git a/tp/t/results/html_tests/test_accents_sc_enable_encoding.pl 
b/tp/t/results/html_tests/test_accents_sc_enable_encoding.pl
index 84c87a334b..49ea90ef54 100644
--- a/tp/t/results/html_tests/test_accents_sc_enable_encoding.pl
+++ b/tp/t/results/html_tests/test_accents_sc_enable_encoding.pl
@@ -59,8 +59,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_utf8.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -96,8 +95,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_utf8.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -129,8 +127,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_utf8.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -187,8 +184,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -208,8 +204,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -229,8 +224,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -250,8 +244,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -266,8 +259,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -282,8 +274,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -298,8 +289,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -325,8 +315,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -341,8 +330,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -357,8 +345,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -378,8 +365,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -399,8 +385,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -415,8 +400,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -431,8 +415,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -447,8 +430,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -464,8 +446,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -480,8 +461,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -496,8 +476,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -513,8 +492,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -529,8 +507,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -566,8 +543,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -588,8 +564,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -605,8 +580,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -621,8 +595,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -642,8 +615,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -663,8 +635,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -688,8 +659,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     }
                   ],
@@ -699,8 +669,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -720,8 +689,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -741,8 +709,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -766,8 +733,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     }
                   ],
@@ -777,8 +743,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -806,8 +771,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                               'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                                'line_nr' => 20,
-                                'macro' => ''
+                                'line_nr' => 20
                               }
                             }
                           ],
@@ -817,8 +781,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     }
                   ],
@@ -828,8 +791,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -845,8 +807,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -866,8 +827,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -882,8 +842,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -903,8 +862,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -924,8 +882,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -949,8 +906,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                                'line_nr' => 22,
-                                'macro' => ''
+                                'line_nr' => 22
                               }
                             }
                           ],
@@ -960,8 +916,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -981,8 +936,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -1002,8 +956,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                       'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -1027,8 +980,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                               'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                                'line_nr' => 22,
-                                'macro' => ''
+                                'line_nr' => 22
                               }
                             }
                           ],
@@ -1038,8 +990,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                       'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -1067,8 +1018,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                                       'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                                        'line_nr' => 22,
-                                        'macro' => ''
+                                        'line_nr' => 22
                                       }
                                     }
                                   ],
@@ -1078,8 +1028,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                               'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                                'line_nr' => 22,
-                                'macro' => ''
+                                'line_nr' => 22
                               }
                             }
                           ],
@@ -1089,8 +1038,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -1100,8 +1048,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -1127,8 +1074,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_utf8.texi',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     }
   ],
diff --git a/tp/t/results/html_tests/test_accents_sc_enable_encoding_latin1.pl 
b/tp/t/results/html_tests/test_accents_sc_enable_encoding_latin1.pl
index ac61e2c04a..98f0a916f9 100644
--- a/tp/t/results/html_tests/test_accents_sc_enable_encoding_latin1.pl
+++ b/tp/t/results/html_tests/test_accents_sc_enable_encoding_latin1.pl
@@ -55,8 +55,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               },
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -99,8 +98,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_latin1.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -136,8 +134,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_latin1.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -169,8 +166,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_latin1.texi',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -227,8 +223,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -248,8 +243,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -269,8 +263,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -290,8 +283,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -306,8 +298,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -322,8 +313,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -338,8 +328,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -365,8 +354,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -381,8 +369,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -397,8 +384,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -418,8 +404,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -439,8 +424,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -455,8 +439,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -471,8 +454,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -487,8 +469,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -504,8 +485,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -520,8 +500,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -536,8 +515,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -553,8 +531,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -569,8 +546,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -606,8 +582,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -628,8 +603,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -645,8 +619,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -661,8 +634,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -682,8 +654,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -703,8 +674,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -728,8 +698,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -739,8 +708,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -760,8 +728,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -781,8 +748,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -806,8 +772,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -817,8 +782,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -846,8 +810,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                               'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                'line_nr' => 22,
-                                'macro' => ''
+                                'line_nr' => 22
                               }
                             }
                           ],
@@ -857,8 +820,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -868,8 +830,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -885,8 +846,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -906,8 +866,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -922,8 +881,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -943,8 +901,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -964,8 +921,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -989,8 +945,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1000,8 +955,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1021,8 +975,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1042,8 +995,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                       'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1067,8 +1019,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
                               'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1078,8 +1029,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
                       'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1107,8 +1057,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
                                       'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                        'line_nr' => 24,
-                                        'macro' => ''
+                                        'line_nr' => 24
                                       }
                                     }
                                   ],
@@ -1118,8 +1067,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
                               'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1129,8 +1077,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     }
                   ],
@@ -1140,8 +1087,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -1167,8 +1113,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_latin1.texi',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     }
   ],
diff --git 
a/tp/t/results/html_tests/test_accents_sc_enable_encoding_to_utf8_latin1.pl 
b/tp/t/results/html_tests/test_accents_sc_enable_encoding_to_utf8_latin1.pl
index b973a1518e..0db5c377d2 100644
--- a/tp/t/results/html_tests/test_accents_sc_enable_encoding_to_utf8_latin1.pl
+++ b/tp/t/results/html_tests/test_accents_sc_enable_encoding_to_utf8_latin1.pl
@@ -55,8 +55,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               },
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -99,8 +98,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_latin1.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -136,8 +134,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_latin1.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -169,8 +166,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_latin1.texi',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -227,8 +223,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -248,8 +243,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -269,8 +263,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -290,8 +283,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -306,8 +298,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -322,8 +313,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -338,8 +328,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -365,8 +354,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -381,8 +369,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -397,8 +384,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -418,8 +404,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -439,8 +424,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -455,8 +439,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -471,8 +454,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -487,8 +469,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -504,8 +485,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -520,8 +500,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -536,8 +515,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -553,8 +531,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -569,8 +546,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -606,8 +582,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -628,8 +603,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -645,8 +619,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -661,8 +634,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -682,8 +654,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -703,8 +674,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -728,8 +698,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -739,8 +708,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -760,8 +728,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -781,8 +748,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -806,8 +772,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -817,8 +782,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -846,8 +810,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                               'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                'line_nr' => 22,
-                                'macro' => ''
+                                'line_nr' => 22
                               }
                             }
                           ],
@@ -857,8 +820,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -868,8 +830,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -885,8 +846,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -906,8 +866,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -922,8 +881,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -943,8 +901,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -964,8 +921,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -989,8 +945,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1000,8 +955,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1021,8 +975,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1042,8 +995,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                       'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1067,8 +1019,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                               'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1078,8 +1029,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                       'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1107,8 +1057,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                                       'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                        'line_nr' => 24,
-                                        'macro' => ''
+                                        'line_nr' => 24
                                       }
                                     }
                                   ],
@@ -1118,8 +1067,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                               'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1129,8 +1077,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     }
                   ],
@@ -1140,8 +1087,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -1167,8 +1113,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_latin1.texi',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     }
   ],
diff --git 
a/tp/t/results/html_tests/test_accents_sc_enable_encoding_to_utf8_usascii.pl 
b/tp/t/results/html_tests/test_accents_sc_enable_encoding_to_utf8_usascii.pl
index c495811186..716515d2c5 100644
--- a/tp/t/results/html_tests/test_accents_sc_enable_encoding_to_utf8_usascii.pl
+++ b/tp/t/results/html_tests/test_accents_sc_enable_encoding_to_utf8_usascii.pl
@@ -55,8 +55,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               },
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -99,8 +98,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -136,8 +134,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -169,8 +166,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -227,8 +223,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -248,8 +243,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -269,8 +263,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -290,8 +283,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -311,8 +303,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -327,8 +318,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -343,8 +333,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -359,8 +348,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -386,8 +374,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -402,8 +389,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -418,8 +404,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -439,8 +424,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -460,8 +444,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -476,8 +459,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -492,8 +474,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -508,8 +489,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -525,8 +505,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -541,8 +520,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -557,8 +535,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -574,8 +551,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -590,8 +566,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -627,8 +602,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -649,8 +623,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -666,8 +639,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -682,8 +654,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -703,8 +674,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -724,8 +694,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -749,8 +718,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -760,8 +728,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -781,8 +748,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -802,8 +768,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -827,8 +792,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -838,8 +802,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -867,8 +830,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                               'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                'line_nr' => 22,
-                                'macro' => ''
+                                'line_nr' => 22
                               }
                             }
                           ],
@@ -878,8 +840,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -889,8 +850,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -906,8 +866,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -927,8 +886,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -943,8 +901,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -964,8 +921,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -985,8 +941,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1010,8 +965,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1021,8 +975,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1042,8 +995,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1063,8 +1015,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                       'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1088,8 +1039,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                               'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1099,8 +1049,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                       'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1128,8 +1077,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                                       'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                        'line_nr' => 24,
-                                        'macro' => ''
+                                        'line_nr' => 24
                                       }
                                     }
                                   ],
@@ -1139,8 +1087,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                               'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1150,8 +1097,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     }
                   ],
@@ -1161,8 +1107,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -1188,8 +1133,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     }
   ],
diff --git a/tp/t/results/html_tests/test_accents_sc_enable_encoding_usascii.pl 
b/tp/t/results/html_tests/test_accents_sc_enable_encoding_usascii.pl
index a82682303e..f58db3df5e 100644
--- a/tp/t/results/html_tests/test_accents_sc_enable_encoding_usascii.pl
+++ b/tp/t/results/html_tests/test_accents_sc_enable_encoding_usascii.pl
@@ -55,8 +55,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               },
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -99,8 +98,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -136,8 +134,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -169,8 +166,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -227,8 +223,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -248,8 +243,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -269,8 +263,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -290,8 +283,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -311,8 +303,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -327,8 +318,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -343,8 +333,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -359,8 +348,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -386,8 +374,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -402,8 +389,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -418,8 +404,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -439,8 +424,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -460,8 +444,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -476,8 +459,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -492,8 +474,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -508,8 +489,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -525,8 +505,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -541,8 +520,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -557,8 +535,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -574,8 +551,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -590,8 +566,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -627,8 +602,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -649,8 +623,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -666,8 +639,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -682,8 +654,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -703,8 +674,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -724,8 +694,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -749,8 +718,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -760,8 +728,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -781,8 +748,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -802,8 +768,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -827,8 +792,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -838,8 +802,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -867,8 +830,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                               'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                'line_nr' => 22,
-                                'macro' => ''
+                                'line_nr' => 22
                               }
                             }
                           ],
@@ -878,8 +840,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -889,8 +850,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -906,8 +866,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -927,8 +886,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -943,8 +901,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -964,8 +921,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -985,8 +941,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1010,8 +965,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = 
{
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1021,8 +975,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = 
{
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1042,8 +995,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = 
{
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1063,8 +1015,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
                       'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1088,8 +1039,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
                               'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1099,8 +1049,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
                       'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1128,8 +1077,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
                                       'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                        'line_nr' => 24,
-                                        'macro' => ''
+                                        'line_nr' => 24
                                       }
                                     }
                                   ],
@@ -1139,8 +1087,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
                               'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1150,8 +1097,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     }
                   ],
@@ -1161,8 +1107,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -1188,8 +1133,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     }
   ],
diff --git a/tp/t/results/html_tests/test_accents_sc_to_utf8_latin1.pl 
b/tp/t/results/html_tests/test_accents_sc_to_utf8_latin1.pl
index 576b22946d..f6b7758312 100644
--- a/tp/t/results/html_tests/test_accents_sc_to_utf8_latin1.pl
+++ b/tp/t/results/html_tests/test_accents_sc_to_utf8_latin1.pl
@@ -55,8 +55,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               },
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -99,8 +98,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_latin1.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -136,8 +134,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_latin1.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -169,8 +166,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_latin1.texi',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -227,8 +223,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -248,8 +243,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -269,8 +263,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -290,8 +283,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -306,8 +298,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -322,8 +313,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -338,8 +328,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -365,8 +354,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -381,8 +369,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -397,8 +384,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -418,8 +404,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -439,8 +424,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -455,8 +439,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -471,8 +454,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -487,8 +469,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -504,8 +485,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -520,8 +500,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -536,8 +515,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -553,8 +531,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -569,8 +546,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -606,8 +582,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -628,8 +603,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -645,8 +619,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -661,8 +634,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -682,8 +654,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -703,8 +674,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -728,8 +698,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -739,8 +708,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -760,8 +728,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -781,8 +748,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -806,8 +772,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -817,8 +782,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -846,8 +810,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                               'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                'line_nr' => 22,
-                                'macro' => ''
+                                'line_nr' => 22
                               }
                             }
                           ],
@@ -857,8 +820,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -868,8 +830,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -885,8 +846,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -906,8 +866,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -922,8 +881,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -943,8 +901,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -964,8 +921,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -989,8 +945,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1000,8 +955,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1021,8 +975,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1042,8 +995,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                       'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1067,8 +1019,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                               'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1078,8 +1029,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                       'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1107,8 +1057,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                                       'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                        'line_nr' => 24,
-                                        'macro' => ''
+                                        'line_nr' => 24
                                       }
                                     }
                                   ],
@@ -1118,8 +1067,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                               'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1129,8 +1077,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     }
                   ],
@@ -1140,8 +1087,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -1167,8 +1113,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_latin1.texi',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     }
   ],
diff --git a/tp/t/results/html_tests/test_accents_sc_use_numeric_entity.pl 
b/tp/t/results/html_tests/test_accents_sc_use_numeric_entity.pl
index 1b48464162..ae21b17824 100644
--- a/tp/t/results/html_tests/test_accents_sc_use_numeric_entity.pl
+++ b/tp/t/results/html_tests/test_accents_sc_use_numeric_entity.pl
@@ -59,8 +59,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_utf8.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -96,8 +95,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_utf8.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -129,8 +127,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_utf8.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -187,8 +184,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -208,8 +204,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -229,8 +224,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -250,8 +244,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -266,8 +259,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -282,8 +274,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -298,8 +289,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -325,8 +315,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -341,8 +330,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -357,8 +345,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -378,8 +365,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -399,8 +385,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -415,8 +400,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -431,8 +415,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -447,8 +430,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -464,8 +446,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -480,8 +461,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -496,8 +476,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -513,8 +492,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -529,8 +507,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -566,8 +543,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -588,8 +564,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -605,8 +580,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -621,8 +595,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -642,8 +615,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -663,8 +635,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -688,8 +659,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     }
                   ],
@@ -699,8 +669,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -720,8 +689,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -741,8 +709,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -766,8 +733,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     }
                   ],
@@ -777,8 +743,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -806,8 +771,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                               'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                                'line_nr' => 20,
-                                'macro' => ''
+                                'line_nr' => 20
                               }
                             }
                           ],
@@ -817,8 +781,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     }
                   ],
@@ -828,8 +791,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -845,8 +807,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -866,8 +827,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -882,8 +842,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -903,8 +862,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -924,8 +882,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -949,8 +906,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                                'line_nr' => 22,
-                                'macro' => ''
+                                'line_nr' => 22
                               }
                             }
                           ],
@@ -960,8 +916,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -981,8 +936,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -1002,8 +956,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                       'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -1027,8 +980,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                               'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                                'line_nr' => 22,
-                                'macro' => ''
+                                'line_nr' => 22
                               }
                             }
                           ],
@@ -1038,8 +990,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                       'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -1067,8 +1018,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                                       'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                                        'line_nr' => 22,
-                                        'macro' => ''
+                                        'line_nr' => 22
                                       }
                                     }
                                   ],
@@ -1078,8 +1028,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                               'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                                'line_nr' => 22,
-                                'macro' => ''
+                                'line_nr' => 22
                               }
                             }
                           ],
@@ -1089,8 +1038,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -1100,8 +1048,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -1127,8 +1074,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_utf8.texi',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     }
   ],
diff --git a/tp/t/results/html_tests/test_separated_contents_shortcontents.pl 
b/tp/t/results/html_tests/test_separated_contents_shortcontents.pl
index fe83c378ed..54dc500001 100644
--- a/tp/t/results/html_tests/test_separated_contents_shortcontents.pl
+++ b/tp/t/results/html_tests/test_separated_contents_shortcontents.pl
@@ -22,8 +22,7 @@ $result_trees{'test_separated_contents_shortcontents'} = {
               'cmdname' => 'contents',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -66,8 +65,7 @@ $result_trees{'test_separated_contents_shortcontents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -103,8 +101,7 @@ $result_trees{'test_separated_contents_shortcontents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -136,8 +133,7 @@ $result_trees{'test_separated_contents_shortcontents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -175,8 +171,7 @@ $result_trees{'test_separated_contents_shortcontents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -208,8 +203,7 @@ $result_trees{'test_separated_contents_shortcontents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -247,8 +241,7 @@ $result_trees{'test_separated_contents_shortcontents'} = {
           'cmdname' => 'shortcontents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           }
         }
       ],
@@ -262,8 +255,7 @@ $result_trees{'test_separated_contents_shortcontents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     }
   ],
diff --git a/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl 
b/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
index fe1630faab..e0f098bf55 100644
--- a/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
+++ b/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
@@ -39,8 +39,7 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -124,8 +123,7 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -157,15 +155,13 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -182,8 +178,7 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -215,8 +210,7 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -273,8 +267,7 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -306,8 +299,7 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -352,8 +344,7 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         },
         {
@@ -385,8 +376,7 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -407,8 +397,7 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     }
   ],
diff --git 
a/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl 
b/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
index e182b5780f..095c660094 100644
--- a/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
+++ b/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
@@ -44,8 +44,7 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -85,8 +84,7 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -170,8 +168,7 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = 
{
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               },
               'type' => 'menu_entry'
             },
@@ -203,15 +200,13 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} 
= {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -228,8 +223,7 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = 
{
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -261,8 +255,7 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = 
{
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -313,8 +306,7 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = 
{
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -359,8 +351,7 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = 
{
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           }
         },
         {
@@ -392,8 +383,7 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = 
{
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -414,8 +404,7 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = 
{
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     }
   ],
diff --git a/tp/t/results/html_tests/tex_expanded_in_copying.pl 
b/tp/t/results/html_tests/tex_expanded_in_copying.pl
index abed56b265..6585b8d70c 100644
--- a/tp/t/results/html_tests/tex_expanded_in_copying.pl
+++ b/tp/t/results/html_tests/tex_expanded_in_copying.pl
@@ -74,15 +74,13 @@ $result_trees{'tex_expanded_in_copying'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -113,15 +111,13 @@ $result_trees{'tex_expanded_in_copying'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git 
a/tp/t/results/html_tests/text_before_top_and_contents_after_title.pl 
b/tp/t/results/html_tests/text_before_top_and_contents_after_title.pl
index b69e7bb924..f88b84defa 100644
--- a/tp/t/results/html_tests/text_before_top_and_contents_after_title.pl
+++ b/tp/t/results/html_tests/text_before_top_and_contents_after_title.pl
@@ -60,8 +60,7 @@ $result_trees{'text_before_top_and_contents_after_title'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -111,8 +110,7 @@ $result_trees{'text_before_top_and_contents_after_title'} = 
{
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -150,8 +148,7 @@ $result_trees{'text_before_top_and_contents_after_title'} = 
{
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -170,8 +167,7 @@ $result_trees{'text_before_top_and_contents_after_title'} = 
{
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     }
   ],
diff --git 
a/tp/t/results/html_tests/text_before_top_and_summarycontents_after_title.pl 
b/tp/t/results/html_tests/text_before_top_and_summarycontents_after_title.pl
index ca5df0c11f..a7108a7fe7 100644
--- a/tp/t/results/html_tests/text_before_top_and_summarycontents_after_title.pl
+++ b/tp/t/results/html_tests/text_before_top_and_summarycontents_after_title.pl
@@ -60,8 +60,7 @@ 
$result_trees{'text_before_top_and_summarycontents_after_title'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -111,8 +110,7 @@ 
$result_trees{'text_before_top_and_summarycontents_after_title'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -150,8 +148,7 @@ 
$result_trees{'text_before_top_and_summarycontents_after_title'} = {
           'cmdname' => 'summarycontents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -170,8 +167,7 @@ 
$result_trees{'text_before_top_and_summarycontents_after_title'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     }
   ],
diff --git a/tp/t/results/html_tests/titles.pl 
b/tp/t/results/html_tests/titles.pl
index 773bcff6e5..65865b9bfa 100644
--- a/tp/t/results/html_tests/titles.pl
+++ b/tp/t/results/html_tests/titles.pl
@@ -38,8 +38,7 @@ $result_trees{'titles'} = {
                   'cmdname' => 'sc',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   }
                 },
                 {
@@ -59,8 +58,7 @@ $result_trees{'titles'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   }
                 }
               ],
@@ -81,8 +79,7 @@ $result_trees{'titles'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -122,8 +119,7 @@ $result_trees{'titles'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -153,8 +149,7 @@ $result_trees{'titles'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -174,8 +169,7 @@ $result_trees{'titles'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -227,8 +221,7 @@ $result_trees{'titles'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
diff --git a/tp/t/results/html_tests/top_file_name_and_node_name_collision.pl 
b/tp/t/results/html_tests/top_file_name_and_node_name_collision.pl
index 67e5481c74..ca50e212ee 100644
--- a/tp/t/results/html_tests/top_file_name_and_node_name_collision.pl
+++ b/tp/t/results/html_tests/top_file_name_and_node_name_collision.pl
@@ -44,8 +44,7 @@ $result_trees{'top_file_name_and_node_name_collision'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -83,8 +82,7 @@ $result_trees{'top_file_name_and_node_name_collision'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -116,8 +114,7 @@ $result_trees{'top_file_name_and_node_name_collision'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -155,8 +152,7 @@ $result_trees{'top_file_name_and_node_name_collision'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -192,8 +188,7 @@ $result_trees{'top_file_name_and_node_name_collision'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     }
   ],
@@ -336,7 +331,6 @@ $result_errors{'top_file_name_and_node_name_collision'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'lowering the section level of @top appearing after a lower 
element',
     'type' => 'warning'
   }
diff --git a/tp/t/results/html_tests/top_node_up_explicit.pl 
b/tp/t/results/html_tests/top_node_up_explicit.pl
index bf3479870f..88ca45cffe 100644
--- a/tp/t/results/html_tests/top_node_up_explicit.pl
+++ b/tp/t/results/html_tests/top_node_up_explicit.pl
@@ -115,8 +115,7 @@ $result_trees{'top_node_up_explicit'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -214,8 +213,7 @@ $result_trees{'top_node_up_explicit'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -247,15 +245,13 @@ $result_trees{'top_node_up_explicit'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -272,8 +268,7 @@ $result_trees{'top_node_up_explicit'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -305,8 +300,7 @@ $result_trees{'top_node_up_explicit'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -353,8 +347,7 @@ $result_trees{'top_node_up_explicit'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     }
   ],
diff --git a/tp/t/results/html_tests/top_node_up_explicit_no_nodes.pl 
b/tp/t/results/html_tests/top_node_up_explicit_no_nodes.pl
index c387f2d216..d7271dfd7b 100644
--- a/tp/t/results/html_tests/top_node_up_explicit_no_nodes.pl
+++ b/tp/t/results/html_tests/top_node_up_explicit_no_nodes.pl
@@ -115,8 +115,7 @@ $result_trees{'top_node_up_explicit_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -214,8 +213,7 @@ $result_trees{'top_node_up_explicit_no_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -247,15 +245,13 @@ $result_trees{'top_node_up_explicit_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -272,8 +268,7 @@ $result_trees{'top_node_up_explicit_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -305,8 +300,7 @@ $result_trees{'top_node_up_explicit_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -353,8 +347,7 @@ $result_trees{'top_node_up_explicit_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     }
   ],
diff --git a/tp/t/results/html_tests/top_node_up_implicit.pl 
b/tp/t/results/html_tests/top_node_up_implicit.pl
index 3425d42e88..c50e0b4669 100644
--- a/tp/t/results/html_tests/top_node_up_implicit.pl
+++ b/tp/t/results/html_tests/top_node_up_implicit.pl
@@ -39,8 +39,7 @@ $result_trees{'top_node_up_implicit'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -138,8 +137,7 @@ $result_trees{'top_node_up_implicit'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -171,15 +169,13 @@ $result_trees{'top_node_up_implicit'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -196,8 +192,7 @@ $result_trees{'top_node_up_implicit'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -229,8 +224,7 @@ $result_trees{'top_node_up_implicit'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -277,8 +271,7 @@ $result_trees{'top_node_up_implicit'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     }
   ],
diff --git a/tp/t/results/html_tests/top_node_up_implicit_no_nodes.pl 
b/tp/t/results/html_tests/top_node_up_implicit_no_nodes.pl
index 961402e16b..8ac26add6e 100644
--- a/tp/t/results/html_tests/top_node_up_implicit_no_nodes.pl
+++ b/tp/t/results/html_tests/top_node_up_implicit_no_nodes.pl
@@ -39,8 +39,7 @@ $result_trees{'top_node_up_implicit_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -138,8 +137,7 @@ $result_trees{'top_node_up_implicit_no_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -171,15 +169,13 @@ $result_trees{'top_node_up_implicit_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -196,8 +192,7 @@ $result_trees{'top_node_up_implicit_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -229,8 +224,7 @@ $result_trees{'top_node_up_implicit_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -277,8 +271,7 @@ $result_trees{'top_node_up_implicit_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     }
   ],
diff --git a/tp/t/results/html_tests/transliterated_names_conflicts.pl 
b/tp/t/results/html_tests/transliterated_names_conflicts.pl
index 6dcd5d630e..585323a90c 100644
--- a/tp/t/results/html_tests/transliterated_names_conflicts.pl
+++ b/tp/t/results/html_tests/transliterated_names_conflicts.pl
@@ -36,8 +36,7 @@ $result_trees{'transliterated_names_conflicts'} = [
       },
       'source_info' => {
         'file_name' => 'transliterated_names_conflicts.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     'unit_contents' => [
@@ -98,8 +97,7 @@ $result_trees{'transliterated_names_conflicts'} = [
         },
         'source_info' => {
           'file_name' => 'transliterated_names_conflicts.texi',
-          'line_nr' => 4,
-          'macro' => ''
+          'line_nr' => 4
         }
       }
     ],
@@ -135,8 +133,7 @@ $result_trees{'transliterated_names_conflicts'} = [
       },
       'source_info' => {
         'file_name' => 'transliterated_names_conflicts.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     'unit_contents' => [
@@ -176,8 +173,7 @@ $result_trees{'transliterated_names_conflicts'} = [
         },
         'source_info' => {
           'file_name' => 'transliterated_names_conflicts.texi',
-          'line_nr' => 7,
-          'macro' => ''
+          'line_nr' => 7
         }
       }
     ],
@@ -213,8 +209,7 @@ $result_trees{'transliterated_names_conflicts'} = [
       },
       'source_info' => {
         'file_name' => 'transliterated_names_conflicts.texi',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     'unit_contents' => [
@@ -261,8 +256,7 @@ $result_trees{'transliterated_names_conflicts'} = [
             },
             'source_info' => {
               'file_name' => 'transliterated_names_conflicts.texi',
-              'line_nr' => 12,
-              'macro' => ''
+              'line_nr' => 12
             }
           },
           {
@@ -342,8 +336,7 @@ $result_trees{'transliterated_names_conflicts'} = [
                 },
                 'source_info' => {
                   'file_name' => 'transliterated_names_conflicts.texi',
-                  'line_nr' => 16,
-                  'macro' => ''
+                  'line_nr' => 16
                 }
               }
             ],
@@ -360,8 +353,7 @@ $result_trees{'transliterated_names_conflicts'} = [
             },
             'source_info' => {
               'file_name' => 'transliterated_names_conflicts.texi',
-              'line_nr' => 14,
-              'macro' => ''
+              'line_nr' => 14
             }
           },
           {
@@ -380,8 +372,7 @@ $result_trees{'transliterated_names_conflicts'} = [
         },
         'source_info' => {
           'file_name' => 'transliterated_names_conflicts.texi',
-          'line_nr' => 10,
-          'macro' => ''
+          'line_nr' => 10
         }
       },
       {
@@ -1099,7 +1090,6 @@ 
$result_converted_errors{'file_html'}->{'transliterated_names_conflicts'} = [
 ",
     'file_name' => 'transliterated_names_conflicts.texi',
     'line_nr' => 14,
-    'macro' => '',
     'text' => "\@float `Pr\x{e8}s' file Pres.html for redirection exists",
     'type' => 'warning'
   },
@@ -1109,7 +1099,6 @@ 
$result_converted_errors{'file_html'}->{'transliterated_names_conflicts'} = [
 ",
     'file_name' => 'transliterated_names_conflicts.texi',
     'line_nr' => 6,
-    'macro' => '',
     'text' => "conflict with \@node `Pr\x{e9}s' file",
     'type' => 'warning'
   },
@@ -1118,7 +1107,6 @@ 
$result_converted_errors{'file_html'}->{'transliterated_names_conflicts'} = [
 ",
     'file_name' => 'transliterated_names_conflicts.texi',
     'line_nr' => 12,
-    'macro' => '',
     'text' => "\@anchor `Pr\x{ea}s' file Pres.html for redirection exists",
     'type' => 'warning'
   },
@@ -1128,7 +1116,6 @@ 
$result_converted_errors{'file_html'}->{'transliterated_names_conflicts'} = [
 ",
     'file_name' => 'transliterated_names_conflicts.texi',
     'line_nr' => 6,
-    'macro' => '',
     'text' => "conflict with \@node `Pr\x{e9}s' file",
     'type' => 'warning'
   }
diff --git a/tp/t/results/html_tests/uref_accented_letter.pl 
b/tp/t/results/html_tests/uref_accented_letter.pl
index a278b89437..5e113f0bc2 100644
--- a/tp/t/results/html_tests/uref_accented_letter.pl
+++ b/tp/t/results/html_tests/uref_accented_letter.pl
@@ -32,8 +32,7 @@ $result_trees{'uref_accented_letter'} = {
                       'cmdname' => '"',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     },
                     {
@@ -50,8 +49,7 @@ $result_trees{'uref_accented_letter'} = {
                       'cmdname' => 'ogonek',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     }
                   ],
@@ -61,8 +59,7 @@ $result_trees{'uref_accented_letter'} = {
               'cmdname' => 'uref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
diff --git a/tp/t/results/html_tests/uref_accented_letter_ascii.pl 
b/tp/t/results/html_tests/uref_accented_letter_ascii.pl
index 4e9a81059d..a093872516 100644
--- a/tp/t/results/html_tests/uref_accented_letter_ascii.pl
+++ b/tp/t/results/html_tests/uref_accented_letter_ascii.pl
@@ -38,8 +38,7 @@ $result_trees{'uref_accented_letter_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -70,8 +69,7 @@ $result_trees{'uref_accented_letter_ascii'} = {
                       'cmdname' => '"',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     },
                     {
@@ -88,8 +86,7 @@ $result_trees{'uref_accented_letter_ascii'} = {
                       'cmdname' => 'ogonek',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -99,8 +96,7 @@ $result_trees{'uref_accented_letter_ascii'} = {
               'cmdname' => 'uref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
diff --git a/tp/t/results/html_tests/uref_accented_letter_latin1.pl 
b/tp/t/results/html_tests/uref_accented_letter_latin1.pl
index ec8b2c944e..d23bcabd6b 100644
--- a/tp/t/results/html_tests/uref_accented_letter_latin1.pl
+++ b/tp/t/results/html_tests/uref_accented_letter_latin1.pl
@@ -38,8 +38,7 @@ $result_trees{'uref_accented_letter_latin1'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -70,8 +69,7 @@ $result_trees{'uref_accented_letter_latin1'} = {
                       'cmdname' => '"',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     },
                     {
@@ -88,8 +86,7 @@ $result_trees{'uref_accented_letter_latin1'} = {
                       'cmdname' => 'ogonek',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -99,8 +96,7 @@ $result_trees{'uref_accented_letter_latin1'} = {
               'cmdname' => 'uref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
diff --git a/tp/t/results/html_tests/utf8_default.pl 
b/tp/t/results/html_tests/utf8_default.pl
index 3c383fa169..681a65437e 100644
--- a/tp/t/results/html_tests/utf8_default.pl
+++ b/tp/t/results/html_tests/utf8_default.pl
@@ -38,8 +38,7 @@ $result_trees{'utf8_default'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -66,8 +65,7 @@ $result_trees{'utf8_default'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
diff --git a/tp/t/results/html_tests/utf8_enable_encoding.pl 
b/tp/t/results/html_tests/utf8_enable_encoding.pl
index 3ec76e92a2..7803856f6a 100644
--- a/tp/t/results/html_tests/utf8_enable_encoding.pl
+++ b/tp/t/results/html_tests/utf8_enable_encoding.pl
@@ -38,8 +38,7 @@ $result_trees{'utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -66,8 +65,7 @@ $result_trees{'utf8_enable_encoding'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
diff --git a/tp/t/results/html_tests/utf8_enable_encoding_no_use_iso.pl 
b/tp/t/results/html_tests/utf8_enable_encoding_no_use_iso.pl
index 8aa0302ffa..a55bd09994 100644
--- a/tp/t/results/html_tests/utf8_enable_encoding_no_use_iso.pl
+++ b/tp/t/results/html_tests/utf8_enable_encoding_no_use_iso.pl
@@ -38,8 +38,7 @@ $result_trees{'utf8_enable_encoding_no_use_iso'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -66,8 +65,7 @@ $result_trees{'utf8_enable_encoding_no_use_iso'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
diff --git a/tp/t/results/html_tests/utf8_enable_encoding_use_numeric_entity.pl 
b/tp/t/results/html_tests/utf8_enable_encoding_use_numeric_entity.pl
index a6648ad7d2..db09e2f4a5 100644
--- a/tp/t/results/html_tests/utf8_enable_encoding_use_numeric_entity.pl
+++ b/tp/t/results/html_tests/utf8_enable_encoding_use_numeric_entity.pl
@@ -38,8 +38,7 @@ $result_trees{'utf8_enable_encoding_use_numeric_entity'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -66,8 +65,7 @@ $result_trees{'utf8_enable_encoding_use_numeric_entity'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
diff --git a/tp/t/results/html_tests/utf8_use_numeric_entity.pl 
b/tp/t/results/html_tests/utf8_use_numeric_entity.pl
index 491a678912..7ea719718b 100644
--- a/tp/t/results/html_tests/utf8_use_numeric_entity.pl
+++ b/tp/t/results/html_tests/utf8_use_numeric_entity.pl
@@ -38,8 +38,7 @@ $result_trees{'utf8_use_numeric_entity'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -66,8 +65,7 @@ $result_trees{'utf8_use_numeric_entity'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
diff --git a/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl 
b/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl
index a666a15939..8629f05980 100644
--- a/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl
+++ b/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl
@@ -58,8 +58,7 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -94,8 +93,7 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 3,
-                            'macro' => ''
+                            'line_nr' => 3
                           }
                         },
                         {
@@ -120,8 +118,7 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 4,
-                            'macro' => ''
+                            'line_nr' => 4
                           }
                         }
                       ],
@@ -192,15 +189,13 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
                                   },
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 8,
-                                    'macro' => ''
+                                    'line_nr' => 8
                                   }
                                 }
                               ],
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 6,
-                                'macro' => ''
+                                'line_nr' => 6
                               }
                             }
                           ],
@@ -209,8 +204,7 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 5,
-                            'macro' => ''
+                            'line_nr' => 5
                           }
                         },
                         {
@@ -255,8 +249,7 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 10,
-                                'macro' => ''
+                                'line_nr' => 10
                               }
                             }
                           ],
@@ -265,8 +258,7 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 9,
-                            'macro' => ''
+                            'line_nr' => 9
                           }
                         }
                       ],
@@ -306,8 +298,7 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 }
               ],
@@ -322,8 +313,7 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -354,15 +344,13 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/html_tests/xml_protected_in_verb.pl 
b/tp/t/results/html_tests/xml_protected_in_verb.pl
index c3e7554293..58d118952b 100644
--- a/tp/t/results/html_tests/xml_protected_in_verb.pl
+++ b/tp/t/results/html_tests/xml_protected_in_verb.pl
@@ -56,15 +56,13 @@ $result_trees{'xml_protected_in_verb'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -92,8 +90,7 @@ $result_trees{'xml_protected_in_verb'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -137,8 +134,7 @@ $result_trees{'xml_protected_in_verb'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         }
       ],
diff --git a/tp/t/results/htmlxref/htmlxref.pl 
b/tp/t/results/htmlxref/htmlxref.pl
index 8f62627573..3a3e353a21 100644
--- a/tp/t/results/htmlxref/htmlxref.pl
+++ b/tp/t/results/htmlxref/htmlxref.pl
@@ -59,8 +59,7 @@ $result_trees{'htmlxref'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -144,8 +143,7 @@ $result_trees{'htmlxref'} = {
               ],
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -177,15 +175,13 @@ $result_trees{'htmlxref'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -218,8 +214,7 @@ $result_trees{'htmlxref'} = {
           },
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -247,8 +242,7 @@ $result_trees{'htmlxref'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -302,8 +296,7 @@ $result_trees{'htmlxref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -371,15 +364,13 @@ $result_trees{'htmlxref'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -407,8 +398,7 @@ $result_trees{'htmlxref'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -449,8 +439,7 @@ $result_trees{'htmlxref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -515,15 +504,13 @@ $result_trees{'htmlxref'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         },
         {
@@ -551,8 +538,7 @@ $result_trees{'htmlxref'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -606,8 +592,7 @@ $result_trees{'htmlxref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -675,15 +660,13 @@ $result_trees{'htmlxref'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           }
         },
         {
@@ -711,8 +694,7 @@ $result_trees{'htmlxref'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -753,8 +735,7 @@ $result_trees{'htmlxref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -819,15 +800,13 @@ $result_trees{'htmlxref'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 31,
-            'macro' => ''
+            'line_nr' => 31
           }
         },
         {
@@ -860,8 +839,7 @@ $result_trees{'htmlxref'} = {
           },
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 36,
-            'macro' => ''
+            'line_nr' => 36
           }
         },
         {
@@ -889,8 +867,7 @@ $result_trees{'htmlxref'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               }
             },
             {
@@ -936,8 +913,7 @@ $result_trees{'htmlxref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               }
             },
             {
@@ -1005,15 +981,13 @@ $result_trees{'htmlxref'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 39,
-            'macro' => ''
+            'line_nr' => 39
           }
         },
         {
@@ -1046,8 +1020,7 @@ $result_trees{'htmlxref'} = {
           },
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 44,
-            'macro' => ''
+            'line_nr' => 44
           }
         },
         {
@@ -1075,8 +1048,7 @@ $result_trees{'htmlxref'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -1104,8 +1076,7 @@ $result_trees{'htmlxref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -1166,15 +1137,13 @@ $result_trees{'htmlxref'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 47,
-            'macro' => ''
+            'line_nr' => 47
           }
         },
         {
@@ -1202,8 +1171,7 @@ $result_trees{'htmlxref'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 51,
-                'macro' => ''
+                'line_nr' => 51
               }
             },
             {
@@ -1231,8 +1199,7 @@ $result_trees{'htmlxref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 51,
-                'macro' => ''
+                'line_nr' => 51
               }
             },
             {
@@ -1296,15 +1263,13 @@ $result_trees{'htmlxref'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 54,
-                'macro' => ''
+                'line_nr' => 54
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 52,
-            'macro' => ''
+            'line_nr' => 52
           }
         },
         {
@@ -1332,8 +1297,7 @@ $result_trees{'htmlxref'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -1366,8 +1330,7 @@ $result_trees{'htmlxref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -1428,15 +1391,13 @@ $result_trees{'htmlxref'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 57,
-            'macro' => ''
+            'line_nr' => 57
           }
         },
         {
@@ -1464,8 +1425,7 @@ $result_trees{'htmlxref'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -1498,8 +1458,7 @@ $result_trees{'htmlxref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -1560,15 +1519,13 @@ $result_trees{'htmlxref'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 62,
-            'macro' => ''
+            'line_nr' => 62
           }
         },
         {
@@ -1585,8 +1542,7 @@ $result_trees{'htmlxref'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -1679,8 +1635,7 @@ $result_trees{'htmlxref'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 66,
-        'macro' => ''
+        'line_nr' => 66
       }
     },
     {
@@ -1758,15 +1713,13 @@ $result_trees{'htmlxref'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 69,
-            'macro' => ''
+            'line_nr' => 69
           }
         },
         {
@@ -1794,8 +1747,7 @@ $result_trees{'htmlxref'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 73,
-                'macro' => ''
+                'line_nr' => 73
               }
             },
             {
@@ -1828,8 +1780,7 @@ $result_trees{'htmlxref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 73,
-                'macro' => ''
+                'line_nr' => 73
               }
             },
             {
@@ -1890,15 +1841,13 @@ $result_trees{'htmlxref'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 76,
-                'macro' => ''
+                'line_nr' => 76
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 74,
-            'macro' => ''
+            'line_nr' => 74
           }
         },
         {
@@ -1963,8 +1912,7 @@ $result_trees{'htmlxref'} = {
               ],
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 79,
-                'macro' => ''
+                'line_nr' => 79
               },
               'type' => 'menu_entry'
             },
@@ -2011,8 +1959,7 @@ $result_trees{'htmlxref'} = {
               ],
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 80,
-                'macro' => ''
+                'line_nr' => 80
               },
               'type' => 'menu_entry'
             },
@@ -2059,8 +2006,7 @@ $result_trees{'htmlxref'} = {
               ],
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 81,
-                'macro' => ''
+                'line_nr' => 81
               },
               'type' => 'menu_entry'
             },
@@ -2092,15 +2038,13 @@ $result_trees{'htmlxref'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 82,
-                'macro' => ''
+                'line_nr' => 82
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 78,
-            'macro' => ''
+            'line_nr' => 78
           }
         },
         {
@@ -2119,8 +2063,7 @@ $result_trees{'htmlxref'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 67,
-        'macro' => ''
+        'line_nr' => 67
       }
     },
     {
@@ -2254,15 +2197,13 @@ $result_trees{'htmlxref'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 87,
-                'macro' => ''
+                'line_nr' => 87
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 85,
-            'macro' => ''
+            'line_nr' => 85
           }
         },
         {
@@ -2282,8 +2223,7 @@ $result_trees{'htmlxref'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 84,
-        'macro' => ''
+        'line_nr' => 84
       }
     },
     {
@@ -2407,15 +2347,13 @@ $result_trees{'htmlxref'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 92,
-                'macro' => ''
+                'line_nr' => 92
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 90,
-            'macro' => ''
+            'line_nr' => 90
           }
         },
         {
@@ -2435,8 +2373,7 @@ $result_trees{'htmlxref'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 89,
-        'macro' => ''
+        'line_nr' => 89
       }
     },
     {
@@ -2544,15 +2481,13 @@ $result_trees{'htmlxref'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 97,
-                'macro' => ''
+                'line_nr' => 97
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 95,
-            'macro' => ''
+            'line_nr' => 95
           }
         },
         {
@@ -2572,8 +2507,7 @@ $result_trees{'htmlxref'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 94,
-        'macro' => ''
+        'line_nr' => 94
       }
     },
     {
@@ -2983,7 +2917,6 @@ $result_converted_errors{'file_html'}->{'htmlxref'} = [
 ',
     'file_name' => 'htmlxref.cnf',
     'line_nr' => 15,
-    'macro' => '',
     'text' => 'unrecognized type: foo',
     'type' => 'warning'
   },
@@ -2992,7 +2925,6 @@ $result_converted_errors{'file_html'}->{'htmlxref'} = [
 ',
     'file_name' => 'htmlxref.cnf',
     'line_nr' => 16,
-    'macro' => '',
     'text' => 'missing type',
     'type' => 'warning'
   }
diff --git a/tp/t/results/htmlxref/htmlxref_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_nodes.pl
index 581bed239f..e730b3b678 100644
--- a/tp/t/results/htmlxref/htmlxref_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_nodes.pl
@@ -59,8 +59,7 @@ $result_trees{'htmlxref_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -144,8 +143,7 @@ $result_trees{'htmlxref_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -177,15 +175,13 @@ $result_trees{'htmlxref_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -218,8 +214,7 @@ $result_trees{'htmlxref_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -247,8 +242,7 @@ $result_trees{'htmlxref_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -302,8 +296,7 @@ $result_trees{'htmlxref_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -371,15 +364,13 @@ $result_trees{'htmlxref_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -407,8 +398,7 @@ $result_trees{'htmlxref_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -449,8 +439,7 @@ $result_trees{'htmlxref_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -515,15 +504,13 @@ $result_trees{'htmlxref_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         },
         {
@@ -551,8 +538,7 @@ $result_trees{'htmlxref_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -606,8 +592,7 @@ $result_trees{'htmlxref_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -675,15 +660,13 @@ $result_trees{'htmlxref_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           }
         },
         {
@@ -711,8 +694,7 @@ $result_trees{'htmlxref_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -753,8 +735,7 @@ $result_trees{'htmlxref_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -819,15 +800,13 @@ $result_trees{'htmlxref_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 31,
-            'macro' => ''
+            'line_nr' => 31
           }
         },
         {
@@ -860,8 +839,7 @@ $result_trees{'htmlxref_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 36,
-            'macro' => ''
+            'line_nr' => 36
           }
         },
         {
@@ -889,8 +867,7 @@ $result_trees{'htmlxref_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               }
             },
             {
@@ -936,8 +913,7 @@ $result_trees{'htmlxref_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               }
             },
             {
@@ -1005,15 +981,13 @@ $result_trees{'htmlxref_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 39,
-            'macro' => ''
+            'line_nr' => 39
           }
         },
         {
@@ -1046,8 +1020,7 @@ $result_trees{'htmlxref_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 44,
-            'macro' => ''
+            'line_nr' => 44
           }
         },
         {
@@ -1075,8 +1048,7 @@ $result_trees{'htmlxref_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -1104,8 +1076,7 @@ $result_trees{'htmlxref_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -1166,15 +1137,13 @@ $result_trees{'htmlxref_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 47,
-            'macro' => ''
+            'line_nr' => 47
           }
         },
         {
@@ -1202,8 +1171,7 @@ $result_trees{'htmlxref_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 51,
-                'macro' => ''
+                'line_nr' => 51
               }
             },
             {
@@ -1231,8 +1199,7 @@ $result_trees{'htmlxref_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 51,
-                'macro' => ''
+                'line_nr' => 51
               }
             },
             {
@@ -1296,15 +1263,13 @@ $result_trees{'htmlxref_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 54,
-                'macro' => ''
+                'line_nr' => 54
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 52,
-            'macro' => ''
+            'line_nr' => 52
           }
         },
         {
@@ -1332,8 +1297,7 @@ $result_trees{'htmlxref_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -1366,8 +1330,7 @@ $result_trees{'htmlxref_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -1428,15 +1391,13 @@ $result_trees{'htmlxref_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 57,
-            'macro' => ''
+            'line_nr' => 57
           }
         },
         {
@@ -1464,8 +1425,7 @@ $result_trees{'htmlxref_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -1498,8 +1458,7 @@ $result_trees{'htmlxref_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -1560,15 +1519,13 @@ $result_trees{'htmlxref_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 62,
-            'macro' => ''
+            'line_nr' => 62
           }
         },
         {
@@ -1585,8 +1542,7 @@ $result_trees{'htmlxref_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -1679,8 +1635,7 @@ $result_trees{'htmlxref_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 66,
-        'macro' => ''
+        'line_nr' => 66
       }
     },
     {
@@ -1758,15 +1713,13 @@ $result_trees{'htmlxref_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 69,
-            'macro' => ''
+            'line_nr' => 69
           }
         },
         {
@@ -1794,8 +1747,7 @@ $result_trees{'htmlxref_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 73,
-                'macro' => ''
+                'line_nr' => 73
               }
             },
             {
@@ -1828,8 +1780,7 @@ $result_trees{'htmlxref_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 73,
-                'macro' => ''
+                'line_nr' => 73
               }
             },
             {
@@ -1890,15 +1841,13 @@ $result_trees{'htmlxref_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 76,
-                'macro' => ''
+                'line_nr' => 76
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 74,
-            'macro' => ''
+            'line_nr' => 74
           }
         },
         {
@@ -1963,8 +1912,7 @@ $result_trees{'htmlxref_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 79,
-                'macro' => ''
+                'line_nr' => 79
               },
               'type' => 'menu_entry'
             },
@@ -2011,8 +1959,7 @@ $result_trees{'htmlxref_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 80,
-                'macro' => ''
+                'line_nr' => 80
               },
               'type' => 'menu_entry'
             },
@@ -2059,8 +2006,7 @@ $result_trees{'htmlxref_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 81,
-                'macro' => ''
+                'line_nr' => 81
               },
               'type' => 'menu_entry'
             },
@@ -2092,15 +2038,13 @@ $result_trees{'htmlxref_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 82,
-                'macro' => ''
+                'line_nr' => 82
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 78,
-            'macro' => ''
+            'line_nr' => 78
           }
         },
         {
@@ -2119,8 +2063,7 @@ $result_trees{'htmlxref_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 67,
-        'macro' => ''
+        'line_nr' => 67
       }
     },
     {
@@ -2254,15 +2197,13 @@ $result_trees{'htmlxref_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 87,
-                'macro' => ''
+                'line_nr' => 87
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 85,
-            'macro' => ''
+            'line_nr' => 85
           }
         },
         {
@@ -2282,8 +2223,7 @@ $result_trees{'htmlxref_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 84,
-        'macro' => ''
+        'line_nr' => 84
       }
     },
     {
@@ -2407,15 +2347,13 @@ $result_trees{'htmlxref_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 92,
-                'macro' => ''
+                'line_nr' => 92
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 90,
-            'macro' => ''
+            'line_nr' => 90
           }
         },
         {
@@ -2435,8 +2373,7 @@ $result_trees{'htmlxref_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 89,
-        'macro' => ''
+        'line_nr' => 89
       }
     },
     {
@@ -2544,15 +2481,13 @@ $result_trees{'htmlxref_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 97,
-                'macro' => ''
+                'line_nr' => 97
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 95,
-            'macro' => ''
+            'line_nr' => 95
           }
         },
         {
@@ -2572,8 +2507,7 @@ $result_trees{'htmlxref_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 94,
-        'macro' => ''
+        'line_nr' => 94
       }
     },
     {
@@ -2983,7 +2917,6 @@ $result_converted_errors{'file_html'}->{'htmlxref_nodes'} 
= [
 ',
     'file_name' => 'htmlxref.cnf',
     'line_nr' => 15,
-    'macro' => '',
     'text' => 'unrecognized type: foo',
     'type' => 'warning'
   },
@@ -2992,7 +2925,6 @@ $result_converted_errors{'file_html'}->{'htmlxref_nodes'} 
= [
 ',
     'file_name' => 'htmlxref.cnf',
     'line_nr' => 16,
-    'macro' => '',
     'text' => 'missing type',
     'type' => 'warning'
   }
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono.pl 
b/tp/t/results/htmlxref/htmlxref_only_mono.pl
index 4294e252ac..7ec2ba6e82 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_mono.pl
@@ -59,8 +59,7 @@ $result_trees{'htmlxref_only_mono'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -144,8 +143,7 @@ $result_trees{'htmlxref_only_mono'} = {
               ],
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -177,15 +175,13 @@ $result_trees{'htmlxref_only_mono'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -218,8 +214,7 @@ $result_trees{'htmlxref_only_mono'} = {
           },
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -247,8 +242,7 @@ $result_trees{'htmlxref_only_mono'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -302,8 +296,7 @@ $result_trees{'htmlxref_only_mono'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -371,15 +364,13 @@ $result_trees{'htmlxref_only_mono'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -407,8 +398,7 @@ $result_trees{'htmlxref_only_mono'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -449,8 +439,7 @@ $result_trees{'htmlxref_only_mono'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -515,15 +504,13 @@ $result_trees{'htmlxref_only_mono'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         },
         {
@@ -551,8 +538,7 @@ $result_trees{'htmlxref_only_mono'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -606,8 +592,7 @@ $result_trees{'htmlxref_only_mono'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -675,15 +660,13 @@ $result_trees{'htmlxref_only_mono'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           }
         },
         {
@@ -711,8 +694,7 @@ $result_trees{'htmlxref_only_mono'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -753,8 +735,7 @@ $result_trees{'htmlxref_only_mono'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -819,15 +800,13 @@ $result_trees{'htmlxref_only_mono'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 31,
-            'macro' => ''
+            'line_nr' => 31
           }
         },
         {
@@ -860,8 +839,7 @@ $result_trees{'htmlxref_only_mono'} = {
           },
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 36,
-            'macro' => ''
+            'line_nr' => 36
           }
         },
         {
@@ -889,8 +867,7 @@ $result_trees{'htmlxref_only_mono'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               }
             },
             {
@@ -936,8 +913,7 @@ $result_trees{'htmlxref_only_mono'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               }
             },
             {
@@ -1005,15 +981,13 @@ $result_trees{'htmlxref_only_mono'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 39,
-            'macro' => ''
+            'line_nr' => 39
           }
         },
         {
@@ -1046,8 +1020,7 @@ $result_trees{'htmlxref_only_mono'} = {
           },
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 44,
-            'macro' => ''
+            'line_nr' => 44
           }
         },
         {
@@ -1075,8 +1048,7 @@ $result_trees{'htmlxref_only_mono'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -1104,8 +1076,7 @@ $result_trees{'htmlxref_only_mono'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -1166,15 +1137,13 @@ $result_trees{'htmlxref_only_mono'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 47,
-            'macro' => ''
+            'line_nr' => 47
           }
         },
         {
@@ -1202,8 +1171,7 @@ $result_trees{'htmlxref_only_mono'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 51,
-                'macro' => ''
+                'line_nr' => 51
               }
             },
             {
@@ -1231,8 +1199,7 @@ $result_trees{'htmlxref_only_mono'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 51,
-                'macro' => ''
+                'line_nr' => 51
               }
             },
             {
@@ -1296,15 +1263,13 @@ $result_trees{'htmlxref_only_mono'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 54,
-                'macro' => ''
+                'line_nr' => 54
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 52,
-            'macro' => ''
+            'line_nr' => 52
           }
         },
         {
@@ -1332,8 +1297,7 @@ $result_trees{'htmlxref_only_mono'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -1366,8 +1330,7 @@ $result_trees{'htmlxref_only_mono'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -1428,15 +1391,13 @@ $result_trees{'htmlxref_only_mono'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 57,
-            'macro' => ''
+            'line_nr' => 57
           }
         },
         {
@@ -1464,8 +1425,7 @@ $result_trees{'htmlxref_only_mono'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -1498,8 +1458,7 @@ $result_trees{'htmlxref_only_mono'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -1560,15 +1519,13 @@ $result_trees{'htmlxref_only_mono'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 62,
-            'macro' => ''
+            'line_nr' => 62
           }
         },
         {
@@ -1585,8 +1542,7 @@ $result_trees{'htmlxref_only_mono'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -1679,8 +1635,7 @@ $result_trees{'htmlxref_only_mono'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 66,
-        'macro' => ''
+        'line_nr' => 66
       }
     },
     {
@@ -1758,15 +1713,13 @@ $result_trees{'htmlxref_only_mono'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 69,
-            'macro' => ''
+            'line_nr' => 69
           }
         },
         {
@@ -1794,8 +1747,7 @@ $result_trees{'htmlxref_only_mono'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 73,
-                'macro' => ''
+                'line_nr' => 73
               }
             },
             {
@@ -1828,8 +1780,7 @@ $result_trees{'htmlxref_only_mono'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 73,
-                'macro' => ''
+                'line_nr' => 73
               }
             },
             {
@@ -1890,15 +1841,13 @@ $result_trees{'htmlxref_only_mono'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 76,
-                'macro' => ''
+                'line_nr' => 76
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 74,
-            'macro' => ''
+            'line_nr' => 74
           }
         },
         {
@@ -1963,8 +1912,7 @@ $result_trees{'htmlxref_only_mono'} = {
               ],
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 79,
-                'macro' => ''
+                'line_nr' => 79
               },
               'type' => 'menu_entry'
             },
@@ -2011,8 +1959,7 @@ $result_trees{'htmlxref_only_mono'} = {
               ],
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 80,
-                'macro' => ''
+                'line_nr' => 80
               },
               'type' => 'menu_entry'
             },
@@ -2059,8 +2006,7 @@ $result_trees{'htmlxref_only_mono'} = {
               ],
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 81,
-                'macro' => ''
+                'line_nr' => 81
               },
               'type' => 'menu_entry'
             },
@@ -2092,15 +2038,13 @@ $result_trees{'htmlxref_only_mono'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 82,
-                'macro' => ''
+                'line_nr' => 82
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 78,
-            'macro' => ''
+            'line_nr' => 78
           }
         },
         {
@@ -2119,8 +2063,7 @@ $result_trees{'htmlxref_only_mono'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 67,
-        'macro' => ''
+        'line_nr' => 67
       }
     },
     {
@@ -2254,15 +2197,13 @@ $result_trees{'htmlxref_only_mono'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 87,
-                'macro' => ''
+                'line_nr' => 87
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 85,
-            'macro' => ''
+            'line_nr' => 85
           }
         },
         {
@@ -2282,8 +2223,7 @@ $result_trees{'htmlxref_only_mono'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 84,
-        'macro' => ''
+        'line_nr' => 84
       }
     },
     {
@@ -2407,15 +2347,13 @@ $result_trees{'htmlxref_only_mono'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 92,
-                'macro' => ''
+                'line_nr' => 92
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 90,
-            'macro' => ''
+            'line_nr' => 90
           }
         },
         {
@@ -2435,8 +2373,7 @@ $result_trees{'htmlxref_only_mono'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 89,
-        'macro' => ''
+        'line_nr' => 89
       }
     },
     {
@@ -2544,15 +2481,13 @@ $result_trees{'htmlxref_only_mono'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 97,
-                'macro' => ''
+                'line_nr' => 97
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 95,
-            'macro' => ''
+            'line_nr' => 95
           }
         },
         {
@@ -2572,8 +2507,7 @@ $result_trees{'htmlxref_only_mono'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 94,
-        'macro' => ''
+        'line_nr' => 94
       }
     },
     {
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
index 4016c8a0d2..1f27976241 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
@@ -59,8 +59,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -144,8 +143,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -177,15 +175,13 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -218,8 +214,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -247,8 +242,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -302,8 +296,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -371,15 +364,13 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -407,8 +398,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -449,8 +439,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -515,15 +504,13 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         },
         {
@@ -551,8 +538,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -606,8 +592,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -675,15 +660,13 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           }
         },
         {
@@ -711,8 +694,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -753,8 +735,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -819,15 +800,13 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 31,
-            'macro' => ''
+            'line_nr' => 31
           }
         },
         {
@@ -860,8 +839,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 36,
-            'macro' => ''
+            'line_nr' => 36
           }
         },
         {
@@ -889,8 +867,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               }
             },
             {
@@ -936,8 +913,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               }
             },
             {
@@ -1005,15 +981,13 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 39,
-            'macro' => ''
+            'line_nr' => 39
           }
         },
         {
@@ -1046,8 +1020,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 44,
-            'macro' => ''
+            'line_nr' => 44
           }
         },
         {
@@ -1075,8 +1048,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -1104,8 +1076,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -1166,15 +1137,13 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 47,
-            'macro' => ''
+            'line_nr' => 47
           }
         },
         {
@@ -1202,8 +1171,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 51,
-                'macro' => ''
+                'line_nr' => 51
               }
             },
             {
@@ -1231,8 +1199,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 51,
-                'macro' => ''
+                'line_nr' => 51
               }
             },
             {
@@ -1296,15 +1263,13 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 54,
-                'macro' => ''
+                'line_nr' => 54
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 52,
-            'macro' => ''
+            'line_nr' => 52
           }
         },
         {
@@ -1332,8 +1297,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -1366,8 +1330,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -1428,15 +1391,13 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 57,
-            'macro' => ''
+            'line_nr' => 57
           }
         },
         {
@@ -1464,8 +1425,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -1498,8 +1458,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -1560,15 +1519,13 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 62,
-            'macro' => ''
+            'line_nr' => 62
           }
         },
         {
@@ -1585,8 +1542,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -1679,8 +1635,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 66,
-        'macro' => ''
+        'line_nr' => 66
       }
     },
     {
@@ -1758,15 +1713,13 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 69,
-            'macro' => ''
+            'line_nr' => 69
           }
         },
         {
@@ -1794,8 +1747,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 73,
-                'macro' => ''
+                'line_nr' => 73
               }
             },
             {
@@ -1828,8 +1780,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 73,
-                'macro' => ''
+                'line_nr' => 73
               }
             },
             {
@@ -1890,15 +1841,13 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 76,
-                'macro' => ''
+                'line_nr' => 76
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 74,
-            'macro' => ''
+            'line_nr' => 74
           }
         },
         {
@@ -1963,8 +1912,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 79,
-                'macro' => ''
+                'line_nr' => 79
               },
               'type' => 'menu_entry'
             },
@@ -2011,8 +1959,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 80,
-                'macro' => ''
+                'line_nr' => 80
               },
               'type' => 'menu_entry'
             },
@@ -2059,8 +2006,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 81,
-                'macro' => ''
+                'line_nr' => 81
               },
               'type' => 'menu_entry'
             },
@@ -2092,15 +2038,13 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 82,
-                'macro' => ''
+                'line_nr' => 82
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 78,
-            'macro' => ''
+            'line_nr' => 78
           }
         },
         {
@@ -2119,8 +2063,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 67,
-        'macro' => ''
+        'line_nr' => 67
       }
     },
     {
@@ -2254,15 +2197,13 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 87,
-                'macro' => ''
+                'line_nr' => 87
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 85,
-            'macro' => ''
+            'line_nr' => 85
           }
         },
         {
@@ -2282,8 +2223,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 84,
-        'macro' => ''
+        'line_nr' => 84
       }
     },
     {
@@ -2407,15 +2347,13 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 92,
-                'macro' => ''
+                'line_nr' => 92
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 90,
-            'macro' => ''
+            'line_nr' => 90
           }
         },
         {
@@ -2435,8 +2373,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 89,
-        'macro' => ''
+        'line_nr' => 89
       }
     },
     {
@@ -2544,15 +2481,13 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 97,
-                'macro' => ''
+                'line_nr' => 97
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 95,
-            'macro' => ''
+            'line_nr' => 95
           }
         },
         {
@@ -2572,8 +2507,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 94,
-        'macro' => ''
+        'line_nr' => 94
       }
     },
     {
diff --git a/tp/t/results/htmlxref/htmlxref_only_split.pl 
b/tp/t/results/htmlxref/htmlxref_only_split.pl
index 6ed71c310f..45a5cfaaa5 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_split.pl
@@ -59,8 +59,7 @@ $result_trees{'htmlxref_only_split'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -144,8 +143,7 @@ $result_trees{'htmlxref_only_split'} = {
               ],
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -177,15 +175,13 @@ $result_trees{'htmlxref_only_split'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -218,8 +214,7 @@ $result_trees{'htmlxref_only_split'} = {
           },
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -247,8 +242,7 @@ $result_trees{'htmlxref_only_split'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -302,8 +296,7 @@ $result_trees{'htmlxref_only_split'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -371,15 +364,13 @@ $result_trees{'htmlxref_only_split'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -407,8 +398,7 @@ $result_trees{'htmlxref_only_split'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -449,8 +439,7 @@ $result_trees{'htmlxref_only_split'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -515,15 +504,13 @@ $result_trees{'htmlxref_only_split'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         },
         {
@@ -551,8 +538,7 @@ $result_trees{'htmlxref_only_split'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -606,8 +592,7 @@ $result_trees{'htmlxref_only_split'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -675,15 +660,13 @@ $result_trees{'htmlxref_only_split'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           }
         },
         {
@@ -711,8 +694,7 @@ $result_trees{'htmlxref_only_split'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -753,8 +735,7 @@ $result_trees{'htmlxref_only_split'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -819,15 +800,13 @@ $result_trees{'htmlxref_only_split'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 31,
-            'macro' => ''
+            'line_nr' => 31
           }
         },
         {
@@ -860,8 +839,7 @@ $result_trees{'htmlxref_only_split'} = {
           },
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 36,
-            'macro' => ''
+            'line_nr' => 36
           }
         },
         {
@@ -889,8 +867,7 @@ $result_trees{'htmlxref_only_split'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               }
             },
             {
@@ -936,8 +913,7 @@ $result_trees{'htmlxref_only_split'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               }
             },
             {
@@ -1005,15 +981,13 @@ $result_trees{'htmlxref_only_split'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 39,
-            'macro' => ''
+            'line_nr' => 39
           }
         },
         {
@@ -1046,8 +1020,7 @@ $result_trees{'htmlxref_only_split'} = {
           },
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 44,
-            'macro' => ''
+            'line_nr' => 44
           }
         },
         {
@@ -1075,8 +1048,7 @@ $result_trees{'htmlxref_only_split'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -1104,8 +1076,7 @@ $result_trees{'htmlxref_only_split'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -1166,15 +1137,13 @@ $result_trees{'htmlxref_only_split'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 47,
-            'macro' => ''
+            'line_nr' => 47
           }
         },
         {
@@ -1202,8 +1171,7 @@ $result_trees{'htmlxref_only_split'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 51,
-                'macro' => ''
+                'line_nr' => 51
               }
             },
             {
@@ -1231,8 +1199,7 @@ $result_trees{'htmlxref_only_split'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 51,
-                'macro' => ''
+                'line_nr' => 51
               }
             },
             {
@@ -1296,15 +1263,13 @@ $result_trees{'htmlxref_only_split'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 54,
-                'macro' => ''
+                'line_nr' => 54
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 52,
-            'macro' => ''
+            'line_nr' => 52
           }
         },
         {
@@ -1332,8 +1297,7 @@ $result_trees{'htmlxref_only_split'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -1366,8 +1330,7 @@ $result_trees{'htmlxref_only_split'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -1428,15 +1391,13 @@ $result_trees{'htmlxref_only_split'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 57,
-            'macro' => ''
+            'line_nr' => 57
           }
         },
         {
@@ -1464,8 +1425,7 @@ $result_trees{'htmlxref_only_split'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -1498,8 +1458,7 @@ $result_trees{'htmlxref_only_split'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -1560,15 +1519,13 @@ $result_trees{'htmlxref_only_split'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 62,
-            'macro' => ''
+            'line_nr' => 62
           }
         },
         {
@@ -1585,8 +1542,7 @@ $result_trees{'htmlxref_only_split'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -1679,8 +1635,7 @@ $result_trees{'htmlxref_only_split'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 66,
-        'macro' => ''
+        'line_nr' => 66
       }
     },
     {
@@ -1758,15 +1713,13 @@ $result_trees{'htmlxref_only_split'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 69,
-            'macro' => ''
+            'line_nr' => 69
           }
         },
         {
@@ -1794,8 +1747,7 @@ $result_trees{'htmlxref_only_split'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 73,
-                'macro' => ''
+                'line_nr' => 73
               }
             },
             {
@@ -1828,8 +1780,7 @@ $result_trees{'htmlxref_only_split'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 73,
-                'macro' => ''
+                'line_nr' => 73
               }
             },
             {
@@ -1890,15 +1841,13 @@ $result_trees{'htmlxref_only_split'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 76,
-                'macro' => ''
+                'line_nr' => 76
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 74,
-            'macro' => ''
+            'line_nr' => 74
           }
         },
         {
@@ -1963,8 +1912,7 @@ $result_trees{'htmlxref_only_split'} = {
               ],
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 79,
-                'macro' => ''
+                'line_nr' => 79
               },
               'type' => 'menu_entry'
             },
@@ -2011,8 +1959,7 @@ $result_trees{'htmlxref_only_split'} = {
               ],
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 80,
-                'macro' => ''
+                'line_nr' => 80
               },
               'type' => 'menu_entry'
             },
@@ -2059,8 +2006,7 @@ $result_trees{'htmlxref_only_split'} = {
               ],
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 81,
-                'macro' => ''
+                'line_nr' => 81
               },
               'type' => 'menu_entry'
             },
@@ -2092,15 +2038,13 @@ $result_trees{'htmlxref_only_split'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 82,
-                'macro' => ''
+                'line_nr' => 82
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 78,
-            'macro' => ''
+            'line_nr' => 78
           }
         },
         {
@@ -2119,8 +2063,7 @@ $result_trees{'htmlxref_only_split'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 67,
-        'macro' => ''
+        'line_nr' => 67
       }
     },
     {
@@ -2254,15 +2197,13 @@ $result_trees{'htmlxref_only_split'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 87,
-                'macro' => ''
+                'line_nr' => 87
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 85,
-            'macro' => ''
+            'line_nr' => 85
           }
         },
         {
@@ -2282,8 +2223,7 @@ $result_trees{'htmlxref_only_split'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 84,
-        'macro' => ''
+        'line_nr' => 84
       }
     },
     {
@@ -2407,15 +2347,13 @@ $result_trees{'htmlxref_only_split'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 92,
-                'macro' => ''
+                'line_nr' => 92
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 90,
-            'macro' => ''
+            'line_nr' => 90
           }
         },
         {
@@ -2435,8 +2373,7 @@ $result_trees{'htmlxref_only_split'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 89,
-        'macro' => ''
+        'line_nr' => 89
       }
     },
     {
@@ -2544,15 +2481,13 @@ $result_trees{'htmlxref_only_split'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 97,
-                'macro' => ''
+                'line_nr' => 97
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 95,
-            'macro' => ''
+            'line_nr' => 95
           }
         },
         {
@@ -2572,8 +2507,7 @@ $result_trees{'htmlxref_only_split'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 94,
-        'macro' => ''
+        'line_nr' => 94
       }
     },
     {
diff --git a/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
index 4b51cb416f..baa1f12d37 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
@@ -59,8 +59,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -144,8 +143,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -177,15 +175,13 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -218,8 +214,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -247,8 +242,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -302,8 +296,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -371,15 +364,13 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -407,8 +398,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -449,8 +439,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -515,15 +504,13 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         },
         {
@@ -551,8 +538,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -606,8 +592,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -675,15 +660,13 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           }
         },
         {
@@ -711,8 +694,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -753,8 +735,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -819,15 +800,13 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 31,
-            'macro' => ''
+            'line_nr' => 31
           }
         },
         {
@@ -860,8 +839,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 36,
-            'macro' => ''
+            'line_nr' => 36
           }
         },
         {
@@ -889,8 +867,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               }
             },
             {
@@ -936,8 +913,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               }
             },
             {
@@ -1005,15 +981,13 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 39,
-            'macro' => ''
+            'line_nr' => 39
           }
         },
         {
@@ -1046,8 +1020,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 44,
-            'macro' => ''
+            'line_nr' => 44
           }
         },
         {
@@ -1075,8 +1048,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -1104,8 +1076,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -1166,15 +1137,13 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 47,
-            'macro' => ''
+            'line_nr' => 47
           }
         },
         {
@@ -1202,8 +1171,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 51,
-                'macro' => ''
+                'line_nr' => 51
               }
             },
             {
@@ -1231,8 +1199,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 51,
-                'macro' => ''
+                'line_nr' => 51
               }
             },
             {
@@ -1296,15 +1263,13 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 54,
-                'macro' => ''
+                'line_nr' => 54
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 52,
-            'macro' => ''
+            'line_nr' => 52
           }
         },
         {
@@ -1332,8 +1297,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -1366,8 +1330,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -1428,15 +1391,13 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 57,
-            'macro' => ''
+            'line_nr' => 57
           }
         },
         {
@@ -1464,8 +1425,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -1498,8 +1458,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -1560,15 +1519,13 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 62,
-            'macro' => ''
+            'line_nr' => 62
           }
         },
         {
@@ -1585,8 +1542,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -1679,8 +1635,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 66,
-        'macro' => ''
+        'line_nr' => 66
       }
     },
     {
@@ -1758,15 +1713,13 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 69,
-            'macro' => ''
+            'line_nr' => 69
           }
         },
         {
@@ -1794,8 +1747,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 73,
-                'macro' => ''
+                'line_nr' => 73
               }
             },
             {
@@ -1828,8 +1780,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 73,
-                'macro' => ''
+                'line_nr' => 73
               }
             },
             {
@@ -1890,15 +1841,13 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 76,
-                'macro' => ''
+                'line_nr' => 76
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 74,
-            'macro' => ''
+            'line_nr' => 74
           }
         },
         {
@@ -1963,8 +1912,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 79,
-                'macro' => ''
+                'line_nr' => 79
               },
               'type' => 'menu_entry'
             },
@@ -2011,8 +1959,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 80,
-                'macro' => ''
+                'line_nr' => 80
               },
               'type' => 'menu_entry'
             },
@@ -2059,8 +2006,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 81,
-                'macro' => ''
+                'line_nr' => 81
               },
               'type' => 'menu_entry'
             },
@@ -2092,15 +2038,13 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 82,
-                'macro' => ''
+                'line_nr' => 82
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 78,
-            'macro' => ''
+            'line_nr' => 78
           }
         },
         {
@@ -2119,8 +2063,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 67,
-        'macro' => ''
+        'line_nr' => 67
       }
     },
     {
@@ -2254,15 +2197,13 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 87,
-                'macro' => ''
+                'line_nr' => 87
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 85,
-            'macro' => ''
+            'line_nr' => 85
           }
         },
         {
@@ -2282,8 +2223,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 84,
-        'macro' => ''
+        'line_nr' => 84
       }
     },
     {
@@ -2407,15 +2347,13 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 92,
-                'macro' => ''
+                'line_nr' => 92
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 90,
-            'macro' => ''
+            'line_nr' => 90
           }
         },
         {
@@ -2435,8 +2373,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 89,
-        'macro' => ''
+        'line_nr' => 89
       }
     },
     {
@@ -2544,15 +2481,13 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
-                'line_nr' => 97,
-                'macro' => ''
+                'line_nr' => 97
               }
             }
           ],
           'source_info' => {
             'file_name' => 'test_refs.texi',
-            'line_nr' => 95,
-            'macro' => ''
+            'line_nr' => 95
           }
         },
         {
@@ -2572,8 +2507,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'test_refs.texi',
-        'line_nr' => 94,
-        'macro' => ''
+        'line_nr' => 94
       }
     },
     {
diff --git a/tp/t/results/include/cpp_line_before_first_node.pl 
b/tp/t/results/include/cpp_line_before_first_node.pl
index e1e3df2aa8..d337c46297 100644
--- a/tp/t/results/include/cpp_line_before_first_node.pl
+++ b/tp/t/results/include/cpp_line_before_first_node.pl
@@ -99,7 +99,6 @@ $result_errors{'cpp_line_before_first_node'} = [
 ',
     'file_name' => 'foo.ptexi',
     'line_nr' => 102,
-    'macro' => '',
     'text' => 'unknown command `gggg\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/include/cpp_line_latin1.pl 
b/tp/t/results/include/cpp_line_latin1.pl
index 8d63d1e0b6..0101df11ed 100644
--- a/tp/t/results/include/cpp_line_latin1.pl
+++ b/tp/t/results/include/cpp_line_latin1.pl
@@ -55,8 +55,7 @@ $result_trees{'cpp_line_latin1'} = {
               },
               'source_info' => {
                 'file_name' => 'cpp_line_latin1.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -99,8 +98,7 @@ $result_trees{'cpp_line_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'cpp_line_latin1.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -126,8 +124,7 @@ $result_trees{'cpp_line_latin1'} = {
       'extra' => {},
       'source_info' => {
         'file_name' => 'cpp_line_latin1.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -195,8 +192,7 @@ $result_trees{'cpp_line_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'cpp_line_latin1.texi',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -309,7 +305,6 @@ $result_errors{'cpp_line_latin1'} = [
 ',
     'file_name' => 'foo.ptèxi',
     'line_nr' => 102,
-    'macro' => '',
     'text' => 'unknown command `gggg\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/include/cpp_lines.pl 
b/tp/t/results/include/cpp_lines.pl
index 092a5156a0..346f51d611 100644
--- a/tp/t/results/include/cpp_lines.pl
+++ b/tp/t/results/include/cpp_lines.pl
@@ -54,8 +54,7 @@ $result_trees{'cpp_lines'} = {
               },
               'source_info' => {
                 'file_name' => 'cpp_lines.texi',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -87,8 +86,7 @@ $result_trees{'cpp_lines'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => 'g_f',
-                'line_nr' => 68,
-                'macro' => ''
+                'line_nr' => 68
               }
             },
             {
@@ -135,8 +133,7 @@ $result_trees{'cpp_lines'} = {
       },
       'source_info' => {
         'file_name' => 'g_f',
-        'line_nr' => 70,
-        'macro' => ''
+        'line_nr' => 70
       }
     },
     {
@@ -233,15 +230,13 @@ $result_trees{'cpp_lines'} = {
               },
               'source_info' => {
                 'file_name' => 'g_f',
-                'line_nr' => 51,
-                'macro' => ''
+                'line_nr' => 51
               }
             }
           ],
           'source_info' => {
             'file_name' => 'g_f',
-            'line_nr' => 48,
-            'macro' => ''
+            'line_nr' => 48
           }
         },
         {
@@ -291,8 +286,7 @@ $result_trees{'cpp_lines'} = {
               },
               'source_info' => {
                 'file_name' => 'g_f',
-                'line_nr' => 55,
-                'macro' => ''
+                'line_nr' => 55
               }
             }
           ],
@@ -302,8 +296,7 @@ $result_trees{'cpp_lines'} = {
           },
           'source_info' => {
             'file_name' => 'g_f',
-            'line_nr' => 53,
-            'macro' => ''
+            'line_nr' => 53
           }
         },
         {
@@ -327,8 +320,7 @@ $result_trees{'cpp_lines'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => 'g_f',
-                'line_nr' => 57,
-                'macro' => ''
+                'line_nr' => 57
               }
             },
             {
@@ -400,8 +392,7 @@ $result_trees{'cpp_lines'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => 'g_f',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -463,8 +454,7 @@ $result_trees{'cpp_lines'} = {
               },
               'source_info' => {
                 'file_name' => 'g_f',
-                'line_nr' => 66,
-                'macro' => ''
+                'line_nr' => 66
               }
             }
           ],
@@ -474,8 +464,7 @@ $result_trees{'cpp_lines'} = {
           },
           'source_info' => {
             'file_name' => 'g_f',
-            'line_nr' => 63,
-            'macro' => ''
+            'line_nr' => 63
           }
         },
         {
@@ -499,8 +488,7 @@ $result_trees{'cpp_lines'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => 'g_f',
-                'line_nr' => 68,
-                'macro' => ''
+                'line_nr' => 68
               }
             },
             {
@@ -576,8 +564,7 @@ $result_trees{'cpp_lines'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => 'g_f',
-                'line_nr' => 72,
-                'macro' => ''
+                'line_nr' => 72
               }
             },
             {
@@ -619,8 +606,7 @@ $result_trees{'cpp_lines'} = {
                 },
                 'source_info' => {
                   'file_name' => 'g_f',
-                  'line_nr' => 74,
-                  'macro' => ''
+                  'line_nr' => 74
                 }
               },
               'position' => 1,
@@ -658,8 +644,7 @@ $result_trees{'cpp_lines'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => 'inc',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -698,8 +683,7 @@ $result_trees{'cpp_lines'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => 'g_f',
-                'line_nr' => 75,
-                'macro' => ''
+                'line_nr' => 75
               }
             },
             {
@@ -740,8 +724,7 @@ $result_trees{'cpp_lines'} = {
               },
               'source_info' => {
                 'file_name' => 'g_f',
-                'line_nr' => 77,
-                'macro' => ''
+                'line_nr' => 77
               }
             },
             {
@@ -772,8 +755,7 @@ $result_trees{'cpp_lines'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => 'g_f',
-                'line_nr' => 81,
-                'macro' => ''
+                'line_nr' => 81
               }
             },
             {
@@ -818,8 +800,7 @@ $result_trees{'cpp_lines'} = {
               },
               'source_info' => {
                 'file_name' => 'g_f',
-                'line_nr' => 83,
-                'macro' => ''
+                'line_nr' => 83
               }
             },
             {
@@ -869,8 +850,7 @@ $result_trees{'cpp_lines'} = {
               },
               'source_info' => {
                 'file_name' => 'footnote',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             },
             {
@@ -930,8 +910,7 @@ $result_trees{'cpp_lines'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => 'footnote2',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               }
             },
             {
@@ -986,8 +965,7 @@ $result_trees{'cpp_lines'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => 'email2',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             },
             {
@@ -1042,8 +1020,7 @@ $result_trees{'cpp_lines'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => 'email2',
-                'line_nr' => 69,
-                'macro' => ''
+                'line_nr' => 69
               }
             },
             {
@@ -1082,8 +1059,7 @@ $result_trees{'cpp_lines'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => 'email12',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             }
           ],
@@ -1170,8 +1146,7 @@ $result_trees{'cpp_lines'} = {
           },
           'source_info' => {
             'file_name' => 'accentêd',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -1191,8 +1166,7 @@ $result_trees{'cpp_lines'} = {
       },
       'source_info' => {
         'file_name' => 'g_f',
-        'line_nr' => 71,
-        'macro' => ''
+        'line_nr' => 71
       }
     },
     {
@@ -1404,7 +1378,6 @@ $result_errors{'cpp_lines'} = [
 ',
     'file_name' => 'email12',
     'line_nr' => 64,
-    'macro' => '',
     'text' => '@email missing closing brace',
     'type' => 'error'
   },
@@ -1413,7 +1386,6 @@ $result_errors{'cpp_lines'} = [
 ',
     'file_name' => 'email4',
     'line_nr' => 63,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   },
@@ -1422,7 +1394,6 @@ $result_errors{'cpp_lines'} = [
 ",
     'file_name' => 'accentêd',
     'line_nr' => 7,
-    'macro' => '',
     'text' => "l\x{e0}ng is not a valid language code",
     'type' => 'warning'
   }
diff --git a/tp/t/results/include/double_include.pl 
b/tp/t/results/include/double_include.pl
index 8a34f0037b..da62c0ab65 100644
--- a/tp/t/results/include/double_include.pl
+++ b/tp/t/results/include/double_include.pl
@@ -54,8 +54,7 @@ $result_trees{'double_include'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 2,
-                                'macro' => ''
+                                'line_nr' => 2
                               }
                             },
                             'position' => 1,
@@ -80,8 +79,7 @@ $result_trees{'double_include'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 2,
-                  'macro' => ''
+                  'line_nr' => 2
                 }
               },
               'position' => 1,
@@ -146,7 +144,6 @@ $result_errors{'double_include'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@include should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -155,7 +152,6 @@ $result_errors{'double_include'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@include should not appear in @include',
     'type' => 'warning'
   }
diff --git a/tp/t/results/include/include_at_end_line.pl 
b/tp/t/results/include/include_at_end_line.pl
index 12c883ddc3..e56538af03 100644
--- a/tp/t/results/include/include_at_end_line.pl
+++ b/tp/t/results/include/include_at_end_line.pl
@@ -35,8 +35,7 @@ $result_trees{'include_at_end_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -73,7 +72,6 @@ $result_errors{'include_at_end_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'bad argument to @include: inc_file.texi@',
     'type' => 'error'
   }
diff --git a/tp/t/results/include/include_comment.pl 
b/tp/t/results/include/include_comment.pl
index 6e43029a4f..32bb4622e6 100644
--- a/tp/t/results/include/include_comment.pl
+++ b/tp/t/results/include/include_comment.pl
@@ -46,8 +46,7 @@ $result_trees{'include_comment'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 1,
-                  'macro' => ''
+                  'line_nr' => 1
                 }
               },
               'sourcemark_type' => 'include',
diff --git a/tp/t/results/include/include_setfilename_on_setfilename_line.pl 
b/tp/t/results/include/include_setfilename_on_setfilename_line.pl
index 3e5890ef5f..57fab699bd 100644
--- a/tp/t/results/include/include_setfilename_on_setfilename_line.pl
+++ b/tp/t/results/include/include_setfilename_on_setfilename_line.pl
@@ -51,8 +51,7 @@ $result_trees{'include_setfilename_on_setfilename_line'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 1,
-                            'macro' => ''
+                            'line_nr' => 1
                           }
                         }
                       ],
@@ -70,8 +69,7 @@ $result_trees{'include_setfilename_on_setfilename_line'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 }
               ],
@@ -89,8 +87,7 @@ $result_trees{'include_setfilename_on_setfilename_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -112,7 +109,6 @@ $result_errors{'include_setfilename_on_setfilename_line'} = 
[
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@setfilename should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -121,7 +117,6 @@ $result_errors{'include_setfilename_on_setfilename_line'} = 
[
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@setfilename should not appear in @setfilename',
     'type' => 'warning'
   },
@@ -130,7 +125,6 @@ $result_errors{'include_setfilename_on_setfilename_line'} = 
[
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'multiple @setfilename',
     'type' => 'warning'
   },
@@ -139,7 +133,6 @@ $result_errors{'include_setfilename_on_setfilename_line'} = 
[
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@include should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -148,7 +141,6 @@ $result_errors{'include_setfilename_on_setfilename_line'} = 
[
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@include should not appear in @setfilename',
     'type' => 'warning'
   },
@@ -157,7 +149,6 @@ $result_errors{'include_setfilename_on_setfilename_line'} = 
[
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@include: could not find are you joking!',
     'type' => 'error'
   },
@@ -166,7 +157,6 @@ $result_errors{'include_setfilename_on_setfilename_line'} = 
[
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'bad argument to @setfilename: other file @include are you 
joking!',
     'type' => 'error'
   },
@@ -175,7 +165,6 @@ $result_errors{'include_setfilename_on_setfilename_line'} = 
[
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'bad argument to @setfilename: file @setfilename other file 
@include are you joking!',
     'type' => 'error'
   }
diff --git a/tp/t/results/include/include_space.pl 
b/tp/t/results/include/include_space.pl
index 9eb872c3f6..a3e0a44537 100644
--- a/tp/t/results/include/include_space.pl
+++ b/tp/t/results/include/include_space.pl
@@ -41,8 +41,7 @@ $result_trees{'include_space'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 1,
-                  'macro' => ''
+                  'line_nr' => 1
                 }
               },
               'sourcemark_type' => 'include',
diff --git a/tp/t/results/include/include_space_comment.pl 
b/tp/t/results/include/include_space_comment.pl
index 988c1bae98..95774d7440 100644
--- a/tp/t/results/include/include_space_comment.pl
+++ b/tp/t/results/include/include_space_comment.pl
@@ -49,8 +49,7 @@ $result_trees{'include_space_comment'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 1,
-                  'macro' => ''
+                  'line_nr' => 1
                 }
               },
               'sourcemark_type' => 'include',
diff --git a/tp/t/results/include/include_with_setfilename.pl 
b/tp/t/results/include/include_with_setfilename.pl
index 003ff1d9d4..99eb1832c3 100644
--- a/tp/t/results/include/include_with_setfilename.pl
+++ b/tp/t/results/include/include_with_setfilename.pl
@@ -41,8 +41,7 @@ $result_trees{'include_with_setfilename'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 1,
-                  'macro' => ''
+                  'line_nr' => 1
                 }
               },
               'sourcemark_type' => 'include',
@@ -78,8 +77,7 @@ $result_trees{'include_with_setfilename'} = {
                 },
                 'source_info' => {
                   'file_name' => 'included_file_with_setfilename.texi',
-                  'line_nr' => 1,
-                  'macro' => ''
+                  'line_nr' => 1
                 }
               },
               'sourcemark_type' => 'setfilename'
@@ -137,8 +135,7 @@ $result_trees{'include_with_setfilename'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
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 bca506ceb9..acfd72b98e 100644
--- a/tp/t/results/include/include_with_setfilename_in_preformatted.pl
+++ b/tp/t/results/include/include_with_setfilename_in_preformatted.pl
@@ -55,8 +55,7 @@ $result_trees{'include_with_setfilename_in_preformatted'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 2,
-                      'macro' => ''
+                      'line_nr' => 2
                     }
                   },
                   'sourcemark_type' => 'include',
@@ -92,8 +91,7 @@ $result_trees{'include_with_setfilename_in_preformatted'} = {
                     },
                     'source_info' => {
                       'file_name' => 'included_file_with_setfilename.texi',
-                      'line_nr' => 1,
-                      'macro' => ''
+                      'line_nr' => 1
                     }
                   },
                   'sourcemark_type' => 'setfilename'
@@ -148,15 +146,13 @@ $result_trees{'include_with_setfilename_in_preformatted'} 
= {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
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 fa4aaad715..79b5fbcfe5 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
@@ -51,8 +51,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -131,8 +129,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -182,8 +179,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
@@ -193,8 +189,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -260,8 +255,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -316,8 +310,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
@@ -327,8 +320,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -368,8 +360,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -405,8 +396,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 19,
-        'macro' => ''
+        'line_nr' => 19
       }
     },
     {
@@ -474,8 +464,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 23,
-                  'macro' => ''
+                  'line_nr' => 23
                 }
               },
               'position' => 1,
@@ -529,8 +518,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
               },
               'source_info' => {
                 'file_name' => 'macro_included.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -540,8 +528,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
           },
           'source_info' => {
             'file_name' => 'macro_included.texi',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           },
           'source_marks' => [
             {
@@ -700,8 +687,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 27,
-            'macro' => ''
+            'line_nr' => 27
           }
         }
       ],
@@ -716,8 +702,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 21,
-        'macro' => ''
+        'line_nr' => 21
       }
     }
   ],
@@ -840,7 +825,6 @@ $result_errors{'macro_and_commands_in_early_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'encoding `ISO-8859-1@\' is not a canonical texinfo encoding',
     'type' => 'warning'
   }
diff --git a/tp/t/results/include/macro_definition_in_include.pl 
b/tp/t/results/include/macro_definition_in_include.pl
index a5346627ff..dcff3d8962 100644
--- a/tp/t/results/include/macro_definition_in_include.pl
+++ b/tp/t/results/include/macro_definition_in_include.pl
@@ -41,8 +41,7 @@ $result_trees{'macro_definition_in_include'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 1,
-                  'macro' => ''
+                  'line_nr' => 1
                 }
               },
               'sourcemark_type' => 'include',
@@ -93,8 +92,7 @@ $result_trees{'macro_definition_in_include'} = {
               },
               'source_info' => {
                 'file_name' => 'macro_included.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -104,8 +102,7 @@ $result_trees{'macro_definition_in_include'} = {
           },
           'source_info' => {
             'file_name' => 'macro_included.texi',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           },
           'source_marks' => [
             {
diff --git a/tp/t/results/include/macro_in_early_commands.pl 
b/tp/t/results/include/macro_in_early_commands.pl
index 852503584a..425b46023d 100644
--- a/tp/t/results/include/macro_in_early_commands.pl
+++ b/tp/t/results/include/macro_in_early_commands.pl
@@ -51,8 +51,7 @@ $result_trees{'macro_in_early_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'macro_in_early_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -112,8 +110,7 @@ $result_trees{'macro_in_early_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -123,8 +120,7 @@ $result_trees{'macro_in_early_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -215,8 +211,7 @@ $result_trees{'macro_in_early_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -266,8 +261,7 @@ $result_trees{'macro_in_early_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
@@ -277,8 +271,7 @@ $result_trees{'macro_in_early_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -328,8 +321,7 @@ $result_trees{'macro_in_early_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
@@ -339,8 +331,7 @@ $result_trees{'macro_in_early_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           }
         },
         {
@@ -479,8 +470,7 @@ $result_trees{'macro_in_early_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             }
           ],
@@ -490,8 +480,7 @@ $result_trees{'macro_in_early_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
@@ -531,8 +520,7 @@ $result_trees{'macro_in_early_commands'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
@@ -568,8 +556,7 @@ $result_trees{'macro_in_early_commands'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 26,
-        'macro' => ''
+        'line_nr' => 26
       }
     },
     {
@@ -637,8 +624,7 @@ $result_trees{'macro_in_early_commands'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 30,
-                  'macro' => ''
+                  'line_nr' => 30
                 }
               },
               'position' => 1,
@@ -692,8 +678,7 @@ $result_trees{'macro_in_early_commands'} = {
               },
               'source_info' => {
                 'file_name' => 'macro_included.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -703,8 +688,7 @@ $result_trees{'macro_in_early_commands'} = {
           },
           'source_info' => {
             'file_name' => 'macro_included.texi',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           },
           'source_marks' => [
             {
@@ -891,8 +875,7 @@ $result_trees{'macro_in_early_commands'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 28,
-        'macro' => ''
+        'line_nr' => 28
       }
     }
   ],
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 88e8d70cbe..6474ac9883 100644
--- a/tp/t/results/include/no_eol_in_included_file.pl
+++ b/tp/t/results/include/no_eol_in_included_file.pl
@@ -43,8 +43,7 @@ $result_trees{'no_eol_in_included_file'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 2,
-                      'macro' => ''
+                      'line_nr' => 2
                     }
                   },
                   'position' => 12,
diff --git a/tp/t/results/include/simple.pl b/tp/t/results/include/simple.pl
index cbe249ed47..9f66367502 100644
--- a/tp/t/results/include/simple.pl
+++ b/tp/t/results/include/simple.pl
@@ -41,8 +41,7 @@ $result_trees{'simple'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 1,
-                  'macro' => ''
+                  'line_nr' => 1
                 }
               },
               'sourcemark_type' => 'include',
diff --git a/tp/t/results/include/simple_no_eol.pl 
b/tp/t/results/include/simple_no_eol.pl
index bd37f1ab6d..8cb74e23b4 100644
--- a/tp/t/results/include/simple_no_eol.pl
+++ b/tp/t/results/include/simple_no_eol.pl
@@ -35,8 +35,7 @@ $result_trees{'simple_no_eol'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 1,
-                  'macro' => ''
+                  'line_nr' => 1
                 }
               },
               'sourcemark_type' => 'include',
diff --git a/tp/t/results/include/test_two_include.pl 
b/tp/t/results/include/test_two_include.pl
index e78009ad6e..e2031c23f3 100644
--- a/tp/t/results/include/test_two_include.pl
+++ b/tp/t/results/include/test_two_include.pl
@@ -43,8 +43,7 @@ $result_trees{'test_two_include'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 2,
-                      'macro' => ''
+                      'line_nr' => 2
                     }
                   },
                   'position' => 16,
@@ -228,8 +227,7 @@ $result_trees{'test_two_include'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 5,
-                      'macro' => ''
+                      'line_nr' => 5
                     }
                   },
                   'position' => 17,
diff --git a/tp/t/results/include/value_expansion_in_include.pl 
b/tp/t/results/include/value_expansion_in_include.pl
index d88332bb8a..7dfdb2bbc0 100644
--- a/tp/t/results/include/value_expansion_in_include.pl
+++ b/tp/t/results/include/value_expansion_in_include.pl
@@ -132,8 +132,7 @@ $result_trees{'value_expansion_in_include'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -224,8 +223,7 @@ $result_trees{'value_expansion_in_include'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 13,
-                      'macro' => ''
+                      'line_nr' => 13
                     }
                   },
                   'position' => 17,
@@ -249,8 +247,7 @@ $result_trees{'value_expansion_in_include'} = {
               'cmdname' => 'emph',
               'source_info' => {
                 'file_name' => 'incl-incl.txi',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -340,8 +337,7 @@ $result_trees{'value_expansion_in_include'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         },
         {
@@ -418,8 +414,7 @@ $result_trees{'value_expansion_in_include'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 18,
-                      'macro' => ''
+                      'line_nr' => 18
                     }
                   },
                   'position' => 18,
@@ -443,8 +438,7 @@ $result_trees{'value_expansion_in_include'} = {
               'cmdname' => 'emph',
               'source_info' => {
                 'file_name' => 'incl-incl.txi',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -534,8 +528,7 @@ $result_trees{'value_expansion_in_include'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
@@ -610,8 +603,7 @@ $result_trees{'value_expansion_in_include'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 23,
-                      'macro' => ''
+                      'line_nr' => 23
                     }
                   },
                   'position' => 18,
@@ -635,8 +627,7 @@ $result_trees{'value_expansion_in_include'} = {
               'cmdname' => 'emph',
               'source_info' => {
                 'file_name' => 'incl-incl.txi',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -724,8 +715,7 @@ $result_trees{'value_expansion_in_include'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           }
         }
       ],
@@ -740,8 +730,7 @@ $result_trees{'value_expansion_in_include'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     }
   ],
@@ -835,7 +824,6 @@ $result_errors{'value_expansion_in_include'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => '@include should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -844,7 +832,6 @@ $result_errors{'value_expansion_in_include'} = [
 ',
     'file_name' => '',
     'line_nr' => 15,
-    'macro' => '',
     'text' => '@verbatiminclude should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -853,7 +840,6 @@ $result_errors{'value_expansion_in_include'} = [
 ',
     'file_name' => '',
     'line_nr' => 18,
-    'macro' => '',
     'text' => '@include should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -862,7 +848,6 @@ $result_errors{'value_expansion_in_include'} = [
 ',
     'file_name' => '',
     'line_nr' => 20,
-    'macro' => '',
     'text' => '@verbatiminclude should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -871,7 +856,6 @@ $result_errors{'value_expansion_in_include'} = [
 ',
     'file_name' => '',
     'line_nr' => 23,
-    'macro' => '',
     'text' => '@include should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -880,7 +864,6 @@ $result_errors{'value_expansion_in_include'} = [
 ',
     'file_name' => '',
     'line_nr' => 25,
-    'macro' => '',
     'text' => '@verbatiminclude should only appear at the beginning of a line',
     'type' => 'warning'
   }
diff --git a/tp/t/results/include/verbatiminclude_and_encoding.pl 
b/tp/t/results/include/verbatiminclude_and_encoding.pl
index 5cec2b15f2..58f8534cca 100644
--- a/tp/t/results/include/verbatiminclude_and_encoding.pl
+++ b/tp/t/results/include/verbatiminclude_and_encoding.pl
@@ -38,8 +38,7 @@ $result_trees{'verbatiminclude_and_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -76,8 +75,7 @@ $result_trees{'verbatiminclude_and_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         }
       ],
diff --git a/tp/t/results/include/verbatiminclude_and_encoding_latin1.pl 
b/tp/t/results/include/verbatiminclude_and_encoding_latin1.pl
index ccd279146c..e18f180b04 100644
--- a/tp/t/results/include/verbatiminclude_and_encoding_latin1.pl
+++ b/tp/t/results/include/verbatiminclude_and_encoding_latin1.pl
@@ -38,8 +38,7 @@ $result_trees{'verbatiminclude_and_encoding_latin1'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -76,8 +75,7 @@ $result_trees{'verbatiminclude_and_encoding_latin1'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         }
       ],
diff --git a/tp/t/results/indices/complex_recursive_synindex.pl 
b/tp/t/results/indices/complex_recursive_synindex.pl
index c2d1fa1381..9a549964ac 100644
--- a/tp/t/results/indices/complex_recursive_synindex.pl
+++ b/tp/t/results/indices/complex_recursive_synindex.pl
@@ -39,8 +39,7 @@ $result_trees{'complex_recursive_synindex'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -97,8 +96,7 @@ $result_trees{'complex_recursive_synindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -131,8 +129,7 @@ $result_trees{'complex_recursive_synindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -165,8 +162,7 @@ $result_trees{'complex_recursive_synindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -199,8 +195,7 @@ $result_trees{'complex_recursive_synindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -233,8 +228,7 @@ $result_trees{'complex_recursive_synindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -273,8 +267,7 @@ $result_trees{'complex_recursive_synindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -302,8 +295,7 @@ $result_trees{'complex_recursive_synindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -342,8 +334,7 @@ $result_trees{'complex_recursive_synindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -377,8 +368,7 @@ $result_trees{'complex_recursive_synindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           }
         },
         {
@@ -414,8 +404,7 @@ $result_trees{'complex_recursive_synindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           },
           'type' => 'index_entry_command'
         },
@@ -455,8 +444,7 @@ $result_trees{'complex_recursive_synindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -484,8 +472,7 @@ $result_trees{'complex_recursive_synindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           }
         },
         {
@@ -526,8 +513,7 @@ $result_trees{'complex_recursive_synindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           },
           'type' => 'index_entry_command'
         },
@@ -564,8 +550,7 @@ $result_trees{'complex_recursive_synindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 21,
-            'macro' => ''
+            'line_nr' => 21
           },
           'type' => 'index_entry_command'
         },
@@ -602,8 +587,7 @@ $result_trees{'complex_recursive_synindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 22,
-            'macro' => ''
+            'line_nr' => 22
           },
           'type' => 'index_entry_command'
         },
@@ -640,8 +624,7 @@ $result_trees{'complex_recursive_synindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           },
           'type' => 'index_entry_command'
         },
@@ -678,8 +661,7 @@ $result_trees{'complex_recursive_synindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 24,
-            'macro' => ''
+            'line_nr' => 24
           },
           'type' => 'index_entry_command'
         },
@@ -727,8 +709,7 @@ $result_trees{'complex_recursive_synindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 27,
-            'macro' => ''
+            'line_nr' => 27
           }
         },
         {
@@ -775,8 +756,7 @@ $result_trees{'complex_recursive_synindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 30,
-            'macro' => ''
+            'line_nr' => 30
           }
         },
         {
@@ -823,8 +803,7 @@ $result_trees{'complex_recursive_synindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 33,
-            'macro' => ''
+            'line_nr' => 33
           }
         },
         {
@@ -871,8 +850,7 @@ $result_trees{'complex_recursive_synindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 36,
-            'macro' => ''
+            'line_nr' => 36
           }
         },
         {
@@ -919,8 +897,7 @@ $result_trees{'complex_recursive_synindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 39,
-            'macro' => ''
+            'line_nr' => 39
           }
         }
       ],
@@ -936,8 +913,7 @@ $result_trees{'complex_recursive_synindex'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
@@ -1052,7 +1028,6 @@ $result_errors{'complex_recursive_synindex'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => '@synindex leads to a merging of bbb in itself, ignoring',
     'type' => 'warning'
   },
@@ -1061,7 +1036,6 @@ $result_errors{'complex_recursive_synindex'} = [
 ',
     'file_name' => '',
     'line_nr' => 18,
-    'macro' => '',
     'text' => '@synindex leads to a merging of bbb in itself, ignoring',
     'type' => 'warning'
   },
@@ -1070,7 +1044,6 @@ $result_errors{'complex_recursive_synindex'} = [
 ',
     'file_name' => '',
     'line_nr' => 30,
-    'macro' => '',
     'text' => 'printing an index `aaa\' merged in another one, `bbb\'',
     'type' => 'warning'
   },
@@ -1079,7 +1052,6 @@ $result_errors{'complex_recursive_synindex'} = [
 ',
     'file_name' => '',
     'line_nr' => 33,
-    'macro' => '',
     'text' => 'printing an index `ccc\' merged in another one, `bbb\'',
     'type' => 'warning'
   },
@@ -1088,7 +1060,6 @@ $result_errors{'complex_recursive_synindex'} = [
 ',
     'file_name' => '',
     'line_nr' => 36,
-    'macro' => '',
     'text' => 'printing an index `ddd\' merged in another one, `bbb\'',
     'type' => 'warning'
   },
@@ -1097,7 +1068,6 @@ $result_errors{'complex_recursive_synindex'} = [
 ',
     'file_name' => '',
     'line_nr' => 39,
-    'macro' => '',
     'text' => 'printing an index `eee\' merged in another one, `bbb\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/indices/def_existing_index.pl 
b/tp/t/results/indices/def_existing_index.pl
index 7459e6224c..3269f0ed4d 100644
--- a/tp/t/results/indices/def_existing_index.pl
+++ b/tp/t/results/indices/def_existing_index.pl
@@ -34,8 +34,7 @@ $result_trees{'def_existing_index'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -57,7 +56,6 @@ $result_errors{'def_existing_index'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'reserved index name cp',
     'type' => 'error'
   }
diff --git a/tp/t/results/indices/def_syn_indices.pl 
b/tp/t/results/indices/def_syn_indices.pl
index a16fa309e1..c6d8ab062c 100644
--- a/tp/t/results/indices/def_syn_indices.pl
+++ b/tp/t/results/indices/def_syn_indices.pl
@@ -42,8 +42,7 @@ $result_trees{'def_syn_indices'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -86,8 +85,7 @@ $result_trees{'def_syn_indices'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -123,8 +121,7 @@ $result_trees{'def_syn_indices'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -157,8 +154,7 @@ $result_trees{'def_syn_indices'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -221,8 +217,7 @@ $result_trees{'def_syn_indices'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -270,8 +265,7 @@ $result_trees{'def_syn_indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           },
           'type' => 'index_entry_command'
         },
@@ -310,8 +304,7 @@ $result_trees{'def_syn_indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         },
         {
@@ -340,8 +333,7 @@ $result_trees{'def_syn_indices'} = {
                   'cmdname' => 'var',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 17,
-                    'macro' => ''
+                    'line_nr' => 17
                   }
                 },
                 {
@@ -361,8 +353,7 @@ $result_trees{'def_syn_indices'} = {
                   'cmdname' => '~',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 17,
-                    'macro' => ''
+                    'line_nr' => 17
                   }
                 },
                 {
@@ -386,8 +377,7 @@ $result_trees{'def_syn_indices'} = {
                           'cmdname' => 'dotless',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 17,
-                            'macro' => ''
+                            'line_nr' => 17
                           }
                         }
                       ],
@@ -397,8 +387,7 @@ $result_trees{'def_syn_indices'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 17,
-                    'macro' => ''
+                    'line_nr' => 17
                   }
                 }
               ],
@@ -427,8 +416,7 @@ $result_trees{'def_syn_indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           },
           'type' => 'index_entry_command'
         },
@@ -470,8 +458,7 @@ $result_trees{'def_syn_indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           },
           'type' => 'index_entry_command'
         },
@@ -511,8 +498,7 @@ $result_trees{'def_syn_indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 21,
-            'macro' => ''
+            'line_nr' => 21
           }
         },
         {
@@ -553,8 +539,7 @@ $result_trees{'def_syn_indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           },
           'type' => 'index_entry_command'
         },
@@ -591,8 +576,7 @@ $result_trees{'def_syn_indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 24,
-            'macro' => ''
+            'line_nr' => 24
           },
           'type' => 'index_entry_command'
         },
@@ -632,8 +616,7 @@ $result_trees{'def_syn_indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         },
         {
@@ -671,8 +654,7 @@ $result_trees{'def_syn_indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 28,
-            'macro' => ''
+            'line_nr' => 28
           }
         },
         {
@@ -705,8 +687,7 @@ $result_trees{'def_syn_indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 29,
-            'macro' => ''
+            'line_nr' => 29
           }
         },
         {
@@ -745,8 +726,7 @@ $result_trees{'def_syn_indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 31,
-            'macro' => ''
+            'line_nr' => 31
           }
         },
         {
@@ -780,8 +760,7 @@ $result_trees{'def_syn_indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 32,
-            'macro' => ''
+            'line_nr' => 32
           }
         },
         {
@@ -822,8 +801,7 @@ $result_trees{'def_syn_indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 34,
-            'macro' => ''
+            'line_nr' => 34
           },
           'type' => 'index_entry_command'
         },
@@ -865,8 +843,7 @@ $result_trees{'def_syn_indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 36,
-            'macro' => ''
+            'line_nr' => 36
           },
           'type' => 'index_entry_command'
         },
@@ -914,8 +891,7 @@ $result_trees{'def_syn_indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 39,
-            'macro' => ''
+            'line_nr' => 39
           }
         },
         {
@@ -962,8 +938,7 @@ $result_trees{'def_syn_indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 42,
-            'macro' => ''
+            'line_nr' => 42
           }
         },
         {
@@ -1010,8 +985,7 @@ $result_trees{'def_syn_indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 45,
-            'macro' => ''
+            'line_nr' => 45
           }
         },
         {
@@ -1058,8 +1032,7 @@ $result_trees{'def_syn_indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 48,
-            'macro' => ''
+            'line_nr' => 48
           }
         },
         {
@@ -1106,8 +1079,7 @@ $result_trees{'def_syn_indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 51,
-            'macro' => ''
+            'line_nr' => 51
           }
         },
         {
@@ -1154,8 +1126,7 @@ $result_trees{'def_syn_indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 54,
-            'macro' => ''
+            'line_nr' => 54
           }
         },
         {
@@ -1202,8 +1173,7 @@ $result_trees{'def_syn_indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 57,
-            'macro' => ''
+            'line_nr' => 57
           }
         },
         {
@@ -1250,8 +1220,7 @@ $result_trees{'def_syn_indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 60,
-            'macro' => ''
+            'line_nr' => 60
           }
         },
         {
@@ -1298,8 +1267,7 @@ $result_trees{'def_syn_indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 63,
-            'macro' => ''
+            'line_nr' => 63
           }
         }
       ],
@@ -1313,8 +1281,7 @@ $result_trees{'def_syn_indices'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     }
   ],
@@ -1538,7 +1505,6 @@ $result_errors{'def_syn_indices'} = [
 ',
     'file_name' => '',
     'line_nr' => 42,
-    'macro' => '',
     'text' => 'printing an index `ky\' merged in another one, `pg\'',
     'type' => 'warning'
   },
@@ -1547,7 +1513,6 @@ $result_errors{'def_syn_indices'} = [
 ',
     'file_name' => '',
     'line_nr' => 45,
-    'macro' => '',
     'text' => 'printing an index `truc\' merged in another one, `fn\'',
     'type' => 'warning'
   },
@@ -1556,7 +1521,6 @@ $result_errors{'def_syn_indices'} = [
 ',
     'file_name' => '',
     'line_nr' => 48,
-    'macro' => '',
     'text' => 'printing an index `truc\' merged in another one, `fn\'',
     'type' => 'warning'
   },
@@ -1565,7 +1529,6 @@ $result_errors{'def_syn_indices'} = [
 ',
     'file_name' => '',
     'line_nr' => 51,
-    'macro' => '',
     'text' => 'printing an index `cp\' merged in another one, `fn\'',
     'type' => 'warning'
   },
@@ -1574,7 +1537,6 @@ $result_errors{'def_syn_indices'} = [
 ',
     'file_name' => '',
     'line_nr' => 54,
-    'macro' => '',
     'text' => 'printing an index `cp\' merged in another one, `fn\'',
     'type' => 'warning'
   },
@@ -1583,7 +1545,6 @@ $result_errors{'def_syn_indices'} = [
 ',
     'file_name' => '',
     'line_nr' => 57,
-    'macro' => '',
     'text' => 'printing an index `defg\' merged in another one, `pg\'',
     'type' => 'warning'
   },
@@ -1592,7 +1553,6 @@ $result_errors{'def_syn_indices'} = [
 ',
     'file_name' => '',
     'line_nr' => 60,
-    'macro' => '',
     'text' => 'printing an index `abc\' merged in another one, `pg\'',
     'type' => 'warning'
   }
diff --git 
a/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl 
b/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl
index 5d01624dc9..030ed64db8 100644
Binary files 
a/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl and 
b/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl differ
diff --git a/tp/t/results/indices/double_index_entry.pl 
b/tp/t/results/indices/double_index_entry.pl
index 3d673eecae..ab82ab2205 100644
--- a/tp/t/results/indices/double_index_entry.pl
+++ b/tp/t/results/indices/double_index_entry.pl
@@ -72,8 +72,7 @@ $result_trees{'double_index_entry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           },
           'type' => 'index_entry_command'
         },
@@ -129,8 +128,7 @@ $result_trees{'double_index_entry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           },
           'type' => 'index_entry_command'
         },
@@ -196,8 +194,7 @@ $result_trees{'double_index_entry'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'menu_entry'
             },
@@ -229,15 +226,13 @@ $result_trees{'double_index_entry'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -257,8 +252,7 @@ $result_trees{'double_index_entry'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -340,8 +334,7 @@ $result_trees{'double_index_entry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           },
           'type' => 'index_entry_command'
         },
@@ -380,8 +373,7 @@ $result_trees{'double_index_entry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         }
       ],
@@ -397,8 +389,7 @@ $result_trees{'double_index_entry'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     }
   ],
diff --git a/tp/t/results/indices/double_seeentry_seealso.pl 
b/tp/t/results/indices/double_seeentry_seealso.pl
index d20dec8ec6..b407455b75 100644
--- a/tp/t/results/indices/double_seeentry_seealso.pl
+++ b/tp/t/results/indices/double_seeentry_seealso.pl
@@ -44,8 +44,7 @@ $result_trees{'double_seeentry_seealso'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -81,8 +80,7 @@ $result_trees{'double_seeentry_seealso'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -115,8 +113,7 @@ $result_trees{'double_seeentry_seealso'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -168,8 +165,7 @@ $result_trees{'double_seeentry_seealso'} = {
                   'cmdname' => 'seeentry',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 },
                 {
@@ -190,8 +186,7 @@ $result_trees{'double_seeentry_seealso'} = {
                   'cmdname' => 'seeentry',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
@@ -221,8 +216,7 @@ $result_trees{'double_seeentry_seealso'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           },
           'type' => 'index_entry_command'
         },
@@ -244,8 +238,7 @@ $result_trees{'double_seeentry_seealso'} = {
                   'cmdname' => 'seealso',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 8,
-                    'macro' => ''
+                    'line_nr' => 8
                   }
                 },
                 {
@@ -273,8 +266,7 @@ $result_trees{'double_seeentry_seealso'} = {
                   'cmdname' => 'seealso',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 8,
-                    'macro' => ''
+                    'line_nr' => 8
                   }
                 }
               ],
@@ -304,8 +296,7 @@ $result_trees{'double_seeentry_seealso'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           },
           'type' => 'index_entry_command'
         },
@@ -334,8 +325,7 @@ $result_trees{'double_seeentry_seealso'} = {
                   'cmdname' => 'seeentry',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 },
                 {
@@ -356,8 +346,7 @@ $result_trees{'double_seeentry_seealso'} = {
                   'cmdname' => 'seealso',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 }
               ],
@@ -388,8 +377,7 @@ $result_trees{'double_seeentry_seealso'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           },
           'type' => 'index_entry_command'
         },
@@ -411,8 +399,7 @@ $result_trees{'double_seeentry_seealso'} = {
                   'cmdname' => 'seealso',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 }
               ],
@@ -457,8 +444,7 @@ $result_trees{'double_seeentry_seealso'} = {
                       'cmdname' => 'seeentry',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     }
                   ],
@@ -483,8 +469,7 @@ $result_trees{'double_seeentry_seealso'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           },
@@ -496,8 +481,7 @@ $result_trees{'double_seeentry_seealso'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           },
           'type' => 'index_entry_command'
         },
@@ -537,8 +521,7 @@ $result_trees{'double_seeentry_seealso'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           }
         }
       ],
@@ -552,8 +535,7 @@ $result_trees{'double_seeentry_seealso'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
@@ -699,7 +681,6 @@ $result_errors{'double_seeentry_seealso'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => 'empty index key in @cindex',
     'type' => 'warning'
   }
@@ -770,7 +751,6 @@ 
$result_converted_errors{'info'}->{'double_seeentry_seealso'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => 'empty index key in @cindex',
     'type' => 'warning'
   }
@@ -792,7 +772,6 @@ 
$result_converted_errors{'plaintext'}->{'double_seeentry_seealso'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => 'empty index key in @cindex',
     'type' => 'warning'
   }
@@ -867,7 +846,6 @@ 
$result_converted_errors{'html_text'}->{'double_seeentry_seealso'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => 'empty index key in @cindex',
     'type' => 'warning'
   }
diff --git a/tp/t/results/indices/double_syncodeindex.pl 
b/tp/t/results/indices/double_syncodeindex.pl
index 62c9a6fd9e..55e8cde19e 100644
--- a/tp/t/results/indices/double_syncodeindex.pl
+++ b/tp/t/results/indices/double_syncodeindex.pl
@@ -42,8 +42,7 @@ $result_trees{'double_syncodeindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -77,8 +76,7 @@ $result_trees{'double_syncodeindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -121,8 +119,7 @@ $result_trees{'double_syncodeindex'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -182,8 +179,7 @@ $result_trees{'double_syncodeindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           },
           'type' => 'index_entry_command'
         },
@@ -220,8 +216,7 @@ $result_trees{'double_syncodeindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           },
           'type' => 'index_entry_command'
         },
@@ -260,8 +255,7 @@ $result_trees{'double_syncodeindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -294,8 +288,7 @@ $result_trees{'double_syncodeindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         }
       ],
@@ -311,8 +304,7 @@ $result_trees{'double_syncodeindex'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
@@ -383,7 +375,6 @@ $result_errors{'double_syncodeindex'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'printing an index `cp\' merged in another one, `fn\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/indices/empty_added_index_entry.pl 
b/tp/t/results/indices/empty_added_index_entry.pl
index 25a5fc4ef9..5ef945909a 100644
--- a/tp/t/results/indices/empty_added_index_entry.pl
+++ b/tp/t/results/indices/empty_added_index_entry.pl
@@ -41,8 +41,7 @@ $result_trees{'empty_added_index_entry'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -85,8 +84,7 @@ $result_trees{'empty_added_index_entry'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -131,8 +129,7 @@ $result_trees{'empty_added_index_entry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           },
           'type' => 'index_entry_command'
         }
@@ -148,8 +145,7 @@ $result_trees{'empty_added_index_entry'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     }
   ],
@@ -211,7 +207,6 @@ $result_errors{'empty_added_index_entry'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => '@myindex missing argument',
     'type' => 'warning'
   }
diff --git a/tp/t/results/indices/empty_cindex_entry.pl 
b/tp/t/results/indices/empty_cindex_entry.pl
index 707c80265e..037242dd9c 100644
--- a/tp/t/results/indices/empty_cindex_entry.pl
+++ b/tp/t/results/indices/empty_cindex_entry.pl
@@ -44,8 +44,7 @@ $result_trees{'empty_cindex_entry'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -85,8 +84,7 @@ $result_trees{'empty_cindex_entry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           },
           'type' => 'index_entry_command'
         }
@@ -102,8 +100,7 @@ $result_trees{'empty_cindex_entry'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
@@ -160,7 +157,6 @@ $result_errors{'empty_cindex_entry'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@cindex missing argument',
     'type' => 'warning'
   }
diff --git a/tp/t/results/indices/empty_index_entry.pl 
b/tp/t/results/indices/empty_index_entry.pl
index 7543d92ff6..03e457bc26 100644
--- a/tp/t/results/indices/empty_index_entry.pl
+++ b/tp/t/results/indices/empty_index_entry.pl
@@ -51,8 +51,7 @@ $result_trees{'empty_index_entry'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -92,8 +91,7 @@ $result_trees{'empty_index_entry'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -115,8 +113,7 @@ $result_trees{'empty_index_entry'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -136,8 +133,7 @@ $result_trees{'empty_index_entry'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'def_line'
             },
@@ -169,8 +165,7 @@ $result_trees{'empty_index_entry'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -181,8 +176,7 @@ $result_trees{'empty_index_entry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -220,8 +214,7 @@ $result_trees{'empty_index_entry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         }
       ],
@@ -237,8 +230,7 @@ $result_trees{'empty_index_entry'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     }
   ],
@@ -305,7 +297,6 @@ $result_errors{'empty_index_entry'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'missing name for @deffn',
     'type' => 'warning'
   }
diff --git a/tp/t/results/indices/empty_string_index_entry.pl 
b/tp/t/results/indices/empty_string_index_entry.pl
index 65686c6651..367449442a 100644
--- a/tp/t/results/indices/empty_string_index_entry.pl
+++ b/tp/t/results/indices/empty_string_index_entry.pl
@@ -44,8 +44,7 @@ $result_trees{'empty_string_index_entry'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -85,8 +84,7 @@ $result_trees{'empty_string_index_entry'} = {
                   'cmdname' => 'w',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 }
               ],
@@ -115,8 +113,7 @@ $result_trees{'empty_string_index_entry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           },
           'type' => 'index_entry_command'
         },
@@ -133,8 +130,7 @@ $result_trees{'empty_string_index_entry'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   },
                   'type' => 'command_as_argument'
                 }
@@ -167,8 +163,7 @@ $result_trees{'empty_string_index_entry'} = {
                               'cmdname' => 'w',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 7,
-                                'macro' => ''
+                                'line_nr' => 7
                               }
                             }
                           ],
@@ -196,8 +191,7 @@ $result_trees{'empty_string_index_entry'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     }
                   ],
@@ -234,8 +228,7 @@ $result_trees{'empty_string_index_entry'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
@@ -249,8 +242,7 @@ $result_trees{'empty_string_index_entry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -294,8 +286,7 @@ $result_trees{'empty_string_index_entry'} = {
                           'cmdname' => 'w',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 10,
-                            'macro' => ''
+                            'line_nr' => 10
                           }
                         }
                       ],
@@ -304,8 +295,7 @@ $result_trees{'empty_string_index_entry'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -322,8 +312,7 @@ $result_trees{'empty_string_index_entry'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -340,8 +329,7 @@ $result_trees{'empty_string_index_entry'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -367,8 +355,7 @@ $result_trees{'empty_string_index_entry'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'def_line'
             },
@@ -405,8 +392,7 @@ $result_trees{'empty_string_index_entry'} = {
                           'cmdname' => 'w',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 11,
-                            'macro' => ''
+                            'line_nr' => 11
                           }
                         }
                       ],
@@ -415,8 +401,7 @@ $result_trees{'empty_string_index_entry'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -433,8 +418,7 @@ $result_trees{'empty_string_index_entry'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -451,8 +435,7 @@ $result_trees{'empty_string_index_entry'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -484,8 +467,7 @@ $result_trees{'empty_string_index_entry'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'def_line'
             },
@@ -517,8 +499,7 @@ $result_trees{'empty_string_index_entry'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
@@ -529,8 +510,7 @@ $result_trees{'empty_string_index_entry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -568,8 +548,7 @@ $result_trees{'empty_string_index_entry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           }
         }
       ],
@@ -585,8 +564,7 @@ $result_trees{'empty_string_index_entry'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
@@ -669,7 +647,6 @@ $result_errors{'empty_string_index_entry'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'empty index key in @findex',
     'type' => 'warning'
   },
@@ -678,7 +655,6 @@ $result_errors{'empty_string_index_entry'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'empty index key in @item',
     'type' => 'warning'
   },
@@ -687,7 +663,6 @@ $result_errors{'empty_string_index_entry'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => 'empty index key in @defun',
     'type' => 'warning'
   },
@@ -696,7 +671,6 @@ $result_errors{'empty_string_index_entry'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'empty index key in @defunx',
     'type' => 'warning'
   }
@@ -743,7 +717,6 @@ 
$result_converted_errors{'info'}->{'empty_string_index_entry'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'empty index key in @findex',
     'type' => 'warning'
   },
@@ -752,7 +725,6 @@ 
$result_converted_errors{'info'}->{'empty_string_index_entry'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'empty index key in @item',
     'type' => 'warning'
   },
@@ -761,7 +733,6 @@ 
$result_converted_errors{'info'}->{'empty_string_index_entry'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => 'empty index key in @defun',
     'type' => 'warning'
   },
@@ -770,7 +741,6 @@ 
$result_converted_errors{'info'}->{'empty_string_index_entry'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'empty index key in @defunx',
     'type' => 'warning'
   }
@@ -791,7 +761,6 @@ 
$result_converted_errors{'plaintext'}->{'empty_string_index_entry'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'empty index key in @findex',
     'type' => 'warning'
   },
@@ -800,7 +769,6 @@ 
$result_converted_errors{'plaintext'}->{'empty_string_index_entry'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'empty index key in @item',
     'type' => 'warning'
   },
@@ -809,7 +777,6 @@ 
$result_converted_errors{'plaintext'}->{'empty_string_index_entry'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => 'empty index key in @defun',
     'type' => 'warning'
   },
@@ -818,7 +785,6 @@ 
$result_converted_errors{'plaintext'}->{'empty_string_index_entry'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'empty index key in @defunx',
     'type' => 'warning'
   }
@@ -857,7 +823,6 @@ 
$result_converted_errors{'html_text'}->{'empty_string_index_entry'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'empty index key in @findex',
     'type' => 'warning'
   },
@@ -866,7 +831,6 @@ 
$result_converted_errors{'html_text'}->{'empty_string_index_entry'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'empty index key in @item',
     'type' => 'warning'
   },
@@ -875,7 +839,6 @@ 
$result_converted_errors{'html_text'}->{'empty_string_index_entry'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => 'empty index key in @defun',
     'type' => 'warning'
   },
@@ -884,7 +847,6 @@ 
$result_converted_errors{'html_text'}->{'empty_string_index_entry'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'empty index key in @defunx',
     'type' => 'warning'
   }
diff --git a/tp/t/results/indices/encoding_index_ascii.pl 
b/tp/t/results/indices/encoding_index_ascii.pl
index 76061bb092..5a6d276164 100644
--- a/tp/t/results/indices/encoding_index_ascii.pl
+++ b/tp/t/results/indices/encoding_index_ascii.pl
@@ -54,8 +54,7 @@ $result_trees{'encoding_index_ascii'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -87,8 +86,7 @@ $result_trees{'encoding_index_ascii'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -131,8 +129,7 @@ $result_trees{'encoding_index_ascii'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -161,8 +158,7 @@ $result_trees{'encoding_index_ascii'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -207,8 +203,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'cmdname' => '\'',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 },
                 {
@@ -228,8 +223,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'cmdname' => '\'',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 }
               ],
@@ -258,8 +252,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           },
           'type' => 'index_entry_command'
         },
@@ -281,8 +274,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'cmdname' => '"',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 },
                 {
@@ -302,8 +294,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'cmdname' => '"',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 },
                 {
@@ -320,8 +311,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'cmdname' => '"',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 },
                 {
@@ -338,8 +328,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'cmdname' => '"',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 }
               ],
@@ -368,8 +357,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           },
           'type' => 'index_entry_command'
         },
@@ -391,8 +379,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 },
                 {
@@ -412,8 +399,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 },
                 {
@@ -430,8 +416,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 },
                 {
@@ -448,8 +433,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 },
                 {
@@ -466,8 +450,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 }
               ],
@@ -496,8 +479,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           },
           'type' => 'index_entry_command'
         },
@@ -534,8 +516,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           },
           'type' => 'index_entry_command'
         },
@@ -572,8 +553,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           },
           'type' => 'index_entry_command'
         },
@@ -610,8 +590,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           },
           'type' => 'index_entry_command'
         },
@@ -648,8 +627,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           },
           'type' => 'index_entry_command'
         },
@@ -686,8 +664,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           },
           'type' => 'index_entry_command'
         },
@@ -724,8 +701,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           },
           'type' => 'index_entry_command'
         },
@@ -762,8 +738,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           },
           'type' => 'index_entry_command'
         },
@@ -800,8 +775,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           },
           'type' => 'index_entry_command'
         },
@@ -838,8 +812,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           },
           'type' => 'index_entry_command'
         },
@@ -876,8 +849,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 21,
-            'macro' => ''
+            'line_nr' => 21
           },
           'type' => 'index_entry_command'
         },
@@ -914,8 +886,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 22,
-            'macro' => ''
+            'line_nr' => 22
           },
           'type' => 'index_entry_command'
         },
@@ -952,8 +923,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           },
           'type' => 'index_entry_command'
         },
@@ -990,8 +960,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 24,
-            'macro' => ''
+            'line_nr' => 24
           },
           'type' => 'index_entry_command'
         },
@@ -1028,8 +997,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           },
           'type' => 'index_entry_command'
         },
@@ -1066,8 +1034,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           },
           'type' => 'index_entry_command'
         },
@@ -1104,8 +1071,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 27,
-            'macro' => ''
+            'line_nr' => 27
           },
           'type' => 'index_entry_command'
         },
@@ -1142,8 +1108,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 28,
-            'macro' => ''
+            'line_nr' => 28
           },
           'type' => 'index_entry_command'
         },
@@ -1180,8 +1145,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 29,
-            'macro' => ''
+            'line_nr' => 29
           },
           'type' => 'index_entry_command'
         },
@@ -1218,8 +1182,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 30,
-            'macro' => ''
+            'line_nr' => 30
           },
           'type' => 'index_entry_command'
         },
@@ -1256,8 +1219,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 31,
-            'macro' => ''
+            'line_nr' => 31
           },
           'type' => 'index_entry_command'
         },
@@ -1294,8 +1256,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 32,
-            'macro' => ''
+            'line_nr' => 32
           },
           'type' => 'index_entry_command'
         },
@@ -1332,8 +1293,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 33,
-            'macro' => ''
+            'line_nr' => 33
           },
           'type' => 'index_entry_command'
         },
@@ -1370,8 +1330,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 34,
-            'macro' => ''
+            'line_nr' => 34
           },
           'type' => 'index_entry_command'
         },
@@ -1408,8 +1367,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 35,
-            'macro' => ''
+            'line_nr' => 35
           },
           'type' => 'index_entry_command'
         },
@@ -1446,8 +1404,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 36,
-            'macro' => ''
+            'line_nr' => 36
           },
           'type' => 'index_entry_command'
         },
@@ -1484,8 +1441,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 37,
-            'macro' => ''
+            'line_nr' => 37
           },
           'type' => 'index_entry_command'
         },
@@ -1522,8 +1478,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 38,
-            'macro' => ''
+            'line_nr' => 38
           },
           'type' => 'index_entry_command'
         },
@@ -1560,8 +1515,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 39,
-            'macro' => ''
+            'line_nr' => 39
           },
           'type' => 'index_entry_command'
         },
@@ -1578,8 +1532,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'cmdname' => 'l',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 40,
-                    'macro' => ''
+                    'line_nr' => 40
                   }
                 }
               ],
@@ -1608,8 +1561,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 40,
-            'macro' => ''
+            'line_nr' => 40
           },
           'type' => 'index_entry_command'
         },
@@ -1626,8 +1578,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'cmdname' => 'L',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 41,
-                    'macro' => ''
+                    'line_nr' => 41
                   }
                 }
               ],
@@ -1656,8 +1607,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 41,
-            'macro' => ''
+            'line_nr' => 41
           },
           'type' => 'index_entry_command'
         },
@@ -1679,8 +1629,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'cmdname' => 'dotless',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 42,
-                    'macro' => ''
+                    'line_nr' => 42
                   }
                 },
                 {
@@ -1700,8 +1649,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'cmdname' => 'dotless',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 42,
-                    'macro' => ''
+                    'line_nr' => 42
                   }
                 },
                 {
@@ -1733,8 +1681,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 42,
-            'macro' => ''
+            'line_nr' => 42
           },
           'type' => 'index_entry_command'
         },
@@ -1760,8 +1707,7 @@ $result_trees{'encoding_index_ascii'} = {
                           'cmdname' => 'dotless',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 43,
-                            'macro' => ''
+                            'line_nr' => 43
                           }
                         }
                       ],
@@ -1771,8 +1717,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 43,
-                    'macro' => ''
+                    'line_nr' => 43
                   }
                 },
                 {
@@ -1796,8 +1741,7 @@ $result_trees{'encoding_index_ascii'} = {
                           'cmdname' => 'dotless',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 43,
-                            'macro' => ''
+                            'line_nr' => 43
                           }
                         }
                       ],
@@ -1807,8 +1751,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 43,
-                    'macro' => ''
+                    'line_nr' => 43
                   }
                 },
                 {
@@ -1840,8 +1783,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 43,
-            'macro' => ''
+            'line_nr' => 43
           },
           'type' => 'index_entry_command'
         },
@@ -1858,8 +1800,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'cmdname' => 'ss',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 44,
-                    'macro' => ''
+                    'line_nr' => 44
                   }
                 }
               ],
@@ -1888,8 +1829,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 44,
-            'macro' => ''
+            'line_nr' => 44
           },
           'type' => 'index_entry_command'
         },
@@ -1906,8 +1846,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'cmdname' => 'euro',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 45,
-                    'macro' => ''
+                    'line_nr' => 45
                   }
                 }
               ],
@@ -1936,8 +1875,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 45,
-            'macro' => ''
+            'line_nr' => 45
           },
           'type' => 'index_entry_command'
         },
@@ -1954,8 +1892,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'cmdname' => 'AE',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 46,
-                    'macro' => ''
+                    'line_nr' => 46
                   }
                 }
               ],
@@ -1984,8 +1921,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 46,
-            'macro' => ''
+            'line_nr' => 46
           },
           'type' => 'index_entry_command'
         },
@@ -2002,8 +1938,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'cmdname' => 'exclamdown',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 47,
-                    'macro' => ''
+                    'line_nr' => 47
                   }
                 }
               ],
@@ -2032,8 +1967,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 47,
-            'macro' => ''
+            'line_nr' => 47
           },
           'type' => 'index_entry_command'
         },
@@ -2050,8 +1984,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'cmdname' => 'TH',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 48,
-                    'macro' => ''
+                    'line_nr' => 48
                   }
                 }
               ],
@@ -2080,8 +2013,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 48,
-            'macro' => ''
+            'line_nr' => 48
           },
           'type' => 'index_entry_command'
         },
@@ -2098,8 +2030,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'cmdname' => 'DH',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 49,
-                    'macro' => ''
+                    'line_nr' => 49
                   }
                 }
               ],
@@ -2128,8 +2059,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 49,
-            'macro' => ''
+            'line_nr' => 49
           },
           'type' => 'index_entry_command'
         },
@@ -2146,8 +2076,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'cmdname' => 'textdegree',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 50,
-                    'macro' => ''
+                    'line_nr' => 50
                   }
                 }
               ],
@@ -2176,8 +2105,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 50,
-            'macro' => ''
+            'line_nr' => 50
           },
           'type' => 'index_entry_command'
         },
@@ -2214,8 +2142,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 51,
-            'macro' => ''
+            'line_nr' => 51
           },
           'type' => 'index_entry_command'
         },
@@ -2252,8 +2179,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 52,
-            'macro' => ''
+            'line_nr' => 52
           },
           'type' => 'index_entry_command'
         },
@@ -2270,8 +2196,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'cmdname' => 'quotedblleft',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 53,
-                    'macro' => ''
+                    'line_nr' => 53
                   }
                 }
               ],
@@ -2300,8 +2225,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 53,
-            'macro' => ''
+            'line_nr' => 53
           },
           'type' => 'index_entry_command'
         },
@@ -2318,8 +2242,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'cmdname' => 'geq',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 54,
-                    'macro' => ''
+                    'line_nr' => 54
                   }
                 }
               ],
@@ -2348,8 +2271,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 54,
-            'macro' => ''
+            'line_nr' => 54
           },
           'type' => 'index_entry_command'
         },
@@ -2366,8 +2288,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'cmdname' => 'comma',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 55,
-                    'macro' => ''
+                    'line_nr' => 55
                   }
                 }
               ],
@@ -2396,8 +2317,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 55,
-            'macro' => ''
+            'line_nr' => 55
           },
           'type' => 'index_entry_command'
         },
@@ -2434,8 +2354,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 56,
-            'macro' => ''
+            'line_nr' => 56
           },
           'type' => 'index_entry_command'
         },
@@ -2472,8 +2391,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 57,
-            'macro' => ''
+            'line_nr' => 57
           },
           'type' => 'index_entry_command'
         },
@@ -2510,8 +2428,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 58,
-            'macro' => ''
+            'line_nr' => 58
           },
           'type' => 'index_entry_command'
         },
@@ -2548,8 +2465,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 59,
-            'macro' => ''
+            'line_nr' => 59
           },
           'type' => 'index_entry_command'
         },
@@ -2586,8 +2502,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 60,
-            'macro' => ''
+            'line_nr' => 60
           },
           'type' => 'index_entry_command'
         },
@@ -2624,8 +2539,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 61,
-            'macro' => ''
+            'line_nr' => 61
           },
           'type' => 'index_entry_command'
         },
@@ -2662,8 +2576,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 62,
-            'macro' => ''
+            'line_nr' => 62
           },
           'type' => 'index_entry_command'
         },
@@ -2700,8 +2613,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 63,
-            'macro' => ''
+            'line_nr' => 63
           },
           'type' => 'index_entry_command'
         },
@@ -2740,8 +2652,7 @@ $result_trees{'encoding_index_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 65,
-            'macro' => ''
+            'line_nr' => 65
           }
         }
       ],
@@ -2757,8 +2668,7 @@ $result_trees{'encoding_index_ascii'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     }
   ],
diff --git a/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl 
b/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
index b5f1f0710a..c08297929b 100644
--- a/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
@@ -54,8 +54,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -87,8 +86,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -131,8 +129,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -161,8 +158,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -207,8 +203,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'cmdname' => '\'',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 },
                 {
@@ -228,8 +223,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'cmdname' => '\'',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 }
               ],
@@ -258,8 +252,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           },
           'type' => 'index_entry_command'
         },
@@ -281,8 +274,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'cmdname' => '"',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 },
                 {
@@ -302,8 +294,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'cmdname' => '"',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 },
                 {
@@ -320,8 +311,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'cmdname' => '"',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 },
                 {
@@ -338,8 +328,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'cmdname' => '"',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 }
               ],
@@ -368,8 +357,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           },
           'type' => 'index_entry_command'
         },
@@ -391,8 +379,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 },
                 {
@@ -412,8 +399,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 },
                 {
@@ -430,8 +416,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 },
                 {
@@ -448,8 +433,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 },
                 {
@@ -466,8 +450,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 }
               ],
@@ -496,8 +479,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           },
           'type' => 'index_entry_command'
         },
@@ -534,8 +516,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           },
           'type' => 'index_entry_command'
         },
@@ -572,8 +553,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           },
           'type' => 'index_entry_command'
         },
@@ -610,8 +590,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           },
           'type' => 'index_entry_command'
         },
@@ -648,8 +627,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           },
           'type' => 'index_entry_command'
         },
@@ -686,8 +664,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           },
           'type' => 'index_entry_command'
         },
@@ -724,8 +701,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           },
           'type' => 'index_entry_command'
         },
@@ -762,8 +738,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           },
           'type' => 'index_entry_command'
         },
@@ -800,8 +775,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           },
           'type' => 'index_entry_command'
         },
@@ -838,8 +812,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           },
           'type' => 'index_entry_command'
         },
@@ -876,8 +849,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 21,
-            'macro' => ''
+            'line_nr' => 21
           },
           'type' => 'index_entry_command'
         },
@@ -914,8 +886,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 22,
-            'macro' => ''
+            'line_nr' => 22
           },
           'type' => 'index_entry_command'
         },
@@ -952,8 +923,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           },
           'type' => 'index_entry_command'
         },
@@ -990,8 +960,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 24,
-            'macro' => ''
+            'line_nr' => 24
           },
           'type' => 'index_entry_command'
         },
@@ -1028,8 +997,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           },
           'type' => 'index_entry_command'
         },
@@ -1066,8 +1034,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           },
           'type' => 'index_entry_command'
         },
@@ -1104,8 +1071,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 27,
-            'macro' => ''
+            'line_nr' => 27
           },
           'type' => 'index_entry_command'
         },
@@ -1142,8 +1108,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 28,
-            'macro' => ''
+            'line_nr' => 28
           },
           'type' => 'index_entry_command'
         },
@@ -1180,8 +1145,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 29,
-            'macro' => ''
+            'line_nr' => 29
           },
           'type' => 'index_entry_command'
         },
@@ -1218,8 +1182,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 30,
-            'macro' => ''
+            'line_nr' => 30
           },
           'type' => 'index_entry_command'
         },
@@ -1256,8 +1219,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 31,
-            'macro' => ''
+            'line_nr' => 31
           },
           'type' => 'index_entry_command'
         },
@@ -1294,8 +1256,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 32,
-            'macro' => ''
+            'line_nr' => 32
           },
           'type' => 'index_entry_command'
         },
@@ -1332,8 +1293,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 33,
-            'macro' => ''
+            'line_nr' => 33
           },
           'type' => 'index_entry_command'
         },
@@ -1370,8 +1330,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 34,
-            'macro' => ''
+            'line_nr' => 34
           },
           'type' => 'index_entry_command'
         },
@@ -1408,8 +1367,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 35,
-            'macro' => ''
+            'line_nr' => 35
           },
           'type' => 'index_entry_command'
         },
@@ -1446,8 +1404,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 36,
-            'macro' => ''
+            'line_nr' => 36
           },
           'type' => 'index_entry_command'
         },
@@ -1484,8 +1441,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 37,
-            'macro' => ''
+            'line_nr' => 37
           },
           'type' => 'index_entry_command'
         },
@@ -1522,8 +1478,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 38,
-            'macro' => ''
+            'line_nr' => 38
           },
           'type' => 'index_entry_command'
         },
@@ -1560,8 +1515,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 39,
-            'macro' => ''
+            'line_nr' => 39
           },
           'type' => 'index_entry_command'
         },
@@ -1578,8 +1532,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'cmdname' => 'l',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 40,
-                    'macro' => ''
+                    'line_nr' => 40
                   }
                 }
               ],
@@ -1608,8 +1561,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 40,
-            'macro' => ''
+            'line_nr' => 40
           },
           'type' => 'index_entry_command'
         },
@@ -1626,8 +1578,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'cmdname' => 'L',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 41,
-                    'macro' => ''
+                    'line_nr' => 41
                   }
                 }
               ],
@@ -1656,8 +1607,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 41,
-            'macro' => ''
+            'line_nr' => 41
           },
           'type' => 'index_entry_command'
         },
@@ -1679,8 +1629,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'cmdname' => 'dotless',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 42,
-                    'macro' => ''
+                    'line_nr' => 42
                   }
                 },
                 {
@@ -1700,8 +1649,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'cmdname' => 'dotless',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 42,
-                    'macro' => ''
+                    'line_nr' => 42
                   }
                 },
                 {
@@ -1733,8 +1681,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 42,
-            'macro' => ''
+            'line_nr' => 42
           },
           'type' => 'index_entry_command'
         },
@@ -1760,8 +1707,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                           'cmdname' => 'dotless',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 43,
-                            'macro' => ''
+                            'line_nr' => 43
                           }
                         }
                       ],
@@ -1771,8 +1717,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 43,
-                    'macro' => ''
+                    'line_nr' => 43
                   }
                 },
                 {
@@ -1796,8 +1741,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                           'cmdname' => 'dotless',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 43,
-                            'macro' => ''
+                            'line_nr' => 43
                           }
                         }
                       ],
@@ -1807,8 +1751,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 43,
-                    'macro' => ''
+                    'line_nr' => 43
                   }
                 },
                 {
@@ -1840,8 +1783,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 43,
-            'macro' => ''
+            'line_nr' => 43
           },
           'type' => 'index_entry_command'
         },
@@ -1858,8 +1800,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'cmdname' => 'ss',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 44,
-                    'macro' => ''
+                    'line_nr' => 44
                   }
                 }
               ],
@@ -1888,8 +1829,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 44,
-            'macro' => ''
+            'line_nr' => 44
           },
           'type' => 'index_entry_command'
         },
@@ -1906,8 +1846,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'cmdname' => 'euro',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 45,
-                    'macro' => ''
+                    'line_nr' => 45
                   }
                 }
               ],
@@ -1936,8 +1875,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 45,
-            'macro' => ''
+            'line_nr' => 45
           },
           'type' => 'index_entry_command'
         },
@@ -1954,8 +1892,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'cmdname' => 'AE',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 46,
-                    'macro' => ''
+                    'line_nr' => 46
                   }
                 }
               ],
@@ -1984,8 +1921,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 46,
-            'macro' => ''
+            'line_nr' => 46
           },
           'type' => 'index_entry_command'
         },
@@ -2002,8 +1938,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'cmdname' => 'exclamdown',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 47,
-                    'macro' => ''
+                    'line_nr' => 47
                   }
                 }
               ],
@@ -2032,8 +1967,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 47,
-            'macro' => ''
+            'line_nr' => 47
           },
           'type' => 'index_entry_command'
         },
@@ -2050,8 +1984,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'cmdname' => 'TH',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 48,
-                    'macro' => ''
+                    'line_nr' => 48
                   }
                 }
               ],
@@ -2080,8 +2013,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 48,
-            'macro' => ''
+            'line_nr' => 48
           },
           'type' => 'index_entry_command'
         },
@@ -2098,8 +2030,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'cmdname' => 'DH',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 49,
-                    'macro' => ''
+                    'line_nr' => 49
                   }
                 }
               ],
@@ -2128,8 +2059,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 49,
-            'macro' => ''
+            'line_nr' => 49
           },
           'type' => 'index_entry_command'
         },
@@ -2146,8 +2076,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'cmdname' => 'textdegree',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 50,
-                    'macro' => ''
+                    'line_nr' => 50
                   }
                 }
               ],
@@ -2176,8 +2105,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 50,
-            'macro' => ''
+            'line_nr' => 50
           },
           'type' => 'index_entry_command'
         },
@@ -2214,8 +2142,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 51,
-            'macro' => ''
+            'line_nr' => 51
           },
           'type' => 'index_entry_command'
         },
@@ -2252,8 +2179,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 52,
-            'macro' => ''
+            'line_nr' => 52
           },
           'type' => 'index_entry_command'
         },
@@ -2270,8 +2196,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'cmdname' => 'quotedblleft',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 53,
-                    'macro' => ''
+                    'line_nr' => 53
                   }
                 }
               ],
@@ -2300,8 +2225,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 53,
-            'macro' => ''
+            'line_nr' => 53
           },
           'type' => 'index_entry_command'
         },
@@ -2318,8 +2242,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'cmdname' => 'geq',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 54,
-                    'macro' => ''
+                    'line_nr' => 54
                   }
                 }
               ],
@@ -2348,8 +2271,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 54,
-            'macro' => ''
+            'line_nr' => 54
           },
           'type' => 'index_entry_command'
         },
@@ -2366,8 +2288,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'cmdname' => 'comma',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 55,
-                    'macro' => ''
+                    'line_nr' => 55
                   }
                 }
               ],
@@ -2396,8 +2317,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 55,
-            'macro' => ''
+            'line_nr' => 55
           },
           'type' => 'index_entry_command'
         },
@@ -2434,8 +2354,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 56,
-            'macro' => ''
+            'line_nr' => 56
           },
           'type' => 'index_entry_command'
         },
@@ -2472,8 +2391,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 57,
-            'macro' => ''
+            'line_nr' => 57
           },
           'type' => 'index_entry_command'
         },
@@ -2510,8 +2428,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 58,
-            'macro' => ''
+            'line_nr' => 58
           },
           'type' => 'index_entry_command'
         },
@@ -2548,8 +2465,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 59,
-            'macro' => ''
+            'line_nr' => 59
           },
           'type' => 'index_entry_command'
         },
@@ -2586,8 +2502,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 60,
-            'macro' => ''
+            'line_nr' => 60
           },
           'type' => 'index_entry_command'
         },
@@ -2624,8 +2539,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 61,
-            'macro' => ''
+            'line_nr' => 61
           },
           'type' => 'index_entry_command'
         },
@@ -2662,8 +2576,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 62,
-            'macro' => ''
+            'line_nr' => 62
           },
           'type' => 'index_entry_command'
         },
@@ -2700,8 +2613,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 63,
-            'macro' => ''
+            'line_nr' => 63
           },
           'type' => 'index_entry_command'
         },
@@ -2740,8 +2652,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 65,
-            'macro' => ''
+            'line_nr' => 65
           }
         }
       ],
@@ -2757,8 +2668,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     }
   ],
diff --git a/tp/t/results/indices/encoding_index_latin1.pl 
b/tp/t/results/indices/encoding_index_latin1.pl
index 5db76aecaa..0318a682d5 100644
--- a/tp/t/results/indices/encoding_index_latin1.pl
+++ b/tp/t/results/indices/encoding_index_latin1.pl
@@ -50,8 +50,7 @@ $result_trees{'encoding_index_latin1'} = {
               },
               'source_info' => {
                 'file_name' => 'encoding_index_latin1.texi',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -94,8 +93,7 @@ $result_trees{'encoding_index_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'encoding_index_latin1.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -131,8 +129,7 @@ $result_trees{'encoding_index_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'encoding_index_latin1.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -192,8 +189,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           },
           'type' => 'index_entry_command'
         },
@@ -215,8 +211,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'cmdname' => '"',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 },
                 {
@@ -236,8 +231,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'cmdname' => '"',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 },
                 {
@@ -254,8 +248,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'cmdname' => '"',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 },
                 {
@@ -272,8 +265,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'cmdname' => '"',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 }
               ],
@@ -302,8 +294,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           },
           'type' => 'index_entry_command'
         },
@@ -325,8 +316,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 },
                 {
@@ -346,8 +336,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 },
                 {
@@ -364,8 +353,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 },
                 {
@@ -382,8 +370,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 },
                 {
@@ -400,8 +387,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 }
               ],
@@ -430,8 +416,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           },
           'type' => 'index_entry_command'
         },
@@ -468,8 +453,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           },
           'type' => 'index_entry_command'
         },
@@ -506,8 +490,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           },
           'type' => 'index_entry_command'
         },
@@ -544,8 +527,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           },
           'type' => 'index_entry_command'
         },
@@ -582,8 +564,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           },
           'type' => 'index_entry_command'
         },
@@ -620,8 +601,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           },
           'type' => 'index_entry_command'
         },
@@ -658,8 +638,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           },
           'type' => 'index_entry_command'
         },
@@ -696,8 +675,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           },
           'type' => 'index_entry_command'
         },
@@ -734,8 +712,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           },
           'type' => 'index_entry_command'
         },
@@ -772,8 +749,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           },
           'type' => 'index_entry_command'
         },
@@ -810,8 +786,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 21,
-            'macro' => ''
+            'line_nr' => 21
           },
           'type' => 'index_entry_command'
         },
@@ -848,8 +823,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 22,
-            'macro' => ''
+            'line_nr' => 22
           },
           'type' => 'index_entry_command'
         },
@@ -886,8 +860,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           },
           'type' => 'index_entry_command'
         },
@@ -924,8 +897,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 24,
-            'macro' => ''
+            'line_nr' => 24
           },
           'type' => 'index_entry_command'
         },
@@ -962,8 +934,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           },
           'type' => 'index_entry_command'
         },
@@ -1000,8 +971,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           },
           'type' => 'index_entry_command'
         },
@@ -1038,8 +1008,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 27,
-            'macro' => ''
+            'line_nr' => 27
           },
           'type' => 'index_entry_command'
         },
@@ -1076,8 +1045,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 28,
-            'macro' => ''
+            'line_nr' => 28
           },
           'type' => 'index_entry_command'
         },
@@ -1114,8 +1082,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 29,
-            'macro' => ''
+            'line_nr' => 29
           },
           'type' => 'index_entry_command'
         },
@@ -1152,8 +1119,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 30,
-            'macro' => ''
+            'line_nr' => 30
           },
           'type' => 'index_entry_command'
         },
@@ -1190,8 +1156,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 31,
-            'macro' => ''
+            'line_nr' => 31
           },
           'type' => 'index_entry_command'
         },
@@ -1228,8 +1193,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 32,
-            'macro' => ''
+            'line_nr' => 32
           },
           'type' => 'index_entry_command'
         },
@@ -1266,8 +1230,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 33,
-            'macro' => ''
+            'line_nr' => 33
           },
           'type' => 'index_entry_command'
         },
@@ -1304,8 +1267,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 34,
-            'macro' => ''
+            'line_nr' => 34
           },
           'type' => 'index_entry_command'
         },
@@ -1342,8 +1304,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 35,
-            'macro' => ''
+            'line_nr' => 35
           },
           'type' => 'index_entry_command'
         },
@@ -1380,8 +1341,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 36,
-            'macro' => ''
+            'line_nr' => 36
           },
           'type' => 'index_entry_command'
         },
@@ -1418,8 +1378,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 37,
-            'macro' => ''
+            'line_nr' => 37
           },
           'type' => 'index_entry_command'
         },
@@ -1456,8 +1415,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 38,
-            'macro' => ''
+            'line_nr' => 38
           },
           'type' => 'index_entry_command'
         },
@@ -1494,8 +1452,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 39,
-            'macro' => ''
+            'line_nr' => 39
           },
           'type' => 'index_entry_command'
         },
@@ -1512,8 +1469,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'cmdname' => 'l',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 40,
-                    'macro' => ''
+                    'line_nr' => 40
                   }
                 }
               ],
@@ -1542,8 +1498,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 40,
-            'macro' => ''
+            'line_nr' => 40
           },
           'type' => 'index_entry_command'
         },
@@ -1560,8 +1515,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'cmdname' => 'L',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 41,
-                    'macro' => ''
+                    'line_nr' => 41
                   }
                 }
               ],
@@ -1590,8 +1544,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 41,
-            'macro' => ''
+            'line_nr' => 41
           },
           'type' => 'index_entry_command'
         },
@@ -1613,8 +1566,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'cmdname' => 'dotless',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 42,
-                    'macro' => ''
+                    'line_nr' => 42
                   }
                 },
                 {
@@ -1634,8 +1586,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'cmdname' => 'dotless',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 42,
-                    'macro' => ''
+                    'line_nr' => 42
                   }
                 },
                 {
@@ -1667,8 +1618,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 42,
-            'macro' => ''
+            'line_nr' => 42
           },
           'type' => 'index_entry_command'
         },
@@ -1694,8 +1644,7 @@ $result_trees{'encoding_index_latin1'} = {
                           'cmdname' => 'dotless',
                           'source_info' => {
                             'file_name' => 'encoding_index_latin1.texi',
-                            'line_nr' => 43,
-                            'macro' => ''
+                            'line_nr' => 43
                           }
                         }
                       ],
@@ -1705,8 +1654,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 43,
-                    'macro' => ''
+                    'line_nr' => 43
                   }
                 },
                 {
@@ -1730,8 +1678,7 @@ $result_trees{'encoding_index_latin1'} = {
                           'cmdname' => 'dotless',
                           'source_info' => {
                             'file_name' => 'encoding_index_latin1.texi',
-                            'line_nr' => 43,
-                            'macro' => ''
+                            'line_nr' => 43
                           }
                         }
                       ],
@@ -1741,8 +1688,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 43,
-                    'macro' => ''
+                    'line_nr' => 43
                   }
                 },
                 {
@@ -1774,8 +1720,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 43,
-            'macro' => ''
+            'line_nr' => 43
           },
           'type' => 'index_entry_command'
         },
@@ -1792,8 +1737,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'cmdname' => 'ss',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 44,
-                    'macro' => ''
+                    'line_nr' => 44
                   }
                 }
               ],
@@ -1822,8 +1766,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 44,
-            'macro' => ''
+            'line_nr' => 44
           },
           'type' => 'index_entry_command'
         },
@@ -1840,8 +1783,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'cmdname' => 'euro',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 45,
-                    'macro' => ''
+                    'line_nr' => 45
                   }
                 }
               ],
@@ -1870,8 +1812,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 45,
-            'macro' => ''
+            'line_nr' => 45
           },
           'type' => 'index_entry_command'
         },
@@ -1888,8 +1829,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'cmdname' => 'AE',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 46,
-                    'macro' => ''
+                    'line_nr' => 46
                   }
                 }
               ],
@@ -1918,8 +1858,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 46,
-            'macro' => ''
+            'line_nr' => 46
           },
           'type' => 'index_entry_command'
         },
@@ -1936,8 +1875,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'cmdname' => 'exclamdown',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 47,
-                    'macro' => ''
+                    'line_nr' => 47
                   }
                 }
               ],
@@ -1966,8 +1904,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 47,
-            'macro' => ''
+            'line_nr' => 47
           },
           'type' => 'index_entry_command'
         },
@@ -1984,8 +1921,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'cmdname' => 'TH',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 48,
-                    'macro' => ''
+                    'line_nr' => 48
                   }
                 }
               ],
@@ -2014,8 +1950,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 48,
-            'macro' => ''
+            'line_nr' => 48
           },
           'type' => 'index_entry_command'
         },
@@ -2032,8 +1967,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'cmdname' => 'DH',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 49,
-                    'macro' => ''
+                    'line_nr' => 49
                   }
                 }
               ],
@@ -2062,8 +1996,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 49,
-            'macro' => ''
+            'line_nr' => 49
           },
           'type' => 'index_entry_command'
         },
@@ -2080,8 +2013,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'cmdname' => 'textdegree',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 50,
-                    'macro' => ''
+                    'line_nr' => 50
                   }
                 }
               ],
@@ -2110,8 +2042,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 50,
-            'macro' => ''
+            'line_nr' => 50
           },
           'type' => 'index_entry_command'
         },
@@ -2148,8 +2079,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 51,
-            'macro' => ''
+            'line_nr' => 51
           },
           'type' => 'index_entry_command'
         },
@@ -2186,8 +2116,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 52,
-            'macro' => ''
+            'line_nr' => 52
           },
           'type' => 'index_entry_command'
         },
@@ -2204,8 +2133,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'cmdname' => 'quotedblleft',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 53,
-                    'macro' => ''
+                    'line_nr' => 53
                   }
                 }
               ],
@@ -2234,8 +2162,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 53,
-            'macro' => ''
+            'line_nr' => 53
           },
           'type' => 'index_entry_command'
         },
@@ -2252,8 +2179,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'cmdname' => 'geq',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 54,
-                    'macro' => ''
+                    'line_nr' => 54
                   }
                 }
               ],
@@ -2282,8 +2208,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 54,
-            'macro' => ''
+            'line_nr' => 54
           },
           'type' => 'index_entry_command'
         },
@@ -2300,8 +2225,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'cmdname' => 'comma',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 55,
-                    'macro' => ''
+                    'line_nr' => 55
                   }
                 }
               ],
@@ -2330,8 +2254,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 55,
-            'macro' => ''
+            'line_nr' => 55
           },
           'type' => 'index_entry_command'
         },
@@ -2368,8 +2291,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 56,
-            'macro' => ''
+            'line_nr' => 56
           },
           'type' => 'index_entry_command'
         },
@@ -2406,8 +2328,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 57,
-            'macro' => ''
+            'line_nr' => 57
           },
           'type' => 'index_entry_command'
         },
@@ -2444,8 +2365,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 58,
-            'macro' => ''
+            'line_nr' => 58
           },
           'type' => 'index_entry_command'
         },
@@ -2482,8 +2402,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 59,
-            'macro' => ''
+            'line_nr' => 59
           },
           'type' => 'index_entry_command'
         },
@@ -2520,8 +2439,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 60,
-            'macro' => ''
+            'line_nr' => 60
           },
           'type' => 'index_entry_command'
         },
@@ -2558,8 +2476,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 61,
-            'macro' => ''
+            'line_nr' => 61
           },
           'type' => 'index_entry_command'
         },
@@ -2596,8 +2513,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 62,
-            'macro' => ''
+            'line_nr' => 62
           },
           'type' => 'index_entry_command'
         },
@@ -2634,8 +2550,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 63,
-            'macro' => ''
+            'line_nr' => 63
           },
           'type' => 'index_entry_command'
         },
@@ -2674,8 +2589,7 @@ $result_trees{'encoding_index_latin1'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 65,
-            'macro' => ''
+            'line_nr' => 65
           }
         }
       ],
@@ -2691,8 +2605,7 @@ $result_trees{'encoding_index_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'encoding_index_latin1.texi',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
diff --git a/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl 
b/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
index 57013c62e4..311086aa30 100644
--- a/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
@@ -50,8 +50,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => 'encoding_index_latin1.texi',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -94,8 +93,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
       },
       'source_info' => {
         'file_name' => 'encoding_index_latin1.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -131,8 +129,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
       },
       'source_info' => {
         'file_name' => 'encoding_index_latin1.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -192,8 +189,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           },
           'type' => 'index_entry_command'
         },
@@ -215,8 +211,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'cmdname' => '"',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 },
                 {
@@ -236,8 +231,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'cmdname' => '"',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 },
                 {
@@ -254,8 +248,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'cmdname' => '"',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 },
                 {
@@ -272,8 +265,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'cmdname' => '"',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 }
               ],
@@ -302,8 +294,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           },
           'type' => 'index_entry_command'
         },
@@ -325,8 +316,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 },
                 {
@@ -346,8 +336,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 },
                 {
@@ -364,8 +353,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 },
                 {
@@ -382,8 +370,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 },
                 {
@@ -400,8 +387,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 }
               ],
@@ -430,8 +416,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           },
           'type' => 'index_entry_command'
         },
@@ -468,8 +453,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           },
           'type' => 'index_entry_command'
         },
@@ -506,8 +490,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           },
           'type' => 'index_entry_command'
         },
@@ -544,8 +527,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           },
           'type' => 'index_entry_command'
         },
@@ -582,8 +564,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           },
           'type' => 'index_entry_command'
         },
@@ -620,8 +601,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           },
           'type' => 'index_entry_command'
         },
@@ -658,8 +638,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           },
           'type' => 'index_entry_command'
         },
@@ -696,8 +675,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           },
           'type' => 'index_entry_command'
         },
@@ -734,8 +712,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           },
           'type' => 'index_entry_command'
         },
@@ -772,8 +749,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           },
           'type' => 'index_entry_command'
         },
@@ -810,8 +786,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 21,
-            'macro' => ''
+            'line_nr' => 21
           },
           'type' => 'index_entry_command'
         },
@@ -848,8 +823,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 22,
-            'macro' => ''
+            'line_nr' => 22
           },
           'type' => 'index_entry_command'
         },
@@ -886,8 +860,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           },
           'type' => 'index_entry_command'
         },
@@ -924,8 +897,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 24,
-            'macro' => ''
+            'line_nr' => 24
           },
           'type' => 'index_entry_command'
         },
@@ -962,8 +934,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           },
           'type' => 'index_entry_command'
         },
@@ -1000,8 +971,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           },
           'type' => 'index_entry_command'
         },
@@ -1038,8 +1008,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 27,
-            'macro' => ''
+            'line_nr' => 27
           },
           'type' => 'index_entry_command'
         },
@@ -1076,8 +1045,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 28,
-            'macro' => ''
+            'line_nr' => 28
           },
           'type' => 'index_entry_command'
         },
@@ -1114,8 +1082,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 29,
-            'macro' => ''
+            'line_nr' => 29
           },
           'type' => 'index_entry_command'
         },
@@ -1152,8 +1119,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 30,
-            'macro' => ''
+            'line_nr' => 30
           },
           'type' => 'index_entry_command'
         },
@@ -1190,8 +1156,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 31,
-            'macro' => ''
+            'line_nr' => 31
           },
           'type' => 'index_entry_command'
         },
@@ -1228,8 +1193,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 32,
-            'macro' => ''
+            'line_nr' => 32
           },
           'type' => 'index_entry_command'
         },
@@ -1266,8 +1230,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 33,
-            'macro' => ''
+            'line_nr' => 33
           },
           'type' => 'index_entry_command'
         },
@@ -1304,8 +1267,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 34,
-            'macro' => ''
+            'line_nr' => 34
           },
           'type' => 'index_entry_command'
         },
@@ -1342,8 +1304,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 35,
-            'macro' => ''
+            'line_nr' => 35
           },
           'type' => 'index_entry_command'
         },
@@ -1380,8 +1341,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 36,
-            'macro' => ''
+            'line_nr' => 36
           },
           'type' => 'index_entry_command'
         },
@@ -1418,8 +1378,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 37,
-            'macro' => ''
+            'line_nr' => 37
           },
           'type' => 'index_entry_command'
         },
@@ -1456,8 +1415,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 38,
-            'macro' => ''
+            'line_nr' => 38
           },
           'type' => 'index_entry_command'
         },
@@ -1494,8 +1452,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 39,
-            'macro' => ''
+            'line_nr' => 39
           },
           'type' => 'index_entry_command'
         },
@@ -1512,8 +1469,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'cmdname' => 'l',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 40,
-                    'macro' => ''
+                    'line_nr' => 40
                   }
                 }
               ],
@@ -1542,8 +1498,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 40,
-            'macro' => ''
+            'line_nr' => 40
           },
           'type' => 'index_entry_command'
         },
@@ -1560,8 +1515,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'cmdname' => 'L',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 41,
-                    'macro' => ''
+                    'line_nr' => 41
                   }
                 }
               ],
@@ -1590,8 +1544,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 41,
-            'macro' => ''
+            'line_nr' => 41
           },
           'type' => 'index_entry_command'
         },
@@ -1613,8 +1566,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'cmdname' => 'dotless',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 42,
-                    'macro' => ''
+                    'line_nr' => 42
                   }
                 },
                 {
@@ -1634,8 +1586,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'cmdname' => 'dotless',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 42,
-                    'macro' => ''
+                    'line_nr' => 42
                   }
                 },
                 {
@@ -1667,8 +1618,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 42,
-            'macro' => ''
+            'line_nr' => 42
           },
           'type' => 'index_entry_command'
         },
@@ -1694,8 +1644,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                           'cmdname' => 'dotless',
                           'source_info' => {
                             'file_name' => 'encoding_index_latin1.texi',
-                            'line_nr' => 43,
-                            'macro' => ''
+                            'line_nr' => 43
                           }
                         }
                       ],
@@ -1705,8 +1654,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 43,
-                    'macro' => ''
+                    'line_nr' => 43
                   }
                 },
                 {
@@ -1730,8 +1678,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                           'cmdname' => 'dotless',
                           'source_info' => {
                             'file_name' => 'encoding_index_latin1.texi',
-                            'line_nr' => 43,
-                            'macro' => ''
+                            'line_nr' => 43
                           }
                         }
                       ],
@@ -1741,8 +1688,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 43,
-                    'macro' => ''
+                    'line_nr' => 43
                   }
                 },
                 {
@@ -1774,8 +1720,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 43,
-            'macro' => ''
+            'line_nr' => 43
           },
           'type' => 'index_entry_command'
         },
@@ -1792,8 +1737,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'cmdname' => 'ss',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 44,
-                    'macro' => ''
+                    'line_nr' => 44
                   }
                 }
               ],
@@ -1822,8 +1766,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 44,
-            'macro' => ''
+            'line_nr' => 44
           },
           'type' => 'index_entry_command'
         },
@@ -1840,8 +1783,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'cmdname' => 'euro',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 45,
-                    'macro' => ''
+                    'line_nr' => 45
                   }
                 }
               ],
@@ -1870,8 +1812,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 45,
-            'macro' => ''
+            'line_nr' => 45
           },
           'type' => 'index_entry_command'
         },
@@ -1888,8 +1829,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'cmdname' => 'AE',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 46,
-                    'macro' => ''
+                    'line_nr' => 46
                   }
                 }
               ],
@@ -1918,8 +1858,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 46,
-            'macro' => ''
+            'line_nr' => 46
           },
           'type' => 'index_entry_command'
         },
@@ -1936,8 +1875,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'cmdname' => 'exclamdown',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 47,
-                    'macro' => ''
+                    'line_nr' => 47
                   }
                 }
               ],
@@ -1966,8 +1904,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 47,
-            'macro' => ''
+            'line_nr' => 47
           },
           'type' => 'index_entry_command'
         },
@@ -1984,8 +1921,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'cmdname' => 'TH',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 48,
-                    'macro' => ''
+                    'line_nr' => 48
                   }
                 }
               ],
@@ -2014,8 +1950,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 48,
-            'macro' => ''
+            'line_nr' => 48
           },
           'type' => 'index_entry_command'
         },
@@ -2032,8 +1967,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'cmdname' => 'DH',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 49,
-                    'macro' => ''
+                    'line_nr' => 49
                   }
                 }
               ],
@@ -2062,8 +1996,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 49,
-            'macro' => ''
+            'line_nr' => 49
           },
           'type' => 'index_entry_command'
         },
@@ -2080,8 +2013,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'cmdname' => 'textdegree',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 50,
-                    'macro' => ''
+                    'line_nr' => 50
                   }
                 }
               ],
@@ -2110,8 +2042,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 50,
-            'macro' => ''
+            'line_nr' => 50
           },
           'type' => 'index_entry_command'
         },
@@ -2148,8 +2079,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 51,
-            'macro' => ''
+            'line_nr' => 51
           },
           'type' => 'index_entry_command'
         },
@@ -2186,8 +2116,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 52,
-            'macro' => ''
+            'line_nr' => 52
           },
           'type' => 'index_entry_command'
         },
@@ -2204,8 +2133,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'cmdname' => 'quotedblleft',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 53,
-                    'macro' => ''
+                    'line_nr' => 53
                   }
                 }
               ],
@@ -2234,8 +2162,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 53,
-            'macro' => ''
+            'line_nr' => 53
           },
           'type' => 'index_entry_command'
         },
@@ -2252,8 +2179,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'cmdname' => 'geq',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 54,
-                    'macro' => ''
+                    'line_nr' => 54
                   }
                 }
               ],
@@ -2282,8 +2208,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 54,
-            'macro' => ''
+            'line_nr' => 54
           },
           'type' => 'index_entry_command'
         },
@@ -2300,8 +2225,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'cmdname' => 'comma',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
-                    'line_nr' => 55,
-                    'macro' => ''
+                    'line_nr' => 55
                   }
                 }
               ],
@@ -2330,8 +2254,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 55,
-            'macro' => ''
+            'line_nr' => 55
           },
           'type' => 'index_entry_command'
         },
@@ -2368,8 +2291,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 56,
-            'macro' => ''
+            'line_nr' => 56
           },
           'type' => 'index_entry_command'
         },
@@ -2406,8 +2328,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 57,
-            'macro' => ''
+            'line_nr' => 57
           },
           'type' => 'index_entry_command'
         },
@@ -2444,8 +2365,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 58,
-            'macro' => ''
+            'line_nr' => 58
           },
           'type' => 'index_entry_command'
         },
@@ -2482,8 +2402,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 59,
-            'macro' => ''
+            'line_nr' => 59
           },
           'type' => 'index_entry_command'
         },
@@ -2520,8 +2439,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 60,
-            'macro' => ''
+            'line_nr' => 60
           },
           'type' => 'index_entry_command'
         },
@@ -2558,8 +2476,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 61,
-            'macro' => ''
+            'line_nr' => 61
           },
           'type' => 'index_entry_command'
         },
@@ -2596,8 +2513,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 62,
-            'macro' => ''
+            'line_nr' => 62
           },
           'type' => 'index_entry_command'
         },
@@ -2634,8 +2550,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 63,
-            'macro' => ''
+            'line_nr' => 63
           },
           'type' => 'index_entry_command'
         },
@@ -2674,8 +2589,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_latin1.texi',
-            'line_nr' => 65,
-            'macro' => ''
+            'line_nr' => 65
           }
         }
       ],
@@ -2691,8 +2605,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
       },
       'source_info' => {
         'file_name' => 'encoding_index_latin1.texi',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
diff --git a/tp/t/results/indices/encoding_index_utf8.pl 
b/tp/t/results/indices/encoding_index_utf8.pl
index 493db7ece2..19c4cf03e5 100644
--- a/tp/t/results/indices/encoding_index_utf8.pl
+++ b/tp/t/results/indices/encoding_index_utf8.pl
@@ -50,8 +50,7 @@ $result_trees{'encoding_index_utf8'} = {
               },
               'source_info' => {
                 'file_name' => 'encoding_index_utf8.texi',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -94,8 +93,7 @@ $result_trees{'encoding_index_utf8'} = {
       },
       'source_info' => {
         'file_name' => 'encoding_index_utf8.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -131,8 +129,7 @@ $result_trees{'encoding_index_utf8'} = {
       },
       'source_info' => {
         'file_name' => 'encoding_index_utf8.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -192,8 +189,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           },
           'type' => 'index_entry_command'
         },
@@ -215,8 +211,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'cmdname' => '"',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 },
                 {
@@ -236,8 +231,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'cmdname' => '"',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 },
                 {
@@ -254,8 +248,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'cmdname' => '"',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 },
                 {
@@ -272,8 +265,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'cmdname' => '"',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 }
               ],
@@ -302,8 +294,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           },
           'type' => 'index_entry_command'
         },
@@ -325,8 +316,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 },
                 {
@@ -346,8 +336,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 },
                 {
@@ -364,8 +353,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 },
                 {
@@ -382,8 +370,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 },
                 {
@@ -400,8 +387,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 }
               ],
@@ -430,8 +416,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           },
           'type' => 'index_entry_command'
         },
@@ -468,8 +453,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           },
           'type' => 'index_entry_command'
         },
@@ -506,8 +490,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           },
           'type' => 'index_entry_command'
         },
@@ -544,8 +527,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           },
           'type' => 'index_entry_command'
         },
@@ -582,8 +564,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           },
           'type' => 'index_entry_command'
         },
@@ -620,8 +601,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           },
           'type' => 'index_entry_command'
         },
@@ -658,8 +638,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           },
           'type' => 'index_entry_command'
         },
@@ -696,8 +675,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           },
           'type' => 'index_entry_command'
         },
@@ -734,8 +712,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           },
           'type' => 'index_entry_command'
         },
@@ -772,8 +749,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           },
           'type' => 'index_entry_command'
         },
@@ -810,8 +786,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 21,
-            'macro' => ''
+            'line_nr' => 21
           },
           'type' => 'index_entry_command'
         },
@@ -848,8 +823,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 22,
-            'macro' => ''
+            'line_nr' => 22
           },
           'type' => 'index_entry_command'
         },
@@ -886,8 +860,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           },
           'type' => 'index_entry_command'
         },
@@ -924,8 +897,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 24,
-            'macro' => ''
+            'line_nr' => 24
           },
           'type' => 'index_entry_command'
         },
@@ -962,8 +934,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           },
           'type' => 'index_entry_command'
         },
@@ -1000,8 +971,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           },
           'type' => 'index_entry_command'
         },
@@ -1038,8 +1008,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 27,
-            'macro' => ''
+            'line_nr' => 27
           },
           'type' => 'index_entry_command'
         },
@@ -1076,8 +1045,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 28,
-            'macro' => ''
+            'line_nr' => 28
           },
           'type' => 'index_entry_command'
         },
@@ -1114,8 +1082,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 29,
-            'macro' => ''
+            'line_nr' => 29
           },
           'type' => 'index_entry_command'
         },
@@ -1152,8 +1119,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 30,
-            'macro' => ''
+            'line_nr' => 30
           },
           'type' => 'index_entry_command'
         },
@@ -1190,8 +1156,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 31,
-            'macro' => ''
+            'line_nr' => 31
           },
           'type' => 'index_entry_command'
         },
@@ -1228,8 +1193,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 32,
-            'macro' => ''
+            'line_nr' => 32
           },
           'type' => 'index_entry_command'
         },
@@ -1266,8 +1230,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 33,
-            'macro' => ''
+            'line_nr' => 33
           },
           'type' => 'index_entry_command'
         },
@@ -1304,8 +1267,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 34,
-            'macro' => ''
+            'line_nr' => 34
           },
           'type' => 'index_entry_command'
         },
@@ -1342,8 +1304,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 35,
-            'macro' => ''
+            'line_nr' => 35
           },
           'type' => 'index_entry_command'
         },
@@ -1380,8 +1341,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 36,
-            'macro' => ''
+            'line_nr' => 36
           },
           'type' => 'index_entry_command'
         },
@@ -1418,8 +1378,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 37,
-            'macro' => ''
+            'line_nr' => 37
           },
           'type' => 'index_entry_command'
         },
@@ -1456,8 +1415,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 38,
-            'macro' => ''
+            'line_nr' => 38
           },
           'type' => 'index_entry_command'
         },
@@ -1494,8 +1452,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 39,
-            'macro' => ''
+            'line_nr' => 39
           },
           'type' => 'index_entry_command'
         },
@@ -1512,8 +1469,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'cmdname' => 'l',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 40,
-                    'macro' => ''
+                    'line_nr' => 40
                   }
                 }
               ],
@@ -1542,8 +1498,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 40,
-            'macro' => ''
+            'line_nr' => 40
           },
           'type' => 'index_entry_command'
         },
@@ -1560,8 +1515,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'cmdname' => 'L',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 41,
-                    'macro' => ''
+                    'line_nr' => 41
                   }
                 }
               ],
@@ -1590,8 +1544,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 41,
-            'macro' => ''
+            'line_nr' => 41
           },
           'type' => 'index_entry_command'
         },
@@ -1613,8 +1566,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'cmdname' => 'dotless',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 42,
-                    'macro' => ''
+                    'line_nr' => 42
                   }
                 },
                 {
@@ -1634,8 +1586,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'cmdname' => 'dotless',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 42,
-                    'macro' => ''
+                    'line_nr' => 42
                   }
                 },
                 {
@@ -1667,8 +1618,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 42,
-            'macro' => ''
+            'line_nr' => 42
           },
           'type' => 'index_entry_command'
         },
@@ -1694,8 +1644,7 @@ $result_trees{'encoding_index_utf8'} = {
                           'cmdname' => 'dotless',
                           'source_info' => {
                             'file_name' => 'encoding_index_utf8.texi',
-                            'line_nr' => 43,
-                            'macro' => ''
+                            'line_nr' => 43
                           }
                         }
                       ],
@@ -1705,8 +1654,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 43,
-                    'macro' => ''
+                    'line_nr' => 43
                   }
                 },
                 {
@@ -1730,8 +1678,7 @@ $result_trees{'encoding_index_utf8'} = {
                           'cmdname' => 'dotless',
                           'source_info' => {
                             'file_name' => 'encoding_index_utf8.texi',
-                            'line_nr' => 43,
-                            'macro' => ''
+                            'line_nr' => 43
                           }
                         }
                       ],
@@ -1741,8 +1688,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 43,
-                    'macro' => ''
+                    'line_nr' => 43
                   }
                 },
                 {
@@ -1774,8 +1720,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 43,
-            'macro' => ''
+            'line_nr' => 43
           },
           'type' => 'index_entry_command'
         },
@@ -1792,8 +1737,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'cmdname' => 'ss',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 44,
-                    'macro' => ''
+                    'line_nr' => 44
                   }
                 }
               ],
@@ -1822,8 +1766,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 44,
-            'macro' => ''
+            'line_nr' => 44
           },
           'type' => 'index_entry_command'
         },
@@ -1840,8 +1783,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'cmdname' => 'euro',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 45,
-                    'macro' => ''
+                    'line_nr' => 45
                   }
                 }
               ],
@@ -1870,8 +1812,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 45,
-            'macro' => ''
+            'line_nr' => 45
           },
           'type' => 'index_entry_command'
         },
@@ -1888,8 +1829,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'cmdname' => 'AE',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 46,
-                    'macro' => ''
+                    'line_nr' => 46
                   }
                 }
               ],
@@ -1918,8 +1858,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 46,
-            'macro' => ''
+            'line_nr' => 46
           },
           'type' => 'index_entry_command'
         },
@@ -1936,8 +1875,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'cmdname' => 'exclamdown',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 47,
-                    'macro' => ''
+                    'line_nr' => 47
                   }
                 }
               ],
@@ -1966,8 +1904,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 47,
-            'macro' => ''
+            'line_nr' => 47
           },
           'type' => 'index_entry_command'
         },
@@ -1984,8 +1921,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'cmdname' => 'TH',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 48,
-                    'macro' => ''
+                    'line_nr' => 48
                   }
                 }
               ],
@@ -2014,8 +1950,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 48,
-            'macro' => ''
+            'line_nr' => 48
           },
           'type' => 'index_entry_command'
         },
@@ -2032,8 +1967,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'cmdname' => 'DH',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 49,
-                    'macro' => ''
+                    'line_nr' => 49
                   }
                 }
               ],
@@ -2062,8 +1996,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 49,
-            'macro' => ''
+            'line_nr' => 49
           },
           'type' => 'index_entry_command'
         },
@@ -2080,8 +2013,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'cmdname' => 'textdegree',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 50,
-                    'macro' => ''
+                    'line_nr' => 50
                   }
                 }
               ],
@@ -2110,8 +2042,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 50,
-            'macro' => ''
+            'line_nr' => 50
           },
           'type' => 'index_entry_command'
         },
@@ -2148,8 +2079,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 51,
-            'macro' => ''
+            'line_nr' => 51
           },
           'type' => 'index_entry_command'
         },
@@ -2186,8 +2116,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 52,
-            'macro' => ''
+            'line_nr' => 52
           },
           'type' => 'index_entry_command'
         },
@@ -2204,8 +2133,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'cmdname' => 'quotedblleft',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 53,
-                    'macro' => ''
+                    'line_nr' => 53
                   }
                 }
               ],
@@ -2234,8 +2162,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 53,
-            'macro' => ''
+            'line_nr' => 53
           },
           'type' => 'index_entry_command'
         },
@@ -2252,8 +2179,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'cmdname' => 'geq',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 54,
-                    'macro' => ''
+                    'line_nr' => 54
                   }
                 }
               ],
@@ -2282,8 +2208,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 54,
-            'macro' => ''
+            'line_nr' => 54
           },
           'type' => 'index_entry_command'
         },
@@ -2300,8 +2225,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'cmdname' => 'comma',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 55,
-                    'macro' => ''
+                    'line_nr' => 55
                   }
                 }
               ],
@@ -2330,8 +2254,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 55,
-            'macro' => ''
+            'line_nr' => 55
           },
           'type' => 'index_entry_command'
         },
@@ -2368,8 +2291,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 56,
-            'macro' => ''
+            'line_nr' => 56
           },
           'type' => 'index_entry_command'
         },
@@ -2406,8 +2328,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 57,
-            'macro' => ''
+            'line_nr' => 57
           },
           'type' => 'index_entry_command'
         },
@@ -2444,8 +2365,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 58,
-            'macro' => ''
+            'line_nr' => 58
           },
           'type' => 'index_entry_command'
         },
@@ -2482,8 +2402,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 59,
-            'macro' => ''
+            'line_nr' => 59
           },
           'type' => 'index_entry_command'
         },
@@ -2520,8 +2439,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 60,
-            'macro' => ''
+            'line_nr' => 60
           },
           'type' => 'index_entry_command'
         },
@@ -2558,8 +2476,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 61,
-            'macro' => ''
+            'line_nr' => 61
           },
           'type' => 'index_entry_command'
         },
@@ -2596,8 +2513,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 62,
-            'macro' => ''
+            'line_nr' => 62
           },
           'type' => 'index_entry_command'
         },
@@ -2634,8 +2550,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 63,
-            'macro' => ''
+            'line_nr' => 63
           },
           'type' => 'index_entry_command'
         },
@@ -2674,8 +2589,7 @@ $result_trees{'encoding_index_utf8'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 65,
-            'macro' => ''
+            'line_nr' => 65
           }
         }
       ],
@@ -2691,8 +2605,7 @@ $result_trees{'encoding_index_utf8'} = {
       },
       'source_info' => {
         'file_name' => 'encoding_index_utf8.texi',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
diff --git a/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl 
b/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
index a4a3e87a94..c8acca8c23 100644
--- a/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
@@ -50,8 +50,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => 'encoding_index_utf8.texi',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -94,8 +93,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
       },
       'source_info' => {
         'file_name' => 'encoding_index_utf8.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -131,8 +129,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
       },
       'source_info' => {
         'file_name' => 'encoding_index_utf8.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -192,8 +189,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           },
           'type' => 'index_entry_command'
         },
@@ -215,8 +211,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'cmdname' => '"',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 },
                 {
@@ -236,8 +231,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'cmdname' => '"',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 },
                 {
@@ -254,8 +248,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'cmdname' => '"',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 },
                 {
@@ -272,8 +265,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'cmdname' => '"',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 }
               ],
@@ -302,8 +294,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           },
           'type' => 'index_entry_command'
         },
@@ -325,8 +316,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 },
                 {
@@ -346,8 +336,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 },
                 {
@@ -364,8 +353,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 },
                 {
@@ -382,8 +370,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 },
                 {
@@ -400,8 +387,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 }
               ],
@@ -430,8 +416,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           },
           'type' => 'index_entry_command'
         },
@@ -468,8 +453,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           },
           'type' => 'index_entry_command'
         },
@@ -506,8 +490,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           },
           'type' => 'index_entry_command'
         },
@@ -544,8 +527,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           },
           'type' => 'index_entry_command'
         },
@@ -582,8 +564,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           },
           'type' => 'index_entry_command'
         },
@@ -620,8 +601,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           },
           'type' => 'index_entry_command'
         },
@@ -658,8 +638,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           },
           'type' => 'index_entry_command'
         },
@@ -696,8 +675,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           },
           'type' => 'index_entry_command'
         },
@@ -734,8 +712,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           },
           'type' => 'index_entry_command'
         },
@@ -772,8 +749,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           },
           'type' => 'index_entry_command'
         },
@@ -810,8 +786,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 21,
-            'macro' => ''
+            'line_nr' => 21
           },
           'type' => 'index_entry_command'
         },
@@ -848,8 +823,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 22,
-            'macro' => ''
+            'line_nr' => 22
           },
           'type' => 'index_entry_command'
         },
@@ -886,8 +860,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           },
           'type' => 'index_entry_command'
         },
@@ -924,8 +897,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 24,
-            'macro' => ''
+            'line_nr' => 24
           },
           'type' => 'index_entry_command'
         },
@@ -962,8 +934,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           },
           'type' => 'index_entry_command'
         },
@@ -1000,8 +971,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           },
           'type' => 'index_entry_command'
         },
@@ -1038,8 +1008,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 27,
-            'macro' => ''
+            'line_nr' => 27
           },
           'type' => 'index_entry_command'
         },
@@ -1076,8 +1045,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 28,
-            'macro' => ''
+            'line_nr' => 28
           },
           'type' => 'index_entry_command'
         },
@@ -1114,8 +1082,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 29,
-            'macro' => ''
+            'line_nr' => 29
           },
           'type' => 'index_entry_command'
         },
@@ -1152,8 +1119,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 30,
-            'macro' => ''
+            'line_nr' => 30
           },
           'type' => 'index_entry_command'
         },
@@ -1190,8 +1156,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 31,
-            'macro' => ''
+            'line_nr' => 31
           },
           'type' => 'index_entry_command'
         },
@@ -1228,8 +1193,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 32,
-            'macro' => ''
+            'line_nr' => 32
           },
           'type' => 'index_entry_command'
         },
@@ -1266,8 +1230,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 33,
-            'macro' => ''
+            'line_nr' => 33
           },
           'type' => 'index_entry_command'
         },
@@ -1304,8 +1267,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 34,
-            'macro' => ''
+            'line_nr' => 34
           },
           'type' => 'index_entry_command'
         },
@@ -1342,8 +1304,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 35,
-            'macro' => ''
+            'line_nr' => 35
           },
           'type' => 'index_entry_command'
         },
@@ -1380,8 +1341,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 36,
-            'macro' => ''
+            'line_nr' => 36
           },
           'type' => 'index_entry_command'
         },
@@ -1418,8 +1378,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 37,
-            'macro' => ''
+            'line_nr' => 37
           },
           'type' => 'index_entry_command'
         },
@@ -1456,8 +1415,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 38,
-            'macro' => ''
+            'line_nr' => 38
           },
           'type' => 'index_entry_command'
         },
@@ -1494,8 +1452,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 39,
-            'macro' => ''
+            'line_nr' => 39
           },
           'type' => 'index_entry_command'
         },
@@ -1512,8 +1469,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'cmdname' => 'l',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 40,
-                    'macro' => ''
+                    'line_nr' => 40
                   }
                 }
               ],
@@ -1542,8 +1498,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 40,
-            'macro' => ''
+            'line_nr' => 40
           },
           'type' => 'index_entry_command'
         },
@@ -1560,8 +1515,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'cmdname' => 'L',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 41,
-                    'macro' => ''
+                    'line_nr' => 41
                   }
                 }
               ],
@@ -1590,8 +1544,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 41,
-            'macro' => ''
+            'line_nr' => 41
           },
           'type' => 'index_entry_command'
         },
@@ -1613,8 +1566,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'cmdname' => 'dotless',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 42,
-                    'macro' => ''
+                    'line_nr' => 42
                   }
                 },
                 {
@@ -1634,8 +1586,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'cmdname' => 'dotless',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 42,
-                    'macro' => ''
+                    'line_nr' => 42
                   }
                 },
                 {
@@ -1667,8 +1618,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 42,
-            'macro' => ''
+            'line_nr' => 42
           },
           'type' => 'index_entry_command'
         },
@@ -1694,8 +1644,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                           'cmdname' => 'dotless',
                           'source_info' => {
                             'file_name' => 'encoding_index_utf8.texi',
-                            'line_nr' => 43,
-                            'macro' => ''
+                            'line_nr' => 43
                           }
                         }
                       ],
@@ -1705,8 +1654,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 43,
-                    'macro' => ''
+                    'line_nr' => 43
                   }
                 },
                 {
@@ -1730,8 +1678,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                           'cmdname' => 'dotless',
                           'source_info' => {
                             'file_name' => 'encoding_index_utf8.texi',
-                            'line_nr' => 43,
-                            'macro' => ''
+                            'line_nr' => 43
                           }
                         }
                       ],
@@ -1741,8 +1688,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 43,
-                    'macro' => ''
+                    'line_nr' => 43
                   }
                 },
                 {
@@ -1774,8 +1720,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 43,
-            'macro' => ''
+            'line_nr' => 43
           },
           'type' => 'index_entry_command'
         },
@@ -1792,8 +1737,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'cmdname' => 'ss',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 44,
-                    'macro' => ''
+                    'line_nr' => 44
                   }
                 }
               ],
@@ -1822,8 +1766,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 44,
-            'macro' => ''
+            'line_nr' => 44
           },
           'type' => 'index_entry_command'
         },
@@ -1840,8 +1783,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'cmdname' => 'euro',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 45,
-                    'macro' => ''
+                    'line_nr' => 45
                   }
                 }
               ],
@@ -1870,8 +1812,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 45,
-            'macro' => ''
+            'line_nr' => 45
           },
           'type' => 'index_entry_command'
         },
@@ -1888,8 +1829,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'cmdname' => 'AE',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 46,
-                    'macro' => ''
+                    'line_nr' => 46
                   }
                 }
               ],
@@ -1918,8 +1858,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 46,
-            'macro' => ''
+            'line_nr' => 46
           },
           'type' => 'index_entry_command'
         },
@@ -1936,8 +1875,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'cmdname' => 'exclamdown',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 47,
-                    'macro' => ''
+                    'line_nr' => 47
                   }
                 }
               ],
@@ -1966,8 +1904,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 47,
-            'macro' => ''
+            'line_nr' => 47
           },
           'type' => 'index_entry_command'
         },
@@ -1984,8 +1921,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'cmdname' => 'TH',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 48,
-                    'macro' => ''
+                    'line_nr' => 48
                   }
                 }
               ],
@@ -2014,8 +1950,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 48,
-            'macro' => ''
+            'line_nr' => 48
           },
           'type' => 'index_entry_command'
         },
@@ -2032,8 +1967,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'cmdname' => 'DH',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 49,
-                    'macro' => ''
+                    'line_nr' => 49
                   }
                 }
               ],
@@ -2062,8 +1996,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 49,
-            'macro' => ''
+            'line_nr' => 49
           },
           'type' => 'index_entry_command'
         },
@@ -2080,8 +2013,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'cmdname' => 'textdegree',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 50,
-                    'macro' => ''
+                    'line_nr' => 50
                   }
                 }
               ],
@@ -2110,8 +2042,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 50,
-            'macro' => ''
+            'line_nr' => 50
           },
           'type' => 'index_entry_command'
         },
@@ -2148,8 +2079,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 51,
-            'macro' => ''
+            'line_nr' => 51
           },
           'type' => 'index_entry_command'
         },
@@ -2186,8 +2116,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 52,
-            'macro' => ''
+            'line_nr' => 52
           },
           'type' => 'index_entry_command'
         },
@@ -2204,8 +2133,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'cmdname' => 'quotedblleft',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 53,
-                    'macro' => ''
+                    'line_nr' => 53
                   }
                 }
               ],
@@ -2234,8 +2162,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 53,
-            'macro' => ''
+            'line_nr' => 53
           },
           'type' => 'index_entry_command'
         },
@@ -2252,8 +2179,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'cmdname' => 'geq',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 54,
-                    'macro' => ''
+                    'line_nr' => 54
                   }
                 }
               ],
@@ -2282,8 +2208,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 54,
-            'macro' => ''
+            'line_nr' => 54
           },
           'type' => 'index_entry_command'
         },
@@ -2300,8 +2225,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'cmdname' => 'comma',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
-                    'line_nr' => 55,
-                    'macro' => ''
+                    'line_nr' => 55
                   }
                 }
               ],
@@ -2330,8 +2254,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 55,
-            'macro' => ''
+            'line_nr' => 55
           },
           'type' => 'index_entry_command'
         },
@@ -2368,8 +2291,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 56,
-            'macro' => ''
+            'line_nr' => 56
           },
           'type' => 'index_entry_command'
         },
@@ -2406,8 +2328,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 57,
-            'macro' => ''
+            'line_nr' => 57
           },
           'type' => 'index_entry_command'
         },
@@ -2444,8 +2365,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 58,
-            'macro' => ''
+            'line_nr' => 58
           },
           'type' => 'index_entry_command'
         },
@@ -2482,8 +2402,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 59,
-            'macro' => ''
+            'line_nr' => 59
           },
           'type' => 'index_entry_command'
         },
@@ -2520,8 +2439,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 60,
-            'macro' => ''
+            'line_nr' => 60
           },
           'type' => 'index_entry_command'
         },
@@ -2558,8 +2476,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 61,
-            'macro' => ''
+            'line_nr' => 61
           },
           'type' => 'index_entry_command'
         },
@@ -2596,8 +2513,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 62,
-            'macro' => ''
+            'line_nr' => 62
           },
           'type' => 'index_entry_command'
         },
@@ -2634,8 +2550,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 63,
-            'macro' => ''
+            'line_nr' => 63
           },
           'type' => 'index_entry_command'
         },
@@ -2674,8 +2589,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => 'encoding_index_utf8.texi',
-            'line_nr' => 65,
-            'macro' => ''
+            'line_nr' => 65
           }
         }
       ],
@@ -2691,8 +2605,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
       },
       'source_info' => {
         'file_name' => 'encoding_index_utf8.texi',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
diff --git a/tp/t/results/indices/explicit_sort_key.pl 
b/tp/t/results/indices/explicit_sort_key.pl
index d0efd6f331..ac9f2585b1 100644
--- a/tp/t/results/indices/explicit_sort_key.pl
+++ b/tp/t/results/indices/explicit_sort_key.pl
@@ -44,8 +44,7 @@ $result_trees{'explicit_sort_key'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -71,8 +70,7 @@ $result_trees{'explicit_sort_key'} = {
       'extra' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -129,8 +127,7 @@ $result_trees{'explicit_sort_key'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -156,8 +153,7 @@ $result_trees{'explicit_sort_key'} = {
                   'cmdname' => 'sortas',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 8,
-                    'macro' => ''
+                    'line_nr' => 8
                   }
                 },
                 {
@@ -194,8 +190,7 @@ $result_trees{'explicit_sort_key'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           },
           'type' => 'index_entry_command'
         },
@@ -217,8 +212,7 @@ $result_trees{'explicit_sort_key'} = {
                   'cmdname' => 'sortas',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 },
                 {
@@ -255,8 +249,7 @@ $result_trees{'explicit_sort_key'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           },
           'type' => 'index_entry_command'
         },
@@ -278,8 +271,7 @@ $result_trees{'explicit_sort_key'} = {
                   'cmdname' => 'sortas',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 },
                 {
@@ -316,8 +308,7 @@ $result_trees{'explicit_sort_key'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           },
           'type' => 'index_entry_command'
         },
@@ -346,8 +337,7 @@ $result_trees{'explicit_sort_key'} = {
                           'cmdname' => 'sortas',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 11,
-                            'macro' => ''
+                            'line_nr' => 11
                           }
                         }
                       ],
@@ -357,8 +347,7 @@ $result_trees{'explicit_sort_key'} = {
                   'cmdname' => 'b',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 }
               ],
@@ -387,8 +376,7 @@ $result_trees{'explicit_sort_key'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           },
           'type' => 'index_entry_command'
         },
@@ -416,8 +404,7 @@ $result_trees{'explicit_sort_key'} = {
               'cmdname' => 'sortas',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -444,8 +431,7 @@ $result_trees{'explicit_sort_key'} = {
                       'cmdname' => 'sortas',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     }
                   ],
@@ -455,8 +441,7 @@ $result_trees{'explicit_sort_key'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -494,8 +479,7 @@ $result_trees{'explicit_sort_key'} = {
                       'cmdname' => 'b',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     }
                   ],
@@ -505,8 +489,7 @@ $result_trees{'explicit_sort_key'} = {
               'cmdname' => 'sortas',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -534,8 +517,7 @@ $result_trees{'explicit_sort_key'} = {
                       'cmdname' => 'sortas',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     }
                   ],
@@ -545,8 +527,7 @@ $result_trees{'explicit_sort_key'} = {
               'cmdname' => 'url',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -591,8 +572,7 @@ $result_trees{'explicit_sort_key'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           }
         }
       ],
@@ -608,8 +588,7 @@ $result_trees{'explicit_sort_key'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     }
   ],
@@ -721,7 +700,6 @@ $result_errors{'explicit_sort_key'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => '@sortas should only appear in an index entry',
     'type' => 'warning'
   },
@@ -730,7 +708,6 @@ $result_errors{'explicit_sort_key'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => '@sortas should only appear in an index entry',
     'type' => 'warning'
   },
@@ -739,7 +716,6 @@ $result_errors{'explicit_sort_key'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => '@sortas should only appear in an index entry',
     'type' => 'warning'
   },
@@ -748,7 +724,6 @@ $result_errors{'explicit_sort_key'} = [
 ',
     'file_name' => '',
     'line_nr' => 15,
-    'macro' => '',
     'text' => '@sortas should only appear in an index entry',
     'type' => 'warning'
   },
@@ -757,7 +732,6 @@ $result_errors{'explicit_sort_key'} = [
 ',
     'file_name' => '',
     'line_nr' => 15,
-    'macro' => '',
     'text' => '@b should not appear in @sortas',
     'type' => 'warning'
   },
@@ -766,7 +740,6 @@ $result_errors{'explicit_sort_key'} = [
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => '@sortas should only appear in an index entry',
     'type' => 'warning'
   }
diff --git a/tp/t/results/indices/ftable_vtable.pl 
b/tp/t/results/indices/ftable_vtable.pl
index 83e8cf3f33..e1b9b8f983 100644
--- a/tp/t/results/indices/ftable_vtable.pl
+++ b/tp/t/results/indices/ftable_vtable.pl
@@ -54,8 +54,7 @@ $result_trees{'ftable_vtable'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -90,8 +89,7 @@ $result_trees{'ftable_vtable'} = {
                   'cmdname' => 'emph',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   },
                   'type' => 'command_as_argument'
                 }
@@ -143,8 +141,7 @@ $result_trees{'ftable_vtable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     },
                     {
@@ -179,8 +176,7 @@ $result_trees{'ftable_vtable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     }
                   ],
@@ -239,8 +235,7 @@ $result_trees{'ftable_vtable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     }
                   ],
@@ -277,8 +272,7 @@ $result_trees{'ftable_vtable'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
@@ -292,8 +286,7 @@ $result_trees{'ftable_vtable'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -309,8 +302,7 @@ $result_trees{'ftable_vtable'} = {
                   'cmdname' => 'emph',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 12,
-                    'macro' => ''
+                    'line_nr' => 12
                   },
                   'type' => 'command_as_argument'
                 }
@@ -346,8 +338,7 @@ $result_trees{'ftable_vtable'} = {
                               'cmdname' => 'error',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 13,
-                                'macro' => ''
+                                'line_nr' => 13
                               }
                             }
                           ],
@@ -375,8 +366,7 @@ $result_trees{'ftable_vtable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     },
                     {
@@ -411,8 +401,7 @@ $result_trees{'ftable_vtable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     }
                   ],
@@ -471,8 +460,7 @@ $result_trees{'ftable_vtable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     }
                   ],
@@ -509,8 +497,7 @@ $result_trees{'ftable_vtable'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             }
           ],
@@ -524,8 +511,7 @@ $result_trees{'ftable_vtable'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           }
         },
         {
@@ -566,8 +552,7 @@ $result_trees{'ftable_vtable'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           },
           'type' => 'index_entry_command'
         },
@@ -606,8 +591,7 @@ $result_trees{'ftable_vtable'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 21,
-            'macro' => ''
+            'line_nr' => 21
           }
         },
         {
@@ -645,8 +629,7 @@ $result_trees{'ftable_vtable'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           }
         },
         {
@@ -667,8 +650,7 @@ $result_trees{'ftable_vtable'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     }
   ],
diff --git a/tp/t/results/indices/ignored_sort_char_empty_entries.pl 
b/tp/t/results/indices/ignored_sort_char_empty_entries.pl
index ded3503a1b..6bcd987541 100644
--- a/tp/t/results/indices/ignored_sort_char_empty_entries.pl
+++ b/tp/t/results/indices/ignored_sort_char_empty_entries.pl
@@ -68,8 +68,7 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -95,8 +94,7 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
       'extra' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -157,8 +155,7 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           },
           'type' => 'index_entry_command'
         },
@@ -196,8 +193,7 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           },
           'type' => 'index_entry_command'
         },
@@ -235,8 +231,7 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           },
           'type' => 'index_entry_command'
         },
@@ -258,8 +253,7 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
                   'cmdname' => 'sortas',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 },
                 {
@@ -297,8 +291,7 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           },
           'type' => 'index_entry_command'
         },
@@ -337,8 +330,7 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         }
       ],
@@ -354,8 +346,7 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     }
   ],
@@ -457,7 +448,6 @@ $result_errors{'ignored_sort_char_empty_entries'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => 'empty index key in @findex',
     'type' => 'warning'
   },
@@ -466,7 +456,6 @@ $result_errors{'ignored_sort_char_empty_entries'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'empty index key in @findex',
     'type' => 'warning'
   }
@@ -519,7 +508,6 @@ 
$result_converted_errors{'info'}->{'ignored_sort_char_empty_entries'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => 'empty index key in @findex',
     'type' => 'warning'
   },
@@ -528,7 +516,6 @@ 
$result_converted_errors{'info'}->{'ignored_sort_char_empty_entries'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'empty index key in @findex',
     'type' => 'warning'
   }
@@ -549,7 +536,6 @@ 
$result_converted_errors{'plaintext'}->{'ignored_sort_char_empty_entries'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => 'empty index key in @findex',
     'type' => 'warning'
   },
@@ -558,7 +544,6 @@ 
$result_converted_errors{'plaintext'}->{'ignored_sort_char_empty_entries'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'empty index key in @findex',
     'type' => 'warning'
   }
@@ -618,7 +603,6 @@ 
$result_converted_errors{'html_text'}->{'ignored_sort_char_empty_entries'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => 'empty index key in @findex',
     'type' => 'warning'
   },
@@ -627,7 +611,6 @@ 
$result_converted_errors{'html_text'}->{'ignored_sort_char_empty_entries'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'empty index key in @findex',
     'type' => 'warning'
   }
diff --git a/tp/t/results/indices/image_lines_count.pl 
b/tp/t/results/indices/image_lines_count.pl
index b2f168ec09..461ef7bf0b 100644
Binary files a/tp/t/results/indices/image_lines_count.pl and 
b/tp/t/results/indices/image_lines_count.pl differ
diff --git a/tp/t/results/indices/image_text_lines_count.pl 
b/tp/t/results/indices/image_text_lines_count.pl
index 16a2c8592e..bc2115c7f4 100644
Binary files a/tp/t/results/indices/image_text_lines_count.pl and 
b/tp/t/results/indices/image_text_lines_count.pl differ
diff --git a/tp/t/results/indices/index_and_node_same_name.pl 
b/tp/t/results/indices/index_and_node_same_name.pl
index 3d1ecb9cd5..baf01821eb 100644
--- a/tp/t/results/indices/index_and_node_same_name.pl
+++ b/tp/t/results/indices/index_and_node_same_name.pl
@@ -44,8 +44,7 @@ $result_trees{'index_and_node_same_name'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -119,8 +118,7 @@ $result_trees{'index_and_node_same_name'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           },
           'type' => 'index_entry_command'
         },
@@ -138,8 +136,7 @@ $result_trees{'index_and_node_same_name'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -172,8 +169,7 @@ $result_trees{'index_and_node_same_name'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -244,8 +240,7 @@ $result_trees{'index_and_node_same_name'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         }
       ],
@@ -259,8 +254,7 @@ $result_trees{'index_and_node_same_name'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     }
   ],
diff --git a/tp/t/results/indices/index_entries_before_nodes.pl 
b/tp/t/results/indices/index_entries_before_nodes.pl
index a458f3d4dc..89ea8d4e5e 100644
Binary files a/tp/t/results/indices/index_entries_before_nodes.pl and 
b/tp/t/results/indices/index_entries_before_nodes.pl differ
diff --git a/tp/t/results/indices/index_entries_locations.pl 
b/tp/t/results/indices/index_entries_locations.pl
index cfc0617301..873938b11f 100644
--- a/tp/t/results/indices/index_entries_locations.pl
+++ b/tp/t/results/indices/index_entries_locations.pl
@@ -54,8 +54,7 @@ $result_trees{'index_entries_locations'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -135,8 +134,7 @@ $result_trees{'index_entries_locations'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               },
               'type' => 'index_entry_command'
             },
@@ -177,8 +175,7 @@ $result_trees{'index_entries_locations'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'index_entry_command'
             }
@@ -237,8 +234,7 @@ $result_trees{'index_entries_locations'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           },
           'type' => 'index_entry_command'
         },
@@ -289,8 +285,7 @@ $result_trees{'index_entries_locations'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           },
           'type' => 'index_entry_command'
         },
@@ -343,8 +338,7 @@ $result_trees{'index_entries_locations'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 21,
-            'macro' => ''
+            'line_nr' => 21
           }
         }
       ],
@@ -360,8 +354,7 @@ $result_trees{'index_entries_locations'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     }
   ],
diff --git a/tp/t/results/indices/index_entry_before_first_node.pl 
b/tp/t/results/indices/index_entry_before_first_node.pl
index c21d55ac92..197c490002 100644
Binary files a/tp/t/results/indices/index_entry_before_first_node.pl and 
b/tp/t/results/indices/index_entry_before_first_node.pl differ
diff --git a/tp/t/results/indices/index_entry_before_node.pl 
b/tp/t/results/indices/index_entry_before_node.pl
index f9416d43cc..7b576b19d8 100644
--- a/tp/t/results/indices/index_entry_before_node.pl
+++ b/tp/t/results/indices/index_entry_before_node.pl
@@ -96,8 +96,7 @@ $result_trees{'index_entry_before_node'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -144,8 +143,7 @@ $result_trees{'index_entry_before_node'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -177,15 +175,13 @@ $result_trees{'index_entry_before_node'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -205,8 +201,7 @@ $result_trees{'index_entry_before_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -315,8 +310,7 @@ $result_trees{'index_entry_before_node'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           },
           'type' => 'index_entry_command'
         },
@@ -337,8 +331,7 @@ $result_trees{'index_entry_before_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -430,8 +423,7 @@ $result_trees{'index_entry_before_node'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           }
         }
       ],
@@ -447,8 +439,7 @@ $result_trees{'index_entry_before_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     }
   ],
diff --git a/tp/t/results/indices/index_entry_in_footnote.pl 
b/tp/t/results/indices/index_entry_in_footnote.pl
index c46cc1ffb0..74f151ada5 100644
Binary files a/tp/t/results/indices/index_entry_in_footnote.pl and 
b/tp/t/results/indices/index_entry_in_footnote.pl differ
diff --git a/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl 
b/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl
index b75d2764a1..6db94e6dfa 100644
--- a/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl
@@ -96,8 +96,7 @@ $result_trees{'index_entry_in_footnote_different_node_end'} = 
{
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -144,8 +143,7 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -177,15 +175,13 @@ 
$result_trees{'index_entry_in_footnote_different_node_end'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -205,8 +201,7 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -281,8 +276,7 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 11,
-                            'macro' => ''
+                            'line_nr' => 11
                           },
                           'type' => 'index_entry_command'
                         }
@@ -355,8 +349,7 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       },
                       'type' => 'index_entry_command'
                     }
@@ -367,8 +360,7 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -395,8 +387,7 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -453,8 +444,7 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 22,
-            'macro' => ''
+            'line_nr' => 22
           }
         }
       ],
@@ -470,8 +460,7 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 20,
-        'macro' => ''
+        'line_nr' => 20
       }
     }
   ],
diff --git a/tp/t/results/indices/index_entry_in_footnote_sections.pl 
b/tp/t/results/indices/index_entry_in_footnote_sections.pl
index 823bbda016..d0cc26c253 100644
--- a/tp/t/results/indices/index_entry_in_footnote_sections.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_sections.pl
@@ -44,8 +44,7 @@ $result_trees{'index_entry_in_footnote_sections'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -134,8 +133,7 @@ $result_trees{'index_entry_in_footnote_sections'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 7,
-                            'macro' => ''
+                            'line_nr' => 7
                           },
                           'type' => 'index_entry_command'
                         }
@@ -149,8 +147,7 @@ $result_trees{'index_entry_in_footnote_sections'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -174,8 +171,7 @@ $result_trees{'index_entry_in_footnote_sections'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -208,8 +204,7 @@ $result_trees{'index_entry_in_footnote_sections'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -266,8 +261,7 @@ $result_trees{'index_entry_in_footnote_sections'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         }
       ],
@@ -281,8 +275,7 @@ $result_trees{'index_entry_in_footnote_sections'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     }
   ],
diff --git a/tp/t/results/indices/index_entry_in_footnote_sections_separate.pl 
b/tp/t/results/indices/index_entry_in_footnote_sections_separate.pl
index 58bd2c9b41..b3b48a7353 100644
--- a/tp/t/results/indices/index_entry_in_footnote_sections_separate.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_sections_separate.pl
@@ -44,8 +44,7 @@ $result_trees{'index_entry_in_footnote_sections_separate'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -134,8 +133,7 @@ $result_trees{'index_entry_in_footnote_sections_separate'} 
= {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 7,
-                            'macro' => ''
+                            'line_nr' => 7
                           },
                           'type' => 'index_entry_command'
                         }
@@ -149,8 +147,7 @@ $result_trees{'index_entry_in_footnote_sections_separate'} 
= {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -174,8 +171,7 @@ $result_trees{'index_entry_in_footnote_sections_separate'} 
= {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -208,8 +204,7 @@ $result_trees{'index_entry_in_footnote_sections_separate'} 
= {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -266,8 +261,7 @@ $result_trees{'index_entry_in_footnote_sections_separate'} 
= {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         }
       ],
@@ -281,8 +275,7 @@ $result_trees{'index_entry_in_footnote_sections_separate'} 
= {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     }
   ],
diff --git a/tp/t/results/indices/index_entry_in_footnote_separate.pl 
b/tp/t/results/indices/index_entry_in_footnote_separate.pl
index 154a1ce729..723245d934 100644
--- a/tp/t/results/indices/index_entry_in_footnote_separate.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_separate.pl
@@ -41,8 +41,7 @@ $result_trees{'index_entry_in_footnote_separate'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -132,8 +131,7 @@ $result_trees{'index_entry_in_footnote_separate'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -180,8 +178,7 @@ $result_trees{'index_entry_in_footnote_separate'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -213,15 +210,13 @@ $result_trees{'index_entry_in_footnote_separate'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -241,8 +236,7 @@ $result_trees{'index_entry_in_footnote_separate'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -317,8 +311,7 @@ $result_trees{'index_entry_in_footnote_separate'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 12,
-                            'macro' => ''
+                            'line_nr' => 12
                           },
                           'type' => 'index_entry_command'
                         }
@@ -391,8 +384,7 @@ $result_trees{'index_entry_in_footnote_separate'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       },
                       'type' => 'index_entry_command'
                     }
@@ -403,8 +395,7 @@ $result_trees{'index_entry_in_footnote_separate'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -431,8 +422,7 @@ $result_trees{'index_entry_in_footnote_separate'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -489,8 +479,7 @@ $result_trees{'index_entry_in_footnote_separate'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           }
         }
       ],
@@ -506,8 +495,7 @@ $result_trees{'index_entry_in_footnote_separate'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 21,
-        'macro' => ''
+        'line_nr' => 21
       }
     }
   ],
diff --git a/tp/t/results/indices/index_no_node.pl 
b/tp/t/results/indices/index_no_node.pl
index aae7eb590a..eff016d24b 100644
--- a/tp/t/results/indices/index_no_node.pl
+++ b/tp/t/results/indices/index_no_node.pl
@@ -59,8 +59,7 @@ $result_trees{'index_no_node'} = {
               },
               'source_info' => {
                 'file_name' => 'index_no_node.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -103,8 +102,7 @@ $result_trees{'index_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node.texi',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           },
           'type' => 'index_entry_command'
         },
@@ -147,8 +145,7 @@ $result_trees{'index_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node.texi',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -208,8 +205,7 @@ $result_trees{'index_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node.texi',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -249,8 +245,7 @@ $result_trees{'index_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node.texi',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           },
           'type' => 'index_entry_command'
         },
@@ -292,8 +287,7 @@ $result_trees{'index_no_node'} = {
               },
               'source_info' => {
                 'file_name' => 'index_no_node.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               },
               'type' => 'index_entry_command'
             }
@@ -335,8 +329,7 @@ $result_trees{'index_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node.texi',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -353,8 +346,7 @@ $result_trees{'index_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'index_no_node.texi',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -413,8 +405,7 @@ $result_trees{'index_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node.texi',
-            'line_nr' => 21,
-            'macro' => ''
+            'line_nr' => 21
           },
           'type' => 'index_entry_command'
         },
@@ -450,8 +441,7 @@ $result_trees{'index_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node.texi',
-            'line_nr' => 22,
-            'macro' => ''
+            'line_nr' => 22
           },
           'type' => 'index_entry_command'
         },
@@ -487,8 +477,7 @@ $result_trees{'index_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node.texi',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           },
           'type' => 'index_entry_command'
         },
@@ -524,8 +513,7 @@ $result_trees{'index_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node.texi',
-            'line_nr' => 24,
-            'macro' => ''
+            'line_nr' => 24
           },
           'type' => 'index_entry_command'
         },
@@ -561,8 +549,7 @@ $result_trees{'index_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node.texi',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           },
           'type' => 'index_entry_command'
         },
@@ -598,8 +585,7 @@ $result_trees{'index_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node.texi',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           },
           'type' => 'index_entry_command'
         },
@@ -647,8 +633,7 @@ $result_trees{'index_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node.texi',
-            'line_nr' => 29,
-            'macro' => ''
+            'line_nr' => 29
           }
         },
         {
@@ -688,8 +673,7 @@ $result_trees{'index_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node.texi',
-            'line_nr' => 31,
-            'macro' => ''
+            'line_nr' => 31
           },
           'type' => 'index_entry_command'
         },
@@ -712,8 +696,7 @@ $result_trees{'index_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'index_no_node.texi',
-        'line_nr' => 19,
-        'macro' => ''
+        'line_nr' => 19
       }
     },
     {
@@ -770,8 +753,7 @@ $result_trees{'index_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node.texi',
-            'line_nr' => 36,
-            'macro' => ''
+            'line_nr' => 36
           }
         },
         {
@@ -806,8 +788,7 @@ $result_trees{'index_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node.texi',
-            'line_nr' => 37,
-            'macro' => ''
+            'line_nr' => 37
           },
           'type' => 'index_entry_command'
         },
@@ -849,8 +830,7 @@ $result_trees{'index_no_node'} = {
               },
               'source_info' => {
                 'file_name' => 'index_no_node.texi',
-                'line_nr' => 39,
-                'macro' => ''
+                'line_nr' => 39
               },
               'type' => 'index_entry_command'
             }
@@ -892,8 +872,7 @@ $result_trees{'index_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node.texi',
-            'line_nr' => 41,
-            'macro' => ''
+            'line_nr' => 41
           }
         }
       ],
@@ -905,8 +884,7 @@ $result_trees{'index_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'index_no_node.texi',
-        'line_nr' => 34,
-        'macro' => ''
+        'line_nr' => 34
       }
     },
     {
@@ -960,8 +938,7 @@ $result_trees{'index_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node.texi',
-            'line_nr' => 43,
-            'macro' => ''
+            'line_nr' => 43
           },
           'type' => 'index_entry_command'
         },
@@ -1000,8 +977,7 @@ $result_trees{'index_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node.texi',
-            'line_nr' => 45,
-            'macro' => ''
+            'line_nr' => 45
           }
         },
         {
@@ -1042,8 +1018,7 @@ $result_trees{'index_no_node'} = {
               },
               'source_info' => {
                 'file_name' => 'index_no_node.texi',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               },
               'type' => 'index_entry_command'
             }
@@ -1066,8 +1041,7 @@ $result_trees{'index_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'index_no_node.texi',
-        'line_nr' => 42,
-        'macro' => ''
+        'line_nr' => 42
       }
     },
     {
@@ -1119,8 +1093,7 @@ $result_trees{'index_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'index_no_node.texi',
-        'line_nr' => 49,
-        'macro' => ''
+        'line_nr' => 49
       }
     },
     {
@@ -1312,7 +1285,6 @@ $result_errors{'index_no_node'} = [
 ',
     'file_name' => 'index_no_node.texi',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1321,7 +1293,6 @@ $result_errors{'index_no_node'} = [
 ',
     'file_name' => 'index_no_node.texi',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'printindex before document beginning: @printindex cp',
     'type' => 'warning'
   },
@@ -1330,7 +1301,6 @@ $result_errors{'index_no_node'} = [
 ',
     'file_name' => 'index_no_node.texi',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'unknown index `bidule\' in @printindex',
     'type' => 'error'
   },
@@ -1339,7 +1309,6 @@ $result_errors{'index_no_node'} = [
 ',
     'file_name' => 'index_no_node.texi',
     'line_nr' => 19,
-    'macro' => '',
     'text' => 'lowering the section level of @top appearing after a lower 
element',
     'type' => 'warning'
   }
diff --git a/tp/t/results/indices/index_no_node_no_top.pl 
b/tp/t/results/indices/index_no_node_no_top.pl
index 58ba783459..e8af932b73 100644
--- a/tp/t/results/indices/index_no_node_no_top.pl
+++ b/tp/t/results/indices/index_no_node_no_top.pl
@@ -59,8 +59,7 @@ $result_trees{'index_no_node_no_top'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           },
           'type' => 'index_entry_command'
         },
@@ -103,8 +102,7 @@ $result_trees{'index_no_node_no_top'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -164,8 +162,7 @@ $result_trees{'index_no_node_no_top'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -205,8 +202,7 @@ $result_trees{'index_no_node_no_top'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           },
           'type' => 'index_entry_command'
         },
@@ -248,8 +244,7 @@ $result_trees{'index_no_node_no_top'} = {
               },
               'source_info' => {
                 'file_name' => 'index_no_node_no_top.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               },
               'type' => 'index_entry_command'
             }
@@ -291,8 +286,7 @@ $result_trees{'index_no_node_no_top'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         },
         {
@@ -309,8 +303,7 @@ $result_trees{'index_no_node_no_top'} = {
       },
       'source_info' => {
         'file_name' => 'index_no_node_no_top.texi',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -369,8 +362,7 @@ $result_trees{'index_no_node_no_top'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           },
           'type' => 'index_entry_command'
         },
@@ -406,8 +398,7 @@ $result_trees{'index_no_node_no_top'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           },
           'type' => 'index_entry_command'
         },
@@ -443,8 +434,7 @@ $result_trees{'index_no_node_no_top'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 21,
-            'macro' => ''
+            'line_nr' => 21
           },
           'type' => 'index_entry_command'
         },
@@ -480,8 +470,7 @@ $result_trees{'index_no_node_no_top'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 22,
-            'macro' => ''
+            'line_nr' => 22
           },
           'type' => 'index_entry_command'
         },
@@ -517,8 +506,7 @@ $result_trees{'index_no_node_no_top'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           },
           'type' => 'index_entry_command'
         },
@@ -554,8 +542,7 @@ $result_trees{'index_no_node_no_top'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 24,
-            'macro' => ''
+            'line_nr' => 24
           },
           'type' => 'index_entry_command'
         },
@@ -603,8 +590,7 @@ $result_trees{'index_no_node_no_top'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 27,
-            'macro' => ''
+            'line_nr' => 27
           }
         },
         {
@@ -644,8 +630,7 @@ $result_trees{'index_no_node_no_top'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 29,
-            'macro' => ''
+            'line_nr' => 29
           },
           'type' => 'index_entry_command'
         },
@@ -668,8 +653,7 @@ $result_trees{'index_no_node_no_top'} = {
       },
       'source_info' => {
         'file_name' => 'index_no_node_no_top.texi',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -726,8 +710,7 @@ $result_trees{'index_no_node_no_top'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 34,
-            'macro' => ''
+            'line_nr' => 34
           }
         },
         {
@@ -762,8 +745,7 @@ $result_trees{'index_no_node_no_top'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 35,
-            'macro' => ''
+            'line_nr' => 35
           },
           'type' => 'index_entry_command'
         },
@@ -805,8 +787,7 @@ $result_trees{'index_no_node_no_top'} = {
               },
               'source_info' => {
                 'file_name' => 'index_no_node_no_top.texi',
-                'line_nr' => 37,
-                'macro' => ''
+                'line_nr' => 37
               },
               'type' => 'index_entry_command'
             }
@@ -848,8 +829,7 @@ $result_trees{'index_no_node_no_top'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 39,
-            'macro' => ''
+            'line_nr' => 39
           }
         }
       ],
@@ -861,8 +841,7 @@ $result_trees{'index_no_node_no_top'} = {
       },
       'source_info' => {
         'file_name' => 'index_no_node_no_top.texi',
-        'line_nr' => 32,
-        'macro' => ''
+        'line_nr' => 32
       }
     },
     {
@@ -916,8 +895,7 @@ $result_trees{'index_no_node_no_top'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 41,
-            'macro' => ''
+            'line_nr' => 41
           },
           'type' => 'index_entry_command'
         },
@@ -956,8 +934,7 @@ $result_trees{'index_no_node_no_top'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 43,
-            'macro' => ''
+            'line_nr' => 43
           }
         },
         {
@@ -998,8 +975,7 @@ $result_trees{'index_no_node_no_top'} = {
               },
               'source_info' => {
                 'file_name' => 'index_no_node_no_top.texi',
-                'line_nr' => 45,
-                'macro' => ''
+                'line_nr' => 45
               },
               'type' => 'index_entry_command'
             }
@@ -1022,8 +998,7 @@ $result_trees{'index_no_node_no_top'} = {
       },
       'source_info' => {
         'file_name' => 'index_no_node_no_top.texi',
-        'line_nr' => 40,
-        'macro' => ''
+        'line_nr' => 40
       }
     },
     {
@@ -1075,8 +1050,7 @@ $result_trees{'index_no_node_no_top'} = {
       },
       'source_info' => {
         'file_name' => 'index_no_node_no_top.texi',
-        'line_nr' => 47,
-        'macro' => ''
+        'line_nr' => 47
       }
     },
     {
@@ -1261,7 +1235,6 @@ $result_errors{'index_no_node_no_top'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1270,7 +1243,6 @@ $result_errors{'index_no_node_no_top'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'printindex before document beginning: @printindex cp',
     'type' => 'warning'
   },
@@ -1279,7 +1251,6 @@ $result_errors{'index_no_node_no_top'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'unknown index `bidule\' in @printindex',
     'type' => 'error'
   }
@@ -1472,7 +1443,6 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 41,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1481,7 +1451,6 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 45,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1490,7 +1459,6 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 35,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1499,7 +1467,6 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 37,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1508,7 +1475,6 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 19,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1517,7 +1483,6 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 20,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1526,7 +1491,6 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 21,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1535,7 +1499,6 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 22,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1544,7 +1507,6 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 23,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1553,7 +1515,6 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 24,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1562,7 +1523,6 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 29,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1571,7 +1531,6 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1580,7 +1539,6 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1589,7 +1547,6 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 13,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   }
@@ -1734,7 +1691,6 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 41,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1743,7 +1699,6 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 45,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1752,7 +1707,6 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 35,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1761,7 +1715,6 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 37,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1770,7 +1723,6 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 19,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1779,7 +1731,6 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 20,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1788,7 +1739,6 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 21,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1797,7 +1747,6 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 22,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1806,7 +1755,6 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 23,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1815,7 +1763,6 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 24,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1824,7 +1771,6 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 29,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1833,7 +1779,6 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1842,7 +1787,6 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1851,7 +1795,6 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 13,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/indices/index_no_node_no_top_no_node.pl 
b/tp/t/results/indices/index_no_node_no_top_no_node.pl
index 2b4e1b45e4..2233afed8a 100644
--- a/tp/t/results/indices/index_no_node_no_top_no_node.pl
+++ b/tp/t/results/indices/index_no_node_no_top_no_node.pl
@@ -59,8 +59,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           },
           'type' => 'index_entry_command'
         },
@@ -103,8 +102,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -164,8 +162,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -205,8 +202,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           },
           'type' => 'index_entry_command'
         },
@@ -248,8 +244,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
               },
               'source_info' => {
                 'file_name' => 'index_no_node_no_top.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               },
               'type' => 'index_entry_command'
             }
@@ -291,8 +286,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         },
         {
@@ -309,8 +303,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'index_no_node_no_top.texi',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -369,8 +362,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           },
           'type' => 'index_entry_command'
         },
@@ -406,8 +398,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           },
           'type' => 'index_entry_command'
         },
@@ -443,8 +434,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 21,
-            'macro' => ''
+            'line_nr' => 21
           },
           'type' => 'index_entry_command'
         },
@@ -480,8 +470,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 22,
-            'macro' => ''
+            'line_nr' => 22
           },
           'type' => 'index_entry_command'
         },
@@ -517,8 +506,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           },
           'type' => 'index_entry_command'
         },
@@ -554,8 +542,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 24,
-            'macro' => ''
+            'line_nr' => 24
           },
           'type' => 'index_entry_command'
         },
@@ -603,8 +590,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 27,
-            'macro' => ''
+            'line_nr' => 27
           }
         },
         {
@@ -644,8 +630,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 29,
-            'macro' => ''
+            'line_nr' => 29
           },
           'type' => 'index_entry_command'
         },
@@ -668,8 +653,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'index_no_node_no_top.texi',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -726,8 +710,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 34,
-            'macro' => ''
+            'line_nr' => 34
           }
         },
         {
@@ -762,8 +745,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 35,
-            'macro' => ''
+            'line_nr' => 35
           },
           'type' => 'index_entry_command'
         },
@@ -805,8 +787,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
               },
               'source_info' => {
                 'file_name' => 'index_no_node_no_top.texi',
-                'line_nr' => 37,
-                'macro' => ''
+                'line_nr' => 37
               },
               'type' => 'index_entry_command'
             }
@@ -848,8 +829,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 39,
-            'macro' => ''
+            'line_nr' => 39
           }
         }
       ],
@@ -861,8 +841,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'index_no_node_no_top.texi',
-        'line_nr' => 32,
-        'macro' => ''
+        'line_nr' => 32
       }
     },
     {
@@ -916,8 +895,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 41,
-            'macro' => ''
+            'line_nr' => 41
           },
           'type' => 'index_entry_command'
         },
@@ -956,8 +934,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 43,
-            'macro' => ''
+            'line_nr' => 43
           }
         },
         {
@@ -998,8 +975,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
               },
               'source_info' => {
                 'file_name' => 'index_no_node_no_top.texi',
-                'line_nr' => 45,
-                'macro' => ''
+                'line_nr' => 45
               },
               'type' => 'index_entry_command'
             }
@@ -1022,8 +998,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'index_no_node_no_top.texi',
-        'line_nr' => 40,
-        'macro' => ''
+        'line_nr' => 40
       }
     },
     {
@@ -1075,8 +1050,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'index_no_node_no_top.texi',
-        'line_nr' => 47,
-        'macro' => ''
+        'line_nr' => 47
       }
     },
     {
@@ -1261,7 +1235,6 @@ $result_errors{'index_no_node_no_top_no_node'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1270,7 +1243,6 @@ $result_errors{'index_no_node_no_top_no_node'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'printindex before document beginning: @printindex cp',
     'type' => 'warning'
   },
@@ -1279,7 +1251,6 @@ $result_errors{'index_no_node_no_top_no_node'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'unknown index `bidule\' in @printindex',
     'type' => 'error'
   }
@@ -1472,7 +1443,6 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top_no_node'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 41,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1481,7 +1451,6 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top_no_node'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 45,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1490,7 +1459,6 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top_no_node'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 35,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1499,7 +1467,6 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top_no_node'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 37,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1508,7 +1475,6 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top_no_node'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 19,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1517,7 +1483,6 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top_no_node'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 20,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1526,7 +1491,6 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top_no_node'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 21,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1535,7 +1499,6 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top_no_node'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 22,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1544,7 +1507,6 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top_no_node'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 23,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1553,7 +1515,6 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top_no_node'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 24,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1562,7 +1523,6 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top_no_node'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 29,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1571,7 +1531,6 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top_no_node'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1580,7 +1539,6 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top_no_node'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1589,7 +1547,6 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top_no_node'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 13,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   }
@@ -1734,7 +1691,6 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top_no_node'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 41,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1743,7 +1699,6 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top_no_node'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 45,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1752,7 +1707,6 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top_no_node'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 35,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1761,7 +1715,6 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top_no_node'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 37,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1770,7 +1723,6 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top_no_node'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 19,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1779,7 +1731,6 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top_no_node'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 20,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1788,7 +1739,6 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top_no_node'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 21,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1797,7 +1747,6 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top_no_node'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 22,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1806,7 +1755,6 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top_no_node'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 23,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1815,7 +1763,6 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top_no_node'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 24,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1824,7 +1771,6 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top_no_node'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 29,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1833,7 +1779,6 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top_no_node'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1842,7 +1787,6 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top_no_node'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1851,7 +1795,6 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top_no_node'} = [
 ',
     'file_name' => 'index_no_node_no_top.texi',
     'line_nr' => 13,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/indices/index_nodes.pl 
b/tp/t/results/indices/index_nodes.pl
index 7b79b4344f..258d37fb2d 100644
--- a/tp/t/results/indices/index_nodes.pl
+++ b/tp/t/results/indices/index_nodes.pl
@@ -82,8 +82,7 @@ $result_trees{'index_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           },
           'type' => 'index_entry_command'
         },
@@ -122,8 +121,7 @@ $result_trees{'index_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -161,8 +159,7 @@ $result_trees{'index_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -214,8 +211,7 @@ $result_trees{'index_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           }
         },
         {
@@ -280,8 +276,7 @@ $result_trees{'index_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               },
               'type' => 'menu_entry'
             },
@@ -313,15 +308,13 @@ $result_trees{'index_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           }
         },
         {
@@ -342,8 +335,7 @@ $result_trees{'index_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_nodes.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -442,8 +434,7 @@ $result_trees{'index_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               },
               'type' => 'index_entry_command'
             },
@@ -480,8 +471,7 @@ $result_trees{'index_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               },
               'type' => 'index_entry_command'
             },
@@ -518,8 +508,7 @@ $result_trees{'index_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               },
               'type' => 'index_entry_command'
             },
@@ -556,8 +545,7 @@ $result_trees{'index_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               },
               'type' => 'index_entry_command'
             }
@@ -599,8 +587,7 @@ $result_trees{'index_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           }
         },
         {
@@ -665,8 +652,7 @@ $result_trees{'index_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               },
               'type' => 'menu_entry'
             },
@@ -698,15 +684,13 @@ $result_trees{'index_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 27,
-            'macro' => ''
+            'line_nr' => 27
           }
         },
         {
@@ -727,8 +711,7 @@ $result_trees{'index_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_nodes.texi',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -829,8 +812,7 @@ $result_trees{'index_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               },
               'type' => 'menu_entry'
             },
@@ -877,8 +859,7 @@ $result_trees{'index_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               },
               'type' => 'menu_entry'
             },
@@ -910,15 +891,13 @@ $result_trees{'index_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 32,
-            'macro' => ''
+            'line_nr' => 32
           }
         },
         {
@@ -956,8 +935,7 @@ $result_trees{'index_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 37,
-            'macro' => ''
+            'line_nr' => 37
           }
         },
         {
@@ -978,8 +956,7 @@ $result_trees{'index_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_nodes.texi',
-        'line_nr' => 31,
-        'macro' => ''
+        'line_nr' => 31
       }
     },
     {
@@ -1087,8 +1064,7 @@ $result_trees{'index_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 41,
-            'macro' => ''
+            'line_nr' => 41
           },
           'type' => 'index_entry_command'
         },
@@ -1125,8 +1101,7 @@ $result_trees{'index_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 42,
-            'macro' => ''
+            'line_nr' => 42
           },
           'type' => 'index_entry_command'
         },
@@ -1163,8 +1138,7 @@ $result_trees{'index_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 43,
-            'macro' => ''
+            'line_nr' => 43
           },
           'type' => 'index_entry_command'
         },
@@ -1185,8 +1159,7 @@ $result_trees{'index_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_nodes.texi',
-        'line_nr' => 39,
-        'macro' => ''
+        'line_nr' => 39
       }
     },
     {
@@ -1286,8 +1259,7 @@ $result_trees{'index_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 46,
-            'macro' => ''
+            'line_nr' => 46
           },
           'type' => 'index_entry_command'
         },
@@ -1326,8 +1298,7 @@ $result_trees{'index_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 48,
-            'macro' => ''
+            'line_nr' => 48
           }
         },
         {
@@ -1368,8 +1339,7 @@ $result_trees{'index_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 50,
-            'macro' => ''
+            'line_nr' => 50
           },
           'type' => 'index_entry_command'
         },
@@ -1406,8 +1376,7 @@ $result_trees{'index_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 51,
-            'macro' => ''
+            'line_nr' => 51
           },
           'type' => 'index_entry_command'
         },
@@ -1446,8 +1415,7 @@ $result_trees{'index_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 53,
-            'macro' => ''
+            'line_nr' => 53
           }
         },
         {
@@ -1468,8 +1436,7 @@ $result_trees{'index_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_nodes.texi',
-        'line_nr' => 45,
-        'macro' => ''
+        'line_nr' => 45
       }
     },
     {
diff --git a/tp/t/results/indices/index_nodes_no_split_no_use_nodes.pl 
b/tp/t/results/indices/index_nodes_no_split_no_use_nodes.pl
index b946c231a8..ce51734116 100644
--- a/tp/t/results/indices/index_nodes_no_split_no_use_nodes.pl
+++ b/tp/t/results/indices/index_nodes_no_split_no_use_nodes.pl
@@ -82,8 +82,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           },
           'type' => 'index_entry_command'
         },
@@ -122,8 +121,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -161,8 +159,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -214,8 +211,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           }
         },
         {
@@ -280,8 +276,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               },
               'type' => 'menu_entry'
             },
@@ -313,15 +308,13 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           }
         },
         {
@@ -342,8 +335,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_nodes.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -442,8 +434,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               },
               'type' => 'index_entry_command'
             },
@@ -480,8 +471,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               },
               'type' => 'index_entry_command'
             },
@@ -518,8 +508,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               },
               'type' => 'index_entry_command'
             },
@@ -556,8 +545,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               },
               'type' => 'index_entry_command'
             }
@@ -599,8 +587,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           }
         },
         {
@@ -665,8 +652,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               },
               'type' => 'menu_entry'
             },
@@ -698,15 +684,13 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 27,
-            'macro' => ''
+            'line_nr' => 27
           }
         },
         {
@@ -727,8 +711,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_nodes.texi',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -829,8 +812,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               },
               'type' => 'menu_entry'
             },
@@ -877,8 +859,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               },
               'type' => 'menu_entry'
             },
@@ -910,15 +891,13 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 32,
-            'macro' => ''
+            'line_nr' => 32
           }
         },
         {
@@ -956,8 +935,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 37,
-            'macro' => ''
+            'line_nr' => 37
           }
         },
         {
@@ -978,8 +956,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_nodes.texi',
-        'line_nr' => 31,
-        'macro' => ''
+        'line_nr' => 31
       }
     },
     {
@@ -1087,8 +1064,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 41,
-            'macro' => ''
+            'line_nr' => 41
           },
           'type' => 'index_entry_command'
         },
@@ -1125,8 +1101,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 42,
-            'macro' => ''
+            'line_nr' => 42
           },
           'type' => 'index_entry_command'
         },
@@ -1163,8 +1138,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 43,
-            'macro' => ''
+            'line_nr' => 43
           },
           'type' => 'index_entry_command'
         },
@@ -1185,8 +1159,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_nodes.texi',
-        'line_nr' => 39,
-        'macro' => ''
+        'line_nr' => 39
       }
     },
     {
@@ -1286,8 +1259,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 46,
-            'macro' => ''
+            'line_nr' => 46
           },
           'type' => 'index_entry_command'
         },
@@ -1326,8 +1298,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 48,
-            'macro' => ''
+            'line_nr' => 48
           }
         },
         {
@@ -1368,8 +1339,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 50,
-            'macro' => ''
+            'line_nr' => 50
           },
           'type' => 'index_entry_command'
         },
@@ -1406,8 +1376,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 51,
-            'macro' => ''
+            'line_nr' => 51
           },
           'type' => 'index_entry_command'
         },
@@ -1446,8 +1415,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 53,
-            'macro' => ''
+            'line_nr' => 53
           }
         },
         {
@@ -1468,8 +1436,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_nodes.texi',
-        'line_nr' => 45,
-        'macro' => ''
+        'line_nr' => 45
       }
     },
     {
@@ -1749,7 +1716,6 @@ 
$result_converted_errors{'file_html'}->{'index_nodes_no_split_no_use_nodes'} = [
 ',
     'file_name' => 'index_nodes.texi',
     'line_nr' => 21,
-    'macro' => '',
     'text' => 'entry for index `cp\' for @printindex cp outside of any 
section',
     'type' => 'warning'
   },
@@ -1758,7 +1724,6 @@ 
$result_converted_errors{'file_html'}->{'index_nodes_no_split_no_use_nodes'} = [
 ',
     'file_name' => 'index_nodes.texi',
     'line_nr' => 51,
-    'macro' => '',
     'text' => 'entry for index `cp\' for @printindex cp outside of any 
section',
     'type' => 'warning'
   },
@@ -1767,7 +1732,6 @@ 
$result_converted_errors{'file_html'}->{'index_nodes_no_split_no_use_nodes'} = [
 ',
     'file_name' => 'index_nodes.texi',
     'line_nr' => 43,
-    'macro' => '',
     'text' => 'entry for index `cp\' for @printindex cp outside of any 
section',
     'type' => 'warning'
   },
@@ -1776,7 +1740,6 @@ 
$result_converted_errors{'file_html'}->{'index_nodes_no_split_no_use_nodes'} = [
 ',
     'file_name' => 'index_nodes.texi',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'entry for index `cp\' for @printindex cp outside of any 
section',
     'type' => 'warning'
   },
@@ -1785,7 +1748,6 @@ 
$result_converted_errors{'file_html'}->{'index_nodes_no_split_no_use_nodes'} = [
 ',
     'file_name' => 'index_nodes.texi',
     'line_nr' => 46,
-    'macro' => '',
     'text' => 'entry for index `cp\' for @printindex cp outside of any 
section',
     'type' => 'warning'
   },
@@ -1794,7 +1756,6 @@ 
$result_converted_errors{'file_html'}->{'index_nodes_no_split_no_use_nodes'} = [
 ',
     'file_name' => 'index_nodes.texi',
     'line_nr' => 20,
-    'macro' => '',
     'text' => 'entry for index `cp\' for @printindex cp outside of any 
section',
     'type' => 'warning'
   },
@@ -1803,7 +1764,6 @@ 
$result_converted_errors{'file_html'}->{'index_nodes_no_split_no_use_nodes'} = [
 ',
     'file_name' => 'index_nodes.texi',
     'line_nr' => 23,
-    'macro' => '',
     'text' => 'entry for index `cp\' for @printindex cp outside of any 
section',
     'type' => 'warning'
   },
@@ -1812,7 +1772,6 @@ 
$result_converted_errors{'file_html'}->{'index_nodes_no_split_no_use_nodes'} = [
 ',
     'file_name' => 'index_nodes.texi',
     'line_nr' => 41,
-    'macro' => '',
     'text' => 'entry for index `cp\' for @printindex cp outside of any 
section',
     'type' => 'warning'
   },
@@ -1821,7 +1780,6 @@ 
$result_converted_errors{'file_html'}->{'index_nodes_no_split_no_use_nodes'} = [
 ',
     'file_name' => 'index_nodes.texi',
     'line_nr' => 50,
-    'macro' => '',
     'text' => 'entry for index `fn\' for @printindex fn outside of any 
section',
     'type' => 'warning'
   },
@@ -1830,7 +1788,6 @@ 
$result_converted_errors{'file_html'}->{'index_nodes_no_split_no_use_nodes'} = [
 ',
     'file_name' => 'index_nodes.texi',
     'line_nr' => 22,
-    'macro' => '',
     'text' => 'entry for index `fn\' for @printindex fn outside of any 
section',
     'type' => 'warning'
   },
@@ -1839,7 +1796,6 @@ 
$result_converted_errors{'file_html'}->{'index_nodes_no_split_no_use_nodes'} = [
 ',
     'file_name' => 'index_nodes.texi',
     'line_nr' => 42,
-    'macro' => '',
     'text' => 'entry for index `fn\' for @printindex fn outside of any 
section',
     'type' => 'warning'
   }
diff --git a/tp/t/results/indices/index_special_region.pl 
b/tp/t/results/indices/index_special_region.pl
index 135c178670..3719ef81f4 100644
--- a/tp/t/results/indices/index_special_region.pl
+++ b/tp/t/results/indices/index_special_region.pl
@@ -78,8 +78,7 @@ $result_trees{'index_special_region'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   },
                   'type' => 'index_entry_command'
                 },
@@ -104,8 +103,7 @@ $result_trees{'index_special_region'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   }
                 },
                 {
@@ -152,8 +150,7 @@ $result_trees{'index_special_region'} = {
                               },
                               'source_info' => {
                                 'file_name' => 'index_special_region.texi',
-                                'line_nr' => 9,
-                                'macro' => ''
+                                'line_nr' => 9
                               }
                             },
                             {
@@ -211,8 +208,7 @@ $result_trees{'index_special_region'} = {
                               },
                               'source_info' => {
                                 'file_name' => 'index_special_region.texi',
-                                'line_nr' => 12,
-                                'macro' => ''
+                                'line_nr' => 12
                               },
                               'type' => 'index_entry_command'
                             }
@@ -223,8 +219,7 @@ $result_trees{'index_special_region'} = {
                       'cmdname' => 'footnote',
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -269,8 +264,7 @@ $result_trees{'index_special_region'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 15,
-                    'macro' => ''
+                    'line_nr' => 15
                   }
                 },
                 {
@@ -306,15 +300,13 @@ $result_trees{'index_special_region'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 17,
-                    'macro' => ''
+                    'line_nr' => 17
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -374,8 +366,7 @@ $result_trees{'index_special_region'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 21,
-                    'macro' => ''
+                    'line_nr' => 21
                   },
                   'type' => 'index_entry_command'
                 },
@@ -400,8 +391,7 @@ $result_trees{'index_special_region'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 22,
-                    'macro' => ''
+                    'line_nr' => 22
                   }
                 },
                 {
@@ -444,8 +434,7 @@ $result_trees{'index_special_region'} = {
                               },
                               'source_info' => {
                                 'file_name' => 'index_special_region.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             },
                             {
@@ -500,8 +489,7 @@ $result_trees{'index_special_region'} = {
                               },
                               'source_info' => {
                                 'file_name' => 'index_special_region.texi',
-                                'line_nr' => 27,
-                                'macro' => ''
+                                'line_nr' => 27
                               },
                               'type' => 'index_entry_command'
                             }
@@ -512,8 +500,7 @@ $result_trees{'index_special_region'} = {
                       'cmdname' => 'footnote',
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -539,8 +526,7 @@ $result_trees{'index_special_region'} = {
                   'cmdname' => 'insertcopying',
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 30,
-                    'macro' => ''
+                    'line_nr' => 30
                   }
                 },
                 {
@@ -571,15 +557,13 @@ $result_trees{'index_special_region'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 31,
-                    'macro' => ''
+                    'line_nr' => 31
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -622,8 +606,7 @@ $result_trees{'index_special_region'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 33,
-        'macro' => ''
+        'line_nr' => 33
       }
     },
     {
@@ -652,8 +635,7 @@ $result_trees{'index_special_region'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 34,
-        'macro' => ''
+        'line_nr' => 34
       }
     },
     {
@@ -700,8 +682,7 @@ $result_trees{'index_special_region'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 37,
-            'macro' => ''
+            'line_nr' => 37
           }
         },
         {
@@ -772,8 +753,7 @@ $result_trees{'index_special_region'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 42,
-            'macro' => ''
+            'line_nr' => 42
           },
           'type' => 'index_entry_command'
         },
@@ -800,8 +780,7 @@ $result_trees{'index_special_region'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 44,
-            'macro' => ''
+            'line_nr' => 44
           },
           'type' => 'index_entry_command'
         },
@@ -823,8 +802,7 @@ $result_trees{'index_special_region'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 45,
-                        'macro' => ''
+                        'line_nr' => 45
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -846,8 +824,7 @@ $result_trees{'index_special_region'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 45,
-                        'macro' => ''
+                        'line_nr' => 45
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -867,8 +844,7 @@ $result_trees{'index_special_region'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 45,
-                'macro' => ''
+                'line_nr' => 45
               },
               'type' => 'def_line'
             },
@@ -887,8 +863,7 @@ $result_trees{'index_special_region'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 46,
-                        'macro' => ''
+                        'line_nr' => 46
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -909,8 +884,7 @@ $result_trees{'index_special_region'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               },
               'type' => 'def_line'
             },
@@ -924,8 +898,7 @@ $result_trees{'index_special_region'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 47,
-                        'macro' => ''
+                        'line_nr' => 47
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -942,8 +915,7 @@ $result_trees{'index_special_region'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 47,
-                        'macro' => ''
+                        'line_nr' => 47
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -964,8 +936,7 @@ $result_trees{'index_special_region'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               },
               'type' => 'def_line'
             },
@@ -997,15 +968,13 @@ $result_trees{'index_special_region'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 45,
-            'macro' => ''
+            'line_nr' => 45
           }
         },
         {
@@ -1050,8 +1019,7 @@ $result_trees{'index_special_region'} = {
                       'cmdname' => 'item',
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 51,
-                        'macro' => ''
+                        'line_nr' => 51
                       }
                     }
                   ],
@@ -1096,8 +1064,7 @@ $result_trees{'index_special_region'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 52,
-                        'macro' => ''
+                        'line_nr' => 52
                       }
                     }
                   ],
@@ -1134,8 +1101,7 @@ $result_trees{'index_special_region'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               }
             }
           ],
@@ -1144,8 +1110,7 @@ $result_trees{'index_special_region'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 50,
-            'macro' => ''
+            'line_nr' => 50
           }
         },
         {
@@ -1210,8 +1175,7 @@ $result_trees{'index_special_region'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               },
               'type' => 'menu_entry'
             },
@@ -1243,15 +1207,13 @@ $result_trees{'index_special_region'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 57,
-                'macro' => ''
+                'line_nr' => 57
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 55,
-            'macro' => ''
+            'line_nr' => 55
           }
         },
         {
@@ -1270,8 +1232,7 @@ $result_trees{'index_special_region'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 35,
-        'macro' => ''
+        'line_nr' => 35
       }
     },
     {
@@ -1304,8 +1265,7 @@ $result_trees{'index_special_region'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 59,
-        'macro' => ''
+        'line_nr' => 59
       }
     },
     {
@@ -1379,8 +1339,7 @@ $result_trees{'index_special_region'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 64,
-            'macro' => ''
+            'line_nr' => 64
           },
           'type' => 'index_entry_command'
         },
@@ -1422,8 +1381,7 @@ $result_trees{'index_special_region'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 66,
-            'macro' => ''
+            'line_nr' => 66
           },
           'type' => 'index_entry_command'
         },
@@ -1456,8 +1414,7 @@ $result_trees{'index_special_region'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 68,
-                'macro' => ''
+                'line_nr' => 68
               }
             },
             {
@@ -1486,8 +1443,7 @@ $result_trees{'index_special_region'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 69,
-                'macro' => ''
+                'line_nr' => 69
               }
             },
             {
@@ -1526,8 +1482,7 @@ $result_trees{'index_special_region'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             },
             {
@@ -1556,8 +1511,7 @@ $result_trees{'index_special_region'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 72,
-                'macro' => ''
+                'line_nr' => 72
               }
             },
             {
@@ -1583,8 +1537,7 @@ $result_trees{'index_special_region'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 74,
-            'macro' => ''
+            'line_nr' => 74
           }
         },
         {
@@ -1622,8 +1575,7 @@ $result_trees{'index_special_region'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 76,
-            'macro' => ''
+            'line_nr' => 76
           }
         },
         {
@@ -1656,8 +1608,7 @@ $result_trees{'index_special_region'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 77,
-            'macro' => ''
+            'line_nr' => 77
           }
         },
         {
@@ -1676,8 +1627,7 @@ $result_trees{'index_special_region'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 79,
-            'macro' => ''
+            'line_nr' => 79
           }
         }
       ],
@@ -1691,8 +1641,7 @@ $result_trees{'index_special_region'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 60,
-        'macro' => ''
+        'line_nr' => 60
       }
     },
     {
@@ -1970,7 +1919,6 @@ $result_errors{'index_special_region'} = [
 ',
     'file_name' => 'index_special_region.texi',
     'line_nr' => 44,
-    'macro' => '',
     'text' => '@cindex missing argument',
     'type' => 'warning'
   },
@@ -1979,7 +1927,6 @@ $result_errors{'index_special_region'} = [
 ',
     'file_name' => 'index_special_region.texi',
     'line_nr' => 45,
-    'macro' => '',
     'text' => 'missing name for @deffn',
     'type' => 'warning'
   },
@@ -1988,7 +1935,6 @@ $result_errors{'index_special_region'} = [
 ',
     'file_name' => 'index_special_region.texi',
     'line_nr' => 46,
-    'macro' => '',
     'text' => 'missing name for @deffnx',
     'type' => 'warning'
   },
@@ -1997,7 +1943,6 @@ $result_errors{'index_special_region'} = [
 ',
     'file_name' => 'index_special_region.texi',
     'line_nr' => 47,
-    'macro' => '',
     'text' => 'missing name for @deffnx',
     'type' => 'warning'
   },
@@ -2006,7 +1951,6 @@ $result_errors{'index_special_region'} = [
 ',
     'file_name' => 'index_special_region.texi',
     'line_nr' => 50,
-    'macro' => '',
     'text' => 'missing @ftable argument',
     'type' => 'error'
   },
@@ -2015,7 +1959,6 @@ $result_errors{'index_special_region'} = [
 ',
     'file_name' => 'index_special_region.texi',
     'line_nr' => 51,
-    'macro' => '',
     'text' => '@item missing argument',
     'type' => 'warning'
   }
@@ -2047,7 +1990,6 @@ 
$result_converted_errors{'file_info'}->{'index_special_region'} = [
 ',
     'file_name' => 'index_special_region.texi',
     'line_nr' => 6,
-    'macro' => '',
     'text' => '@anchor output more than once: Copying information',
     'type' => 'error'
   },
@@ -2056,7 +1998,6 @@ 
$result_converted_errors{'file_info'}->{'index_special_region'} = [
 ',
     'file_name' => 'index_special_region.texi',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@anchor output more than once: Public domain reference',
     'type' => 'error'
   }
diff --git a/tp/t/results/indices/index_special_region_no_insertcopying.pl 
b/tp/t/results/indices/index_special_region_no_insertcopying.pl
index 92a4e7d150..29c3e3bd6e 100644
--- a/tp/t/results/indices/index_special_region_no_insertcopying.pl
+++ b/tp/t/results/indices/index_special_region_no_insertcopying.pl
@@ -78,8 +78,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                   },
                   'source_info' => {
                     'file_name' => 
'index_special_region_no_insertcopying.texi',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   },
                   'type' => 'index_entry_command'
                 },
@@ -104,8 +103,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                   },
                   'source_info' => {
                     'file_name' => 
'index_special_region_no_insertcopying.texi',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   }
                 },
                 {
@@ -152,8 +150,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                               },
                               'source_info' => {
                                 'file_name' => 
'index_special_region_no_insertcopying.texi',
-                                'line_nr' => 9,
-                                'macro' => ''
+                                'line_nr' => 9
                               }
                             },
                             {
@@ -211,8 +208,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                               },
                               'source_info' => {
                                 'file_name' => 
'index_special_region_no_insertcopying.texi',
-                                'line_nr' => 12,
-                                'macro' => ''
+                                'line_nr' => 12
                               },
                               'type' => 'index_entry_command'
                             }
@@ -223,8 +219,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                       'cmdname' => 'footnote',
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -269,8 +264,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                   },
                   'source_info' => {
                     'file_name' => 
'index_special_region_no_insertcopying.texi',
-                    'line_nr' => 15,
-                    'macro' => ''
+                    'line_nr' => 15
                   }
                 },
                 {
@@ -306,15 +300,13 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                   },
                   'source_info' => {
                     'file_name' => 
'index_special_region_no_insertcopying.texi',
-                    'line_nr' => 17,
-                    'macro' => ''
+                    'line_nr' => 17
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -374,8 +366,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                   },
                   'source_info' => {
                     'file_name' => 
'index_special_region_no_insertcopying.texi',
-                    'line_nr' => 21,
-                    'macro' => ''
+                    'line_nr' => 21
                   },
                   'type' => 'index_entry_command'
                 },
@@ -400,8 +391,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                   },
                   'source_info' => {
                     'file_name' => 
'index_special_region_no_insertcopying.texi',
-                    'line_nr' => 22,
-                    'macro' => ''
+                    'line_nr' => 22
                   }
                 },
                 {
@@ -444,8 +434,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                               },
                               'source_info' => {
                                 'file_name' => 
'index_special_region_no_insertcopying.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             },
                             {
@@ -500,8 +489,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                               },
                               'source_info' => {
                                 'file_name' => 
'index_special_region_no_insertcopying.texi',
-                                'line_nr' => 27,
-                                'macro' => ''
+                                'line_nr' => 27
                               },
                               'type' => 'index_entry_command'
                             }
@@ -512,8 +500,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                       'cmdname' => 'footnote',
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -539,8 +526,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                   'cmdname' => 'insertcopying',
                   'source_info' => {
                     'file_name' => 
'index_special_region_no_insertcopying.texi',
-                    'line_nr' => 30,
-                    'macro' => ''
+                    'line_nr' => 30
                   }
                 },
                 {
@@ -571,15 +557,13 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                   },
                   'source_info' => {
                     'file_name' => 
'index_special_region_no_insertcopying.texi',
-                    'line_nr' => 31,
-                    'macro' => ''
+                    'line_nr' => 31
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -622,8 +606,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region_no_insertcopying.texi',
-        'line_nr' => 33,
-        'macro' => ''
+        'line_nr' => 33
       }
     },
     {
@@ -652,8 +635,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region_no_insertcopying.texi',
-        'line_nr' => 34,
-        'macro' => ''
+        'line_nr' => 34
       }
     },
     {
@@ -767,8 +749,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 42,
-            'macro' => ''
+            'line_nr' => 42
           },
           'type' => 'index_entry_command'
         },
@@ -795,8 +776,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 44,
-            'macro' => ''
+            'line_nr' => 44
           },
           'type' => 'index_entry_command'
         },
@@ -818,8 +798,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                       },
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
-                        'line_nr' => 45,
-                        'macro' => ''
+                        'line_nr' => 45
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -841,8 +820,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                       },
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
-                        'line_nr' => 45,
-                        'macro' => ''
+                        'line_nr' => 45
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -862,8 +840,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 45,
-                'macro' => ''
+                'line_nr' => 45
               },
               'type' => 'def_line'
             },
@@ -882,8 +859,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                       },
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
-                        'line_nr' => 46,
-                        'macro' => ''
+                        'line_nr' => 46
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -904,8 +880,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               },
               'type' => 'def_line'
             },
@@ -919,8 +894,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                       },
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
-                        'line_nr' => 47,
-                        'macro' => ''
+                        'line_nr' => 47
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -937,8 +911,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                       },
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
-                        'line_nr' => 47,
-                        'macro' => ''
+                        'line_nr' => 47
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -959,8 +932,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               },
               'type' => 'def_line'
             },
@@ -992,15 +964,13 @@ $result_trees{'index_special_region_no_insertcopying'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 45,
-            'macro' => ''
+            'line_nr' => 45
           }
         },
         {
@@ -1045,8 +1015,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                       'cmdname' => 'item',
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
-                        'line_nr' => 51,
-                        'macro' => ''
+                        'line_nr' => 51
                       }
                     }
                   ],
@@ -1091,8 +1060,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                       },
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
-                        'line_nr' => 52,
-                        'macro' => ''
+                        'line_nr' => 52
                       }
                     }
                   ],
@@ -1129,8 +1097,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               }
             }
           ],
@@ -1139,8 +1106,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 50,
-            'macro' => ''
+            'line_nr' => 50
           }
         },
         {
@@ -1205,8 +1171,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               },
               'type' => 'menu_entry'
             },
@@ -1238,15 +1203,13 @@ $result_trees{'index_special_region_no_insertcopying'} 
= {
               },
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 57,
-                'macro' => ''
+                'line_nr' => 57
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 55,
-            'macro' => ''
+            'line_nr' => 55
           }
         },
         {
@@ -1265,8 +1228,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region_no_insertcopying.texi',
-        'line_nr' => 35,
-        'macro' => ''
+        'line_nr' => 35
       }
     },
     {
@@ -1299,8 +1261,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region_no_insertcopying.texi',
-        'line_nr' => 59,
-        'macro' => ''
+        'line_nr' => 59
       }
     },
     {
@@ -1374,8 +1335,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 64,
-            'macro' => ''
+            'line_nr' => 64
           },
           'type' => 'index_entry_command'
         },
@@ -1417,8 +1377,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 66,
-            'macro' => ''
+            'line_nr' => 66
           },
           'type' => 'index_entry_command'
         },
@@ -1451,8 +1410,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 68,
-                'macro' => ''
+                'line_nr' => 68
               }
             },
             {
@@ -1481,8 +1439,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 69,
-                'macro' => ''
+                'line_nr' => 69
               }
             },
             {
@@ -1521,8 +1478,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             },
             {
@@ -1551,8 +1507,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 72,
-                'macro' => ''
+                'line_nr' => 72
               }
             },
             {
@@ -1612,8 +1567,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 76,
-            'macro' => ''
+            'line_nr' => 76
           }
         },
         {
@@ -1646,8 +1600,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 77,
-            'macro' => ''
+            'line_nr' => 77
           }
         },
         {
@@ -1666,8 +1619,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 79,
-            'macro' => ''
+            'line_nr' => 79
           }
         }
       ],
@@ -1681,8 +1633,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region_no_insertcopying.texi',
-        'line_nr' => 60,
-        'macro' => ''
+        'line_nr' => 60
       }
     },
     {
@@ -1960,7 +1911,6 @@ $result_errors{'index_special_region_no_insertcopying'} = 
[
 ',
     'file_name' => 'index_special_region_no_insertcopying.texi',
     'line_nr' => 44,
-    'macro' => '',
     'text' => '@cindex missing argument',
     'type' => 'warning'
   },
@@ -1969,7 +1919,6 @@ $result_errors{'index_special_region_no_insertcopying'} = 
[
 ',
     'file_name' => 'index_special_region_no_insertcopying.texi',
     'line_nr' => 45,
-    'macro' => '',
     'text' => 'missing name for @deffn',
     'type' => 'warning'
   },
@@ -1978,7 +1927,6 @@ $result_errors{'index_special_region_no_insertcopying'} = 
[
 ',
     'file_name' => 'index_special_region_no_insertcopying.texi',
     'line_nr' => 46,
-    'macro' => '',
     'text' => 'missing name for @deffnx',
     'type' => 'warning'
   },
@@ -1987,7 +1935,6 @@ $result_errors{'index_special_region_no_insertcopying'} = 
[
 ',
     'file_name' => 'index_special_region_no_insertcopying.texi',
     'line_nr' => 47,
-    'macro' => '',
     'text' => 'missing name for @deffnx',
     'type' => 'warning'
   },
@@ -1996,7 +1943,6 @@ $result_errors{'index_special_region_no_insertcopying'} = 
[
 ',
     'file_name' => 'index_special_region_no_insertcopying.texi',
     'line_nr' => 50,
-    'macro' => '',
     'text' => 'missing @ftable argument',
     'type' => 'error'
   },
@@ -2005,7 +1951,6 @@ $result_errors{'index_special_region_no_insertcopying'} = 
[
 ',
     'file_name' => 'index_special_region_no_insertcopying.texi',
     'line_nr' => 51,
-    'macro' => '',
     'text' => '@item missing argument',
     'type' => 'warning'
   }
diff --git 
a/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes.pl
 
b/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes.pl
index f27ed9d79b..6f682da5c5 100644
--- 
a/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes.pl
+++ 
b/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes.pl
@@ -78,8 +78,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                   },
                   'source_info' => {
                     'file_name' => 
'index_special_region_no_insertcopying.texi',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   },
                   'type' => 'index_entry_command'
                 },
@@ -104,8 +103,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                   },
                   'source_info' => {
                     'file_name' => 
'index_special_region_no_insertcopying.texi',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   }
                 },
                 {
@@ -152,8 +150,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                               },
                               'source_info' => {
                                 'file_name' => 
'index_special_region_no_insertcopying.texi',
-                                'line_nr' => 9,
-                                'macro' => ''
+                                'line_nr' => 9
                               }
                             },
                             {
@@ -211,8 +208,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                               },
                               'source_info' => {
                                 'file_name' => 
'index_special_region_no_insertcopying.texi',
-                                'line_nr' => 12,
-                                'macro' => ''
+                                'line_nr' => 12
                               },
                               'type' => 'index_entry_command'
                             }
@@ -223,8 +219,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                       'cmdname' => 'footnote',
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -269,8 +264,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                   },
                   'source_info' => {
                     'file_name' => 
'index_special_region_no_insertcopying.texi',
-                    'line_nr' => 15,
-                    'macro' => ''
+                    'line_nr' => 15
                   }
                 },
                 {
@@ -306,15 +300,13 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                   },
                   'source_info' => {
                     'file_name' => 
'index_special_region_no_insertcopying.texi',
-                    'line_nr' => 17,
-                    'macro' => ''
+                    'line_nr' => 17
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -374,8 +366,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                   },
                   'source_info' => {
                     'file_name' => 
'index_special_region_no_insertcopying.texi',
-                    'line_nr' => 21,
-                    'macro' => ''
+                    'line_nr' => 21
                   },
                   'type' => 'index_entry_command'
                 },
@@ -400,8 +391,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                   },
                   'source_info' => {
                     'file_name' => 
'index_special_region_no_insertcopying.texi',
-                    'line_nr' => 22,
-                    'macro' => ''
+                    'line_nr' => 22
                   }
                 },
                 {
@@ -444,8 +434,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                               },
                               'source_info' => {
                                 'file_name' => 
'index_special_region_no_insertcopying.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             },
                             {
@@ -500,8 +489,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                               },
                               'source_info' => {
                                 'file_name' => 
'index_special_region_no_insertcopying.texi',
-                                'line_nr' => 27,
-                                'macro' => ''
+                                'line_nr' => 27
                               },
                               'type' => 'index_entry_command'
                             }
@@ -512,8 +500,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                       'cmdname' => 'footnote',
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -539,8 +526,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                   'cmdname' => 'insertcopying',
                   'source_info' => {
                     'file_name' => 
'index_special_region_no_insertcopying.texi',
-                    'line_nr' => 30,
-                    'macro' => ''
+                    'line_nr' => 30
                   }
                 },
                 {
@@ -571,15 +557,13 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                   },
                   'source_info' => {
                     'file_name' => 
'index_special_region_no_insertcopying.texi',
-                    'line_nr' => 31,
-                    'macro' => ''
+                    'line_nr' => 31
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -622,8 +606,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region_no_insertcopying.texi',
-        'line_nr' => 33,
-        'macro' => ''
+        'line_nr' => 33
       }
     },
     {
@@ -652,8 +635,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region_no_insertcopying.texi',
-        'line_nr' => 34,
-        'macro' => ''
+        'line_nr' => 34
       }
     },
     {
@@ -767,8 +749,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 42,
-            'macro' => ''
+            'line_nr' => 42
           },
           'type' => 'index_entry_command'
         },
@@ -795,8 +776,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 44,
-            'macro' => ''
+            'line_nr' => 44
           },
           'type' => 'index_entry_command'
         },
@@ -818,8 +798,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                       },
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
-                        'line_nr' => 45,
-                        'macro' => ''
+                        'line_nr' => 45
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -841,8 +820,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                       },
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
-                        'line_nr' => 45,
-                        'macro' => ''
+                        'line_nr' => 45
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -862,8 +840,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 45,
-                'macro' => ''
+                'line_nr' => 45
               },
               'type' => 'def_line'
             },
@@ -882,8 +859,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                       },
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
-                        'line_nr' => 46,
-                        'macro' => ''
+                        'line_nr' => 46
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -904,8 +880,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               },
               'type' => 'def_line'
             },
@@ -919,8 +894,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                       },
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
-                        'line_nr' => 47,
-                        'macro' => ''
+                        'line_nr' => 47
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -937,8 +911,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                       },
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
-                        'line_nr' => 47,
-                        'macro' => ''
+                        'line_nr' => 47
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -959,8 +932,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               },
               'type' => 'def_line'
             },
@@ -992,15 +964,13 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 45,
-            'macro' => ''
+            'line_nr' => 45
           }
         },
         {
@@ -1045,8 +1015,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                       'cmdname' => 'item',
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
-                        'line_nr' => 51,
-                        'macro' => ''
+                        'line_nr' => 51
                       }
                     }
                   ],
@@ -1091,8 +1060,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                       },
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
-                        'line_nr' => 52,
-                        'macro' => ''
+                        'line_nr' => 52
                       }
                     }
                   ],
@@ -1129,8 +1097,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               }
             }
           ],
@@ -1139,8 +1106,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 50,
-            'macro' => ''
+            'line_nr' => 50
           }
         },
         {
@@ -1205,8 +1171,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               },
               'type' => 'menu_entry'
             },
@@ -1238,15 +1203,13 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 57,
-                'macro' => ''
+                'line_nr' => 57
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 55,
-            'macro' => ''
+            'line_nr' => 55
           }
         },
         {
@@ -1265,8 +1228,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region_no_insertcopying.texi',
-        'line_nr' => 35,
-        'macro' => ''
+        'line_nr' => 35
       }
     },
     {
@@ -1299,8 +1261,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region_no_insertcopying.texi',
-        'line_nr' => 59,
-        'macro' => ''
+        'line_nr' => 59
       }
     },
     {
@@ -1374,8 +1335,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 64,
-            'macro' => ''
+            'line_nr' => 64
           },
           'type' => 'index_entry_command'
         },
@@ -1417,8 +1377,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 66,
-            'macro' => ''
+            'line_nr' => 66
           },
           'type' => 'index_entry_command'
         },
@@ -1451,8 +1410,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 68,
-                'macro' => ''
+                'line_nr' => 68
               }
             },
             {
@@ -1481,8 +1439,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 69,
-                'macro' => ''
+                'line_nr' => 69
               }
             },
             {
@@ -1521,8 +1478,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             },
             {
@@ -1551,8 +1507,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 72,
-                'macro' => ''
+                'line_nr' => 72
               }
             },
             {
@@ -1612,8 +1567,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 76,
-            'macro' => ''
+            'line_nr' => 76
           }
         },
         {
@@ -1646,8 +1600,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 77,
-            'macro' => ''
+            'line_nr' => 77
           }
         },
         {
@@ -1666,8 +1619,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 79,
-            'macro' => ''
+            'line_nr' => 79
           }
         }
       ],
@@ -1681,8 +1633,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region_no_insertcopying.texi',
-        'line_nr' => 60,
-        'macro' => ''
+        'line_nr' => 60
       }
     },
     {
@@ -1960,7 +1911,6 @@ 
$result_errors{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} =
 ',
     'file_name' => 'index_special_region_no_insertcopying.texi',
     'line_nr' => 44,
-    'macro' => '',
     'text' => '@cindex missing argument',
     'type' => 'warning'
   },
@@ -1969,7 +1919,6 @@ 
$result_errors{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} =
 ',
     'file_name' => 'index_special_region_no_insertcopying.texi',
     'line_nr' => 45,
-    'macro' => '',
     'text' => 'missing name for @deffn',
     'type' => 'warning'
   },
@@ -1978,7 +1927,6 @@ 
$result_errors{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} =
 ',
     'file_name' => 'index_special_region_no_insertcopying.texi',
     'line_nr' => 46,
-    'macro' => '',
     'text' => 'missing name for @deffnx',
     'type' => 'warning'
   },
@@ -1987,7 +1935,6 @@ 
$result_errors{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} =
 ',
     'file_name' => 'index_special_region_no_insertcopying.texi',
     'line_nr' => 47,
-    'macro' => '',
     'text' => 'missing name for @deffnx',
     'type' => 'warning'
   },
@@ -1996,7 +1943,6 @@ 
$result_errors{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} =
 ',
     'file_name' => 'index_special_region_no_insertcopying.texi',
     'line_nr' => 50,
-    'macro' => '',
     'text' => 'missing @ftable argument',
     'type' => 'error'
   },
@@ -2005,7 +1951,6 @@ 
$result_errors{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} =
 ',
     'file_name' => 'index_special_region_no_insertcopying.texi',
     'line_nr' => 51,
-    'macro' => '',
     'text' => '@item missing argument',
     'type' => 'warning'
   }
diff --git 
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes.pl
 
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes.pl
index af9b8dcc49..724c96967a 100644
--- 
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes.pl
+++ 
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes.pl
@@ -78,8 +78,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                   },
                   'source_info' => {
                     'file_name' => 
'index_special_region_no_insertcopying.texi',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   },
                   'type' => 'index_entry_command'
                 },
@@ -104,8 +103,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                   },
                   'source_info' => {
                     'file_name' => 
'index_special_region_no_insertcopying.texi',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   }
                 },
                 {
@@ -152,8 +150,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                               },
                               'source_info' => {
                                 'file_name' => 
'index_special_region_no_insertcopying.texi',
-                                'line_nr' => 9,
-                                'macro' => ''
+                                'line_nr' => 9
                               }
                             },
                             {
@@ -211,8 +208,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                               },
                               'source_info' => {
                                 'file_name' => 
'index_special_region_no_insertcopying.texi',
-                                'line_nr' => 12,
-                                'macro' => ''
+                                'line_nr' => 12
                               },
                               'type' => 'index_entry_command'
                             }
@@ -223,8 +219,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                       'cmdname' => 'footnote',
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -269,8 +264,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                   },
                   'source_info' => {
                     'file_name' => 
'index_special_region_no_insertcopying.texi',
-                    'line_nr' => 15,
-                    'macro' => ''
+                    'line_nr' => 15
                   }
                 },
                 {
@@ -306,15 +300,13 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                   },
                   'source_info' => {
                     'file_name' => 
'index_special_region_no_insertcopying.texi',
-                    'line_nr' => 17,
-                    'macro' => ''
+                    'line_nr' => 17
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -374,8 +366,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                   },
                   'source_info' => {
                     'file_name' => 
'index_special_region_no_insertcopying.texi',
-                    'line_nr' => 21,
-                    'macro' => ''
+                    'line_nr' => 21
                   },
                   'type' => 'index_entry_command'
                 },
@@ -400,8 +391,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                   },
                   'source_info' => {
                     'file_name' => 
'index_special_region_no_insertcopying.texi',
-                    'line_nr' => 22,
-                    'macro' => ''
+                    'line_nr' => 22
                   }
                 },
                 {
@@ -444,8 +434,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                               },
                               'source_info' => {
                                 'file_name' => 
'index_special_region_no_insertcopying.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             },
                             {
@@ -500,8 +489,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                               },
                               'source_info' => {
                                 'file_name' => 
'index_special_region_no_insertcopying.texi',
-                                'line_nr' => 27,
-                                'macro' => ''
+                                'line_nr' => 27
                               },
                               'type' => 'index_entry_command'
                             }
@@ -512,8 +500,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                       'cmdname' => 'footnote',
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -539,8 +526,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                   'cmdname' => 'insertcopying',
                   'source_info' => {
                     'file_name' => 
'index_special_region_no_insertcopying.texi',
-                    'line_nr' => 30,
-                    'macro' => ''
+                    'line_nr' => 30
                   }
                 },
                 {
@@ -571,15 +557,13 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                   },
                   'source_info' => {
                     'file_name' => 
'index_special_region_no_insertcopying.texi',
-                    'line_nr' => 31,
-                    'macro' => ''
+                    'line_nr' => 31
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -622,8 +606,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region_no_insertcopying.texi',
-        'line_nr' => 33,
-        'macro' => ''
+        'line_nr' => 33
       }
     },
     {
@@ -652,8 +635,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region_no_insertcopying.texi',
-        'line_nr' => 34,
-        'macro' => ''
+        'line_nr' => 34
       }
     },
     {
@@ -767,8 +749,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 42,
-            'macro' => ''
+            'line_nr' => 42
           },
           'type' => 'index_entry_command'
         },
@@ -795,8 +776,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 44,
-            'macro' => ''
+            'line_nr' => 44
           },
           'type' => 'index_entry_command'
         },
@@ -818,8 +798,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                       },
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
-                        'line_nr' => 45,
-                        'macro' => ''
+                        'line_nr' => 45
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -841,8 +820,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                       },
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
-                        'line_nr' => 45,
-                        'macro' => ''
+                        'line_nr' => 45
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -862,8 +840,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 45,
-                'macro' => ''
+                'line_nr' => 45
               },
               'type' => 'def_line'
             },
@@ -882,8 +859,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                       },
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
-                        'line_nr' => 46,
-                        'macro' => ''
+                        'line_nr' => 46
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -904,8 +880,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               },
               'type' => 'def_line'
             },
@@ -919,8 +894,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                       },
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
-                        'line_nr' => 47,
-                        'macro' => ''
+                        'line_nr' => 47
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -937,8 +911,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                       },
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
-                        'line_nr' => 47,
-                        'macro' => ''
+                        'line_nr' => 47
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -959,8 +932,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               },
               'type' => 'def_line'
             },
@@ -992,15 +964,13 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 45,
-            'macro' => ''
+            'line_nr' => 45
           }
         },
         {
@@ -1045,8 +1015,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                       'cmdname' => 'item',
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
-                        'line_nr' => 51,
-                        'macro' => ''
+                        'line_nr' => 51
                       }
                     }
                   ],
@@ -1091,8 +1060,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                       },
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
-                        'line_nr' => 52,
-                        'macro' => ''
+                        'line_nr' => 52
                       }
                     }
                   ],
@@ -1129,8 +1097,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               }
             }
           ],
@@ -1139,8 +1106,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 50,
-            'macro' => ''
+            'line_nr' => 50
           }
         },
         {
@@ -1205,8 +1171,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               },
               'type' => 'menu_entry'
             },
@@ -1238,15 +1203,13 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 57,
-                'macro' => ''
+                'line_nr' => 57
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 55,
-            'macro' => ''
+            'line_nr' => 55
           }
         },
         {
@@ -1265,8 +1228,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region_no_insertcopying.texi',
-        'line_nr' => 35,
-        'macro' => ''
+        'line_nr' => 35
       }
     },
     {
@@ -1299,8 +1261,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region_no_insertcopying.texi',
-        'line_nr' => 59,
-        'macro' => ''
+        'line_nr' => 59
       }
     },
     {
@@ -1374,8 +1335,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 64,
-            'macro' => ''
+            'line_nr' => 64
           },
           'type' => 'index_entry_command'
         },
@@ -1417,8 +1377,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 66,
-            'macro' => ''
+            'line_nr' => 66
           },
           'type' => 'index_entry_command'
         },
@@ -1451,8 +1410,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 68,
-                'macro' => ''
+                'line_nr' => 68
               }
             },
             {
@@ -1481,8 +1439,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 69,
-                'macro' => ''
+                'line_nr' => 69
               }
             },
             {
@@ -1521,8 +1478,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             },
             {
@@ -1551,8 +1507,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 72,
-                'macro' => ''
+                'line_nr' => 72
               }
             },
             {
@@ -1612,8 +1567,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 76,
-            'macro' => ''
+            'line_nr' => 76
           }
         },
         {
@@ -1646,8 +1600,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 77,
-            'macro' => ''
+            'line_nr' => 77
           }
         },
         {
@@ -1666,8 +1619,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 79,
-            'macro' => ''
+            'line_nr' => 79
           }
         }
       ],
@@ -1681,8 +1633,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region_no_insertcopying.texi',
-        'line_nr' => 60,
-        'macro' => ''
+        'line_nr' => 60
       }
     },
     {
@@ -1960,7 +1911,6 @@ 
$result_errors{'index_special_region_no_insertcopying_titlepage_no_nodes'} = [
 ',
     'file_name' => 'index_special_region_no_insertcopying.texi',
     'line_nr' => 44,
-    'macro' => '',
     'text' => '@cindex missing argument',
     'type' => 'warning'
   },
@@ -1969,7 +1919,6 @@ 
$result_errors{'index_special_region_no_insertcopying_titlepage_no_nodes'} = [
 ',
     'file_name' => 'index_special_region_no_insertcopying.texi',
     'line_nr' => 45,
-    'macro' => '',
     'text' => 'missing name for @deffn',
     'type' => 'warning'
   },
@@ -1978,7 +1927,6 @@ 
$result_errors{'index_special_region_no_insertcopying_titlepage_no_nodes'} = [
 ',
     'file_name' => 'index_special_region_no_insertcopying.texi',
     'line_nr' => 46,
-    'macro' => '',
     'text' => 'missing name for @deffnx',
     'type' => 'warning'
   },
@@ -1987,7 +1935,6 @@ 
$result_errors{'index_special_region_no_insertcopying_titlepage_no_nodes'} = [
 ',
     'file_name' => 'index_special_region_no_insertcopying.texi',
     'line_nr' => 47,
-    'macro' => '',
     'text' => 'missing name for @deffnx',
     'type' => 'warning'
   },
@@ -1996,7 +1943,6 @@ 
$result_errors{'index_special_region_no_insertcopying_titlepage_no_nodes'} = [
 ',
     'file_name' => 'index_special_region_no_insertcopying.texi',
     'line_nr' => 50,
-    'macro' => '',
     'text' => 'missing @ftable argument',
     'type' => 'error'
   },
@@ -2005,7 +1951,6 @@ 
$result_errors{'index_special_region_no_insertcopying_titlepage_no_nodes'} = [
 ',
     'file_name' => 'index_special_region_no_insertcopying.texi',
     'line_nr' => 51,
-    'macro' => '',
     'text' => '@item missing argument',
     'type' => 'warning'
   }
diff --git 
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.pl
 
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.pl
index f4ba6f6c76..ae274fb0ac 100644
--- 
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.pl
+++ 
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.pl
@@ -78,8 +78,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                   },
                   'source_info' => {
                     'file_name' => 
'index_special_region_no_insertcopying.texi',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   },
                   'type' => 'index_entry_command'
                 },
@@ -104,8 +103,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                   },
                   'source_info' => {
                     'file_name' => 
'index_special_region_no_insertcopying.texi',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   }
                 },
                 {
@@ -152,8 +150,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                               },
                               'source_info' => {
                                 'file_name' => 
'index_special_region_no_insertcopying.texi',
-                                'line_nr' => 9,
-                                'macro' => ''
+                                'line_nr' => 9
                               }
                             },
                             {
@@ -211,8 +208,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                               },
                               'source_info' => {
                                 'file_name' => 
'index_special_region_no_insertcopying.texi',
-                                'line_nr' => 12,
-                                'macro' => ''
+                                'line_nr' => 12
                               },
                               'type' => 'index_entry_command'
                             }
@@ -223,8 +219,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                       'cmdname' => 'footnote',
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -269,8 +264,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                   },
                   'source_info' => {
                     'file_name' => 
'index_special_region_no_insertcopying.texi',
-                    'line_nr' => 15,
-                    'macro' => ''
+                    'line_nr' => 15
                   }
                 },
                 {
@@ -306,15 +300,13 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                   },
                   'source_info' => {
                     'file_name' => 
'index_special_region_no_insertcopying.texi',
-                    'line_nr' => 17,
-                    'macro' => ''
+                    'line_nr' => 17
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -374,8 +366,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                   },
                   'source_info' => {
                     'file_name' => 
'index_special_region_no_insertcopying.texi',
-                    'line_nr' => 21,
-                    'macro' => ''
+                    'line_nr' => 21
                   },
                   'type' => 'index_entry_command'
                 },
@@ -400,8 +391,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                   },
                   'source_info' => {
                     'file_name' => 
'index_special_region_no_insertcopying.texi',
-                    'line_nr' => 22,
-                    'macro' => ''
+                    'line_nr' => 22
                   }
                 },
                 {
@@ -444,8 +434,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                               },
                               'source_info' => {
                                 'file_name' => 
'index_special_region_no_insertcopying.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             },
                             {
@@ -500,8 +489,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                               },
                               'source_info' => {
                                 'file_name' => 
'index_special_region_no_insertcopying.texi',
-                                'line_nr' => 27,
-                                'macro' => ''
+                                'line_nr' => 27
                               },
                               'type' => 'index_entry_command'
                             }
@@ -512,8 +500,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                       'cmdname' => 'footnote',
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -539,8 +526,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                   'cmdname' => 'insertcopying',
                   'source_info' => {
                     'file_name' => 
'index_special_region_no_insertcopying.texi',
-                    'line_nr' => 30,
-                    'macro' => ''
+                    'line_nr' => 30
                   }
                 },
                 {
@@ -571,15 +557,13 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                   },
                   'source_info' => {
                     'file_name' => 
'index_special_region_no_insertcopying.texi',
-                    'line_nr' => 31,
-                    'macro' => ''
+                    'line_nr' => 31
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -622,8 +606,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
       },
       'source_info' => {
         'file_name' => 'index_special_region_no_insertcopying.texi',
-        'line_nr' => 33,
-        'macro' => ''
+        'line_nr' => 33
       }
     },
     {
@@ -652,8 +635,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
       },
       'source_info' => {
         'file_name' => 'index_special_region_no_insertcopying.texi',
-        'line_nr' => 34,
-        'macro' => ''
+        'line_nr' => 34
       }
     },
     {
@@ -767,8 +749,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
           },
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 42,
-            'macro' => ''
+            'line_nr' => 42
           },
           'type' => 'index_entry_command'
         },
@@ -795,8 +776,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
           },
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 44,
-            'macro' => ''
+            'line_nr' => 44
           },
           'type' => 'index_entry_command'
         },
@@ -818,8 +798,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                       },
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
-                        'line_nr' => 45,
-                        'macro' => ''
+                        'line_nr' => 45
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -841,8 +820,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                       },
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
-                        'line_nr' => 45,
-                        'macro' => ''
+                        'line_nr' => 45
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -862,8 +840,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
               },
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 45,
-                'macro' => ''
+                'line_nr' => 45
               },
               'type' => 'def_line'
             },
@@ -882,8 +859,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                       },
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
-                        'line_nr' => 46,
-                        'macro' => ''
+                        'line_nr' => 46
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -904,8 +880,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
               },
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               },
               'type' => 'def_line'
             },
@@ -919,8 +894,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                       },
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
-                        'line_nr' => 47,
-                        'macro' => ''
+                        'line_nr' => 47
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -937,8 +911,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                       },
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
-                        'line_nr' => 47,
-                        'macro' => ''
+                        'line_nr' => 47
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -959,8 +932,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
               },
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               },
               'type' => 'def_line'
             },
@@ -992,15 +964,13 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
               },
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 45,
-            'macro' => ''
+            'line_nr' => 45
           }
         },
         {
@@ -1045,8 +1015,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                       'cmdname' => 'item',
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
-                        'line_nr' => 51,
-                        'macro' => ''
+                        'line_nr' => 51
                       }
                     }
                   ],
@@ -1091,8 +1060,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                       },
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
-                        'line_nr' => 52,
-                        'macro' => ''
+                        'line_nr' => 52
                       }
                     }
                   ],
@@ -1129,8 +1097,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
               },
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               }
             }
           ],
@@ -1139,8 +1106,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
           },
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 50,
-            'macro' => ''
+            'line_nr' => 50
           }
         },
         {
@@ -1205,8 +1171,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
               ],
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               },
               'type' => 'menu_entry'
             },
@@ -1238,15 +1203,13 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
               },
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 57,
-                'macro' => ''
+                'line_nr' => 57
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 55,
-            'macro' => ''
+            'line_nr' => 55
           }
         },
         {
@@ -1265,8 +1228,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
       },
       'source_info' => {
         'file_name' => 'index_special_region_no_insertcopying.texi',
-        'line_nr' => 35,
-        'macro' => ''
+        'line_nr' => 35
       }
     },
     {
@@ -1299,8 +1261,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
       },
       'source_info' => {
         'file_name' => 'index_special_region_no_insertcopying.texi',
-        'line_nr' => 59,
-        'macro' => ''
+        'line_nr' => 59
       }
     },
     {
@@ -1374,8 +1335,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
           },
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 64,
-            'macro' => ''
+            'line_nr' => 64
           },
           'type' => 'index_entry_command'
         },
@@ -1417,8 +1377,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
           },
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 66,
-            'macro' => ''
+            'line_nr' => 66
           },
           'type' => 'index_entry_command'
         },
@@ -1451,8 +1410,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 68,
-                'macro' => ''
+                'line_nr' => 68
               }
             },
             {
@@ -1481,8 +1439,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 69,
-                'macro' => ''
+                'line_nr' => 69
               }
             },
             {
@@ -1521,8 +1478,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             },
             {
@@ -1551,8 +1507,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
-                'line_nr' => 72,
-                'macro' => ''
+                'line_nr' => 72
               }
             },
             {
@@ -1612,8 +1567,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
           },
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 76,
-            'macro' => ''
+            'line_nr' => 76
           }
         },
         {
@@ -1646,8 +1600,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
           },
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 77,
-            'macro' => ''
+            'line_nr' => 77
           }
         },
         {
@@ -1666,8 +1619,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
-            'line_nr' => 79,
-            'macro' => ''
+            'line_nr' => 79
           }
         }
       ],
@@ -1681,8 +1633,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
       },
       'source_info' => {
         'file_name' => 'index_special_region_no_insertcopying.texi',
-        'line_nr' => 60,
-        'macro' => ''
+        'line_nr' => 60
       }
     },
     {
@@ -1960,7 +1911,6 @@ 
$result_errors{'index_special_region_no_insertcopying_titlepage_no_nodes_footnot
 ',
     'file_name' => 'index_special_region_no_insertcopying.texi',
     'line_nr' => 44,
-    'macro' => '',
     'text' => '@cindex missing argument',
     'type' => 'warning'
   },
@@ -1969,7 +1919,6 @@ 
$result_errors{'index_special_region_no_insertcopying_titlepage_no_nodes_footnot
 ',
     'file_name' => 'index_special_region_no_insertcopying.texi',
     'line_nr' => 45,
-    'macro' => '',
     'text' => 'missing name for @deffn',
     'type' => 'warning'
   },
@@ -1978,7 +1927,6 @@ 
$result_errors{'index_special_region_no_insertcopying_titlepage_no_nodes_footnot
 ',
     'file_name' => 'index_special_region_no_insertcopying.texi',
     'line_nr' => 46,
-    'macro' => '',
     'text' => 'missing name for @deffnx',
     'type' => 'warning'
   },
@@ -1987,7 +1935,6 @@ 
$result_errors{'index_special_region_no_insertcopying_titlepage_no_nodes_footnot
 ',
     'file_name' => 'index_special_region_no_insertcopying.texi',
     'line_nr' => 47,
-    'macro' => '',
     'text' => 'missing name for @deffnx',
     'type' => 'warning'
   },
@@ -1996,7 +1943,6 @@ 
$result_errors{'index_special_region_no_insertcopying_titlepage_no_nodes_footnot
 ',
     'file_name' => 'index_special_region_no_insertcopying.texi',
     'line_nr' => 50,
-    'macro' => '',
     'text' => 'missing @ftable argument',
     'type' => 'error'
   },
@@ -2005,7 +1951,6 @@ 
$result_errors{'index_special_region_no_insertcopying_titlepage_no_nodes_footnot
 ',
     'file_name' => 'index_special_region_no_insertcopying.texi',
     'line_nr' => 51,
-    'macro' => '',
     'text' => '@item missing argument',
     'type' => 'warning'
   }
diff --git a/tp/t/results/indices/index_special_region_no_titlepage_no_nodes.pl 
b/tp/t/results/indices/index_special_region_no_titlepage_no_nodes.pl
index 0abfe7a4b4..048bda4d0e 100644
--- a/tp/t/results/indices/index_special_region_no_titlepage_no_nodes.pl
+++ b/tp/t/results/indices/index_special_region_no_titlepage_no_nodes.pl
@@ -78,8 +78,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} = 
{
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   },
                   'type' => 'index_entry_command'
                 },
@@ -104,8 +103,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   }
                 },
                 {
@@ -152,8 +150,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                               },
                               'source_info' => {
                                 'file_name' => 'index_special_region.texi',
-                                'line_nr' => 9,
-                                'macro' => ''
+                                'line_nr' => 9
                               }
                             },
                             {
@@ -211,8 +208,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                               },
                               'source_info' => {
                                 'file_name' => 'index_special_region.texi',
-                                'line_nr' => 12,
-                                'macro' => ''
+                                'line_nr' => 12
                               },
                               'type' => 'index_entry_command'
                             }
@@ -223,8 +219,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                       'cmdname' => 'footnote',
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -269,8 +264,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 15,
-                    'macro' => ''
+                    'line_nr' => 15
                   }
                 },
                 {
@@ -306,15 +300,13 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 17,
-                    'macro' => ''
+                    'line_nr' => 17
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -374,8 +366,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 21,
-                    'macro' => ''
+                    'line_nr' => 21
                   },
                   'type' => 'index_entry_command'
                 },
@@ -400,8 +391,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 22,
-                    'macro' => ''
+                    'line_nr' => 22
                   }
                 },
                 {
@@ -444,8 +434,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                               },
                               'source_info' => {
                                 'file_name' => 'index_special_region.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             },
                             {
@@ -500,8 +489,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                               },
                               'source_info' => {
                                 'file_name' => 'index_special_region.texi',
-                                'line_nr' => 27,
-                                'macro' => ''
+                                'line_nr' => 27
                               },
                               'type' => 'index_entry_command'
                             }
@@ -512,8 +500,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                       'cmdname' => 'footnote',
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -539,8 +526,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                   'cmdname' => 'insertcopying',
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 30,
-                    'macro' => ''
+                    'line_nr' => 30
                   }
                 },
                 {
@@ -571,15 +557,13 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 31,
-                    'macro' => ''
+                    'line_nr' => 31
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -622,8 +606,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 33,
-        'macro' => ''
+        'line_nr' => 33
       }
     },
     {
@@ -652,8 +635,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 34,
-        'macro' => ''
+        'line_nr' => 34
       }
     },
     {
@@ -700,8 +682,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 37,
-            'macro' => ''
+            'line_nr' => 37
           }
         },
         {
@@ -772,8 +753,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 42,
-            'macro' => ''
+            'line_nr' => 42
           },
           'type' => 'index_entry_command'
         },
@@ -800,8 +780,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 44,
-            'macro' => ''
+            'line_nr' => 44
           },
           'type' => 'index_entry_command'
         },
@@ -823,8 +802,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 45,
-                        'macro' => ''
+                        'line_nr' => 45
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -846,8 +824,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 45,
-                        'macro' => ''
+                        'line_nr' => 45
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -867,8 +844,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 45,
-                'macro' => ''
+                'line_nr' => 45
               },
               'type' => 'def_line'
             },
@@ -887,8 +863,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 46,
-                        'macro' => ''
+                        'line_nr' => 46
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -909,8 +884,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               },
               'type' => 'def_line'
             },
@@ -924,8 +898,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 47,
-                        'macro' => ''
+                        'line_nr' => 47
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -942,8 +915,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 47,
-                        'macro' => ''
+                        'line_nr' => 47
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -964,8 +936,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               },
               'type' => 'def_line'
             },
@@ -997,15 +968,13 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 45,
-            'macro' => ''
+            'line_nr' => 45
           }
         },
         {
@@ -1050,8 +1019,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
                       'cmdname' => 'item',
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 51,
-                        'macro' => ''
+                        'line_nr' => 51
                       }
                     }
                   ],
@@ -1096,8 +1064,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 52,
-                        'macro' => ''
+                        'line_nr' => 52
                       }
                     }
                   ],
@@ -1134,8 +1101,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               }
             }
           ],
@@ -1144,8 +1110,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 50,
-            'macro' => ''
+            'line_nr' => 50
           }
         },
         {
@@ -1210,8 +1175,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               },
               'type' => 'menu_entry'
             },
@@ -1243,15 +1207,13 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 57,
-                'macro' => ''
+                'line_nr' => 57
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 55,
-            'macro' => ''
+            'line_nr' => 55
           }
         },
         {
@@ -1270,8 +1232,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 35,
-        'macro' => ''
+        'line_nr' => 35
       }
     },
     {
@@ -1304,8 +1265,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 59,
-        'macro' => ''
+        'line_nr' => 59
       }
     },
     {
@@ -1379,8 +1339,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 64,
-            'macro' => ''
+            'line_nr' => 64
           },
           'type' => 'index_entry_command'
         },
@@ -1422,8 +1381,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 66,
-            'macro' => ''
+            'line_nr' => 66
           },
           'type' => 'index_entry_command'
         },
@@ -1456,8 +1414,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 68,
-                'macro' => ''
+                'line_nr' => 68
               }
             },
             {
@@ -1486,8 +1443,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 69,
-                'macro' => ''
+                'line_nr' => 69
               }
             },
             {
@@ -1526,8 +1482,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             },
             {
@@ -1556,8 +1511,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 72,
-                'macro' => ''
+                'line_nr' => 72
               }
             },
             {
@@ -1583,8 +1537,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 74,
-            'macro' => ''
+            'line_nr' => 74
           }
         },
         {
@@ -1622,8 +1575,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 76,
-            'macro' => ''
+            'line_nr' => 76
           }
         },
         {
@@ -1656,8 +1608,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 77,
-            'macro' => ''
+            'line_nr' => 77
           }
         },
         {
@@ -1676,8 +1627,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 79,
-            'macro' => ''
+            'line_nr' => 79
           }
         }
       ],
@@ -1691,8 +1641,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 60,
-        'macro' => ''
+        'line_nr' => 60
       }
     },
     {
@@ -1970,7 +1919,6 @@ 
$result_errors{'index_special_region_no_titlepage_no_nodes'} = [
 ',
     'file_name' => 'index_special_region.texi',
     'line_nr' => 44,
-    'macro' => '',
     'text' => '@cindex missing argument',
     'type' => 'warning'
   },
@@ -1979,7 +1927,6 @@ 
$result_errors{'index_special_region_no_titlepage_no_nodes'} = [
 ',
     'file_name' => 'index_special_region.texi',
     'line_nr' => 45,
-    'macro' => '',
     'text' => 'missing name for @deffn',
     'type' => 'warning'
   },
@@ -1988,7 +1935,6 @@ 
$result_errors{'index_special_region_no_titlepage_no_nodes'} = [
 ',
     'file_name' => 'index_special_region.texi',
     'line_nr' => 46,
-    'macro' => '',
     'text' => 'missing name for @deffnx',
     'type' => 'warning'
   },
@@ -1997,7 +1943,6 @@ 
$result_errors{'index_special_region_no_titlepage_no_nodes'} = [
 ',
     'file_name' => 'index_special_region.texi',
     'line_nr' => 47,
-    'macro' => '',
     'text' => 'missing name for @deffnx',
     'type' => 'warning'
   },
@@ -2006,7 +1951,6 @@ 
$result_errors{'index_special_region_no_titlepage_no_nodes'} = [
 ',
     'file_name' => 'index_special_region.texi',
     'line_nr' => 50,
-    'macro' => '',
     'text' => 'missing @ftable argument',
     'type' => 'error'
   },
@@ -2015,7 +1959,6 @@ 
$result_errors{'index_special_region_no_titlepage_no_nodes'} = [
 ',
     'file_name' => 'index_special_region.texi',
     'line_nr' => 51,
-    'macro' => '',
     'text' => '@item missing argument',
     'type' => 'warning'
   }
diff --git a/tp/t/results/indices/index_special_region_titlepage_no_nodes.pl 
b/tp/t/results/indices/index_special_region_titlepage_no_nodes.pl
index 887eb3f993..13c9f93bd3 100644
--- a/tp/t/results/indices/index_special_region_titlepage_no_nodes.pl
+++ b/tp/t/results/indices/index_special_region_titlepage_no_nodes.pl
@@ -78,8 +78,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   },
                   'type' => 'index_entry_command'
                 },
@@ -104,8 +103,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   }
                 },
                 {
@@ -152,8 +150,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                               },
                               'source_info' => {
                                 'file_name' => 'index_special_region.texi',
-                                'line_nr' => 9,
-                                'macro' => ''
+                                'line_nr' => 9
                               }
                             },
                             {
@@ -211,8 +208,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                               },
                               'source_info' => {
                                 'file_name' => 'index_special_region.texi',
-                                'line_nr' => 12,
-                                'macro' => ''
+                                'line_nr' => 12
                               },
                               'type' => 'index_entry_command'
                             }
@@ -223,8 +219,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                       'cmdname' => 'footnote',
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -269,8 +264,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 15,
-                    'macro' => ''
+                    'line_nr' => 15
                   }
                 },
                 {
@@ -306,15 +300,13 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 17,
-                    'macro' => ''
+                    'line_nr' => 17
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -374,8 +366,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 21,
-                    'macro' => ''
+                    'line_nr' => 21
                   },
                   'type' => 'index_entry_command'
                 },
@@ -400,8 +391,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 22,
-                    'macro' => ''
+                    'line_nr' => 22
                   }
                 },
                 {
@@ -444,8 +434,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                               },
                               'source_info' => {
                                 'file_name' => 'index_special_region.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             },
                             {
@@ -500,8 +489,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                               },
                               'source_info' => {
                                 'file_name' => 'index_special_region.texi',
-                                'line_nr' => 27,
-                                'macro' => ''
+                                'line_nr' => 27
                               },
                               'type' => 'index_entry_command'
                             }
@@ -512,8 +500,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                       'cmdname' => 'footnote',
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -539,8 +526,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                   'cmdname' => 'insertcopying',
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 30,
-                    'macro' => ''
+                    'line_nr' => 30
                   }
                 },
                 {
@@ -571,15 +557,13 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 31,
-                    'macro' => ''
+                    'line_nr' => 31
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -622,8 +606,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 33,
-        'macro' => ''
+        'line_nr' => 33
       }
     },
     {
@@ -652,8 +635,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 34,
-        'macro' => ''
+        'line_nr' => 34
       }
     },
     {
@@ -700,8 +682,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 37,
-            'macro' => ''
+            'line_nr' => 37
           }
         },
         {
@@ -772,8 +753,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 42,
-            'macro' => ''
+            'line_nr' => 42
           },
           'type' => 'index_entry_command'
         },
@@ -800,8 +780,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 44,
-            'macro' => ''
+            'line_nr' => 44
           },
           'type' => 'index_entry_command'
         },
@@ -823,8 +802,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 45,
-                        'macro' => ''
+                        'line_nr' => 45
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -846,8 +824,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 45,
-                        'macro' => ''
+                        'line_nr' => 45
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -867,8 +844,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 45,
-                'macro' => ''
+                'line_nr' => 45
               },
               'type' => 'def_line'
             },
@@ -887,8 +863,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 46,
-                        'macro' => ''
+                        'line_nr' => 46
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -909,8 +884,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               },
               'type' => 'def_line'
             },
@@ -924,8 +898,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 47,
-                        'macro' => ''
+                        'line_nr' => 47
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -942,8 +915,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 47,
-                        'macro' => ''
+                        'line_nr' => 47
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -964,8 +936,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               },
               'type' => 'def_line'
             },
@@ -997,15 +968,13 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 45,
-            'macro' => ''
+            'line_nr' => 45
           }
         },
         {
@@ -1050,8 +1019,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
                       'cmdname' => 'item',
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 51,
-                        'macro' => ''
+                        'line_nr' => 51
                       }
                     }
                   ],
@@ -1096,8 +1064,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 52,
-                        'macro' => ''
+                        'line_nr' => 52
                       }
                     }
                   ],
@@ -1134,8 +1101,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               }
             }
           ],
@@ -1144,8 +1110,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 50,
-            'macro' => ''
+            'line_nr' => 50
           }
         },
         {
@@ -1210,8 +1175,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
               ],
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               },
               'type' => 'menu_entry'
             },
@@ -1243,15 +1207,13 @@ 
$result_trees{'index_special_region_titlepage_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 57,
-                'macro' => ''
+                'line_nr' => 57
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 55,
-            'macro' => ''
+            'line_nr' => 55
           }
         },
         {
@@ -1270,8 +1232,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 35,
-        'macro' => ''
+        'line_nr' => 35
       }
     },
     {
@@ -1304,8 +1265,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 59,
-        'macro' => ''
+        'line_nr' => 59
       }
     },
     {
@@ -1379,8 +1339,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 64,
-            'macro' => ''
+            'line_nr' => 64
           },
           'type' => 'index_entry_command'
         },
@@ -1422,8 +1381,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 66,
-            'macro' => ''
+            'line_nr' => 66
           },
           'type' => 'index_entry_command'
         },
@@ -1456,8 +1414,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 68,
-                'macro' => ''
+                'line_nr' => 68
               }
             },
             {
@@ -1486,8 +1443,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 69,
-                'macro' => ''
+                'line_nr' => 69
               }
             },
             {
@@ -1526,8 +1482,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             },
             {
@@ -1556,8 +1511,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 72,
-                'macro' => ''
+                'line_nr' => 72
               }
             },
             {
@@ -1583,8 +1537,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 74,
-            'macro' => ''
+            'line_nr' => 74
           }
         },
         {
@@ -1622,8 +1575,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 76,
-            'macro' => ''
+            'line_nr' => 76
           }
         },
         {
@@ -1656,8 +1608,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 77,
-            'macro' => ''
+            'line_nr' => 77
           }
         },
         {
@@ -1676,8 +1627,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 79,
-            'macro' => ''
+            'line_nr' => 79
           }
         }
       ],
@@ -1691,8 +1641,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 60,
-        'macro' => ''
+        'line_nr' => 60
       }
     },
     {
@@ -1970,7 +1919,6 @@ $result_errors{'index_special_region_titlepage_no_nodes'} 
= [
 ',
     'file_name' => 'index_special_region.texi',
     'line_nr' => 44,
-    'macro' => '',
     'text' => '@cindex missing argument',
     'type' => 'warning'
   },
@@ -1979,7 +1927,6 @@ $result_errors{'index_special_region_titlepage_no_nodes'} 
= [
 ',
     'file_name' => 'index_special_region.texi',
     'line_nr' => 45,
-    'macro' => '',
     'text' => 'missing name for @deffn',
     'type' => 'warning'
   },
@@ -1988,7 +1935,6 @@ $result_errors{'index_special_region_titlepage_no_nodes'} 
= [
 ',
     'file_name' => 'index_special_region.texi',
     'line_nr' => 46,
-    'macro' => '',
     'text' => 'missing name for @deffnx',
     'type' => 'warning'
   },
@@ -1997,7 +1943,6 @@ $result_errors{'index_special_region_titlepage_no_nodes'} 
= [
 ',
     'file_name' => 'index_special_region.texi',
     'line_nr' => 47,
-    'macro' => '',
     'text' => 'missing name for @deffnx',
     'type' => 'warning'
   },
@@ -2006,7 +1951,6 @@ $result_errors{'index_special_region_titlepage_no_nodes'} 
= [
 ',
     'file_name' => 'index_special_region.texi',
     'line_nr' => 50,
-    'macro' => '',
     'text' => 'missing @ftable argument',
     'type' => 'error'
   },
@@ -2015,7 +1959,6 @@ $result_errors{'index_special_region_titlepage_no_nodes'} 
= [
 ',
     'file_name' => 'index_special_region.texi',
     'line_nr' => 51,
-    'macro' => '',
     'text' => '@item missing argument',
     'type' => 'warning'
   }
@@ -2047,7 +1990,6 @@ 
$result_converted_errors{'file_info'}->{'index_special_region_titlepage_no_nodes
 ',
     'file_name' => 'index_special_region.texi',
     'line_nr' => 6,
-    'macro' => '',
     'text' => '@anchor output more than once: Copying information',
     'type' => 'error'
   },
@@ -2056,7 +1998,6 @@ 
$result_converted_errors{'file_info'}->{'index_special_region_titlepage_no_nodes
 ',
     'file_name' => 'index_special_region.texi',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@anchor output more than once: Public domain reference',
     'type' => 'error'
   }
diff --git 
a/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
 
b/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
index 6d6bb6b072..4960697bd6 100644
--- 
a/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
+++ 
b/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
@@ -78,8 +78,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   },
                   'type' => 'index_entry_command'
                 },
@@ -104,8 +103,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   }
                 },
                 {
@@ -152,8 +150,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                               },
                               'source_info' => {
                                 'file_name' => 'index_special_region.texi',
-                                'line_nr' => 9,
-                                'macro' => ''
+                                'line_nr' => 9
                               }
                             },
                             {
@@ -211,8 +208,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                               },
                               'source_info' => {
                                 'file_name' => 'index_special_region.texi',
-                                'line_nr' => 12,
-                                'macro' => ''
+                                'line_nr' => 12
                               },
                               'type' => 'index_entry_command'
                             }
@@ -223,8 +219,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                       'cmdname' => 'footnote',
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -269,8 +264,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 15,
-                    'macro' => ''
+                    'line_nr' => 15
                   }
                 },
                 {
@@ -306,15 +300,13 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 17,
-                    'macro' => ''
+                    'line_nr' => 17
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -374,8 +366,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 21,
-                    'macro' => ''
+                    'line_nr' => 21
                   },
                   'type' => 'index_entry_command'
                 },
@@ -400,8 +391,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 22,
-                    'macro' => ''
+                    'line_nr' => 22
                   }
                 },
                 {
@@ -444,8 +434,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                               },
                               'source_info' => {
                                 'file_name' => 'index_special_region.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             },
                             {
@@ -500,8 +489,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                               },
                               'source_info' => {
                                 'file_name' => 'index_special_region.texi',
-                                'line_nr' => 27,
-                                'macro' => ''
+                                'line_nr' => 27
                               },
                               'type' => 'index_entry_command'
                             }
@@ -512,8 +500,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                       'cmdname' => 'footnote',
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -539,8 +526,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                   'cmdname' => 'insertcopying',
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 30,
-                    'macro' => ''
+                    'line_nr' => 30
                   }
                 },
                 {
@@ -571,15 +557,13 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 31,
-                    'macro' => ''
+                    'line_nr' => 31
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -622,8 +606,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 33,
-        'macro' => ''
+        'line_nr' => 33
       }
     },
     {
@@ -652,8 +635,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 34,
-        'macro' => ''
+        'line_nr' => 34
       }
     },
     {
@@ -700,8 +682,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 37,
-            'macro' => ''
+            'line_nr' => 37
           }
         },
         {
@@ -772,8 +753,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 42,
-            'macro' => ''
+            'line_nr' => 42
           },
           'type' => 'index_entry_command'
         },
@@ -800,8 +780,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 44,
-            'macro' => ''
+            'line_nr' => 44
           },
           'type' => 'index_entry_command'
         },
@@ -823,8 +802,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 45,
-                        'macro' => ''
+                        'line_nr' => 45
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -846,8 +824,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 45,
-                        'macro' => ''
+                        'line_nr' => 45
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -867,8 +844,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 45,
-                'macro' => ''
+                'line_nr' => 45
               },
               'type' => 'def_line'
             },
@@ -887,8 +863,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 46,
-                        'macro' => ''
+                        'line_nr' => 46
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -909,8 +884,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               },
               'type' => 'def_line'
             },
@@ -924,8 +898,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 47,
-                        'macro' => ''
+                        'line_nr' => 47
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -942,8 +915,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 47,
-                        'macro' => ''
+                        'line_nr' => 47
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -964,8 +936,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               },
               'type' => 'def_line'
             },
@@ -997,15 +968,13 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 45,
-            'macro' => ''
+            'line_nr' => 45
           }
         },
         {
@@ -1050,8 +1019,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                       'cmdname' => 'item',
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 51,
-                        'macro' => ''
+                        'line_nr' => 51
                       }
                     }
                   ],
@@ -1096,8 +1064,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 52,
-                        'macro' => ''
+                        'line_nr' => 52
                       }
                     }
                   ],
@@ -1134,8 +1101,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               }
             }
           ],
@@ -1144,8 +1110,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 50,
-            'macro' => ''
+            'line_nr' => 50
           }
         },
         {
@@ -1210,8 +1175,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               },
               'type' => 'menu_entry'
             },
@@ -1243,15 +1207,13 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 57,
-                'macro' => ''
+                'line_nr' => 57
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 55,
-            'macro' => ''
+            'line_nr' => 55
           }
         },
         {
@@ -1270,8 +1232,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 35,
-        'macro' => ''
+        'line_nr' => 35
       }
     },
     {
@@ -1304,8 +1265,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 59,
-        'macro' => ''
+        'line_nr' => 59
       }
     },
     {
@@ -1379,8 +1339,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 64,
-            'macro' => ''
+            'line_nr' => 64
           },
           'type' => 'index_entry_command'
         },
@@ -1422,8 +1381,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 66,
-            'macro' => ''
+            'line_nr' => 66
           },
           'type' => 'index_entry_command'
         },
@@ -1456,8 +1414,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 68,
-                'macro' => ''
+                'line_nr' => 68
               }
             },
             {
@@ -1486,8 +1443,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 69,
-                'macro' => ''
+                'line_nr' => 69
               }
             },
             {
@@ -1526,8 +1482,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             },
             {
@@ -1556,8 +1511,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 72,
-                'macro' => ''
+                'line_nr' => 72
               }
             },
             {
@@ -1583,8 +1537,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 74,
-            'macro' => ''
+            'line_nr' => 74
           }
         },
         {
@@ -1622,8 +1575,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 76,
-            'macro' => ''
+            'line_nr' => 76
           }
         },
         {
@@ -1656,8 +1608,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 77,
-            'macro' => ''
+            'line_nr' => 77
           }
         },
         {
@@ -1676,8 +1627,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 79,
-            'macro' => ''
+            'line_nr' => 79
           }
         }
       ],
@@ -1691,8 +1641,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 60,
-        'macro' => ''
+        'line_nr' => 60
       }
     },
     {
@@ -1970,7 +1919,6 @@ 
$result_errors{'index_special_region_titlepage_no_nodes_footnotes_default'} = [
 ',
     'file_name' => 'index_special_region.texi',
     'line_nr' => 44,
-    'macro' => '',
     'text' => '@cindex missing argument',
     'type' => 'warning'
   },
@@ -1979,7 +1927,6 @@ 
$result_errors{'index_special_region_titlepage_no_nodes_footnotes_default'} = [
 ',
     'file_name' => 'index_special_region.texi',
     'line_nr' => 45,
-    'macro' => '',
     'text' => 'missing name for @deffn',
     'type' => 'warning'
   },
@@ -1988,7 +1935,6 @@ 
$result_errors{'index_special_region_titlepage_no_nodes_footnotes_default'} = [
 ',
     'file_name' => 'index_special_region.texi',
     'line_nr' => 46,
-    'macro' => '',
     'text' => 'missing name for @deffnx',
     'type' => 'warning'
   },
@@ -1997,7 +1943,6 @@ 
$result_errors{'index_special_region_titlepage_no_nodes_footnotes_default'} = [
 ',
     'file_name' => 'index_special_region.texi',
     'line_nr' => 47,
-    'macro' => '',
     'text' => 'missing name for @deffnx',
     'type' => 'warning'
   },
@@ -2006,7 +1951,6 @@ 
$result_errors{'index_special_region_titlepage_no_nodes_footnotes_default'} = [
 ',
     'file_name' => 'index_special_region.texi',
     'line_nr' => 50,
-    'macro' => '',
     'text' => 'missing @ftable argument',
     'type' => 'error'
   },
@@ -2015,7 +1959,6 @@ 
$result_errors{'index_special_region_titlepage_no_nodes_footnotes_default'} = [
 ',
     'file_name' => 'index_special_region.texi',
     'line_nr' => 51,
-    'macro' => '',
     'text' => '@item missing argument',
     'type' => 'warning'
   }
diff --git a/tp/t/results/indices/index_split.pl 
b/tp/t/results/indices/index_split.pl
index 17e6726118..cabceb7e91 100644
--- a/tp/t/results/indices/index_split.pl
+++ b/tp/t/results/indices/index_split.pl
@@ -60,8 +60,7 @@ $result_trees{'index_split'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -116,8 +115,7 @@ $result_trees{'index_split'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           },
           'type' => 'index_entry_command'
         },
@@ -156,8 +154,7 @@ $result_trees{'index_split'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -195,8 +192,7 @@ $result_trees{'index_split'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -248,8 +244,7 @@ $result_trees{'index_split'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -314,8 +309,7 @@ $result_trees{'index_split'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_split.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               },
               'type' => 'menu_entry'
             },
@@ -362,8 +356,7 @@ $result_trees{'index_split'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_split.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               },
               'type' => 'menu_entry'
             },
@@ -410,8 +403,7 @@ $result_trees{'index_split'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_split.texi',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               },
               'type' => 'menu_entry'
             },
@@ -443,15 +435,13 @@ $result_trees{'index_split'} = {
               },
               'source_info' => {
                 'file_name' => 'index_split.texi',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         },
         {
@@ -468,8 +458,7 @@ $result_trees{'index_split'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -535,8 +524,7 @@ $result_trees{'index_split'} = {
               },
               'source_info' => {
                 'file_name' => 'index_split.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               },
               'type' => 'index_entry_command'
             },
@@ -573,8 +561,7 @@ $result_trees{'index_split'} = {
               },
               'source_info' => {
                 'file_name' => 'index_split.texi',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               },
               'type' => 'index_entry_command'
             },
@@ -611,8 +598,7 @@ $result_trees{'index_split'} = {
               },
               'source_info' => {
                 'file_name' => 'index_split.texi',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               },
               'type' => 'index_entry_command'
             },
@@ -649,8 +635,7 @@ $result_trees{'index_split'} = {
               },
               'source_info' => {
                 'file_name' => 'index_split.texi',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               },
               'type' => 'index_entry_command'
             }
@@ -692,8 +677,7 @@ $result_trees{'index_split'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 29,
-            'macro' => ''
+            'line_nr' => 29
           }
         },
         {
@@ -731,8 +715,7 @@ $result_trees{'index_split'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 31,
-            'macro' => ''
+            'line_nr' => 31
           }
         },
         {
@@ -773,8 +756,7 @@ $result_trees{'index_split'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 33,
-            'macro' => ''
+            'line_nr' => 33
           },
           'type' => 'index_entry_command'
         },
@@ -796,8 +778,7 @@ $result_trees{'index_split'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 21,
-        'macro' => ''
+        'line_nr' => 21
       }
     },
     {
@@ -852,8 +833,7 @@ $result_trees{'index_split'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 36,
-            'macro' => ''
+            'line_nr' => 36
           },
           'type' => 'index_entry_command'
         },
@@ -890,8 +870,7 @@ $result_trees{'index_split'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 37,
-            'macro' => ''
+            'line_nr' => 37
           },
           'type' => 'index_entry_command'
         },
@@ -928,8 +907,7 @@ $result_trees{'index_split'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 38,
-            'macro' => ''
+            'line_nr' => 38
           },
           'type' => 'index_entry_command'
         },
@@ -995,8 +973,7 @@ $result_trees{'index_split'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_split.texi',
-                'line_nr' => 41,
-                'macro' => ''
+                'line_nr' => 41
               },
               'type' => 'menu_entry'
             },
@@ -1043,8 +1020,7 @@ $result_trees{'index_split'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_split.texi',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               },
               'type' => 'menu_entry'
             },
@@ -1091,8 +1067,7 @@ $result_trees{'index_split'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_split.texi',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               },
               'type' => 'menu_entry'
             },
@@ -1139,8 +1114,7 @@ $result_trees{'index_split'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_split.texi',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               },
               'type' => 'menu_entry'
             },
@@ -1187,8 +1161,7 @@ $result_trees{'index_split'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_split.texi',
-                'line_nr' => 45,
-                'macro' => ''
+                'line_nr' => 45
               },
               'type' => 'menu_entry'
             },
@@ -1235,8 +1208,7 @@ $result_trees{'index_split'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_split.texi',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               },
               'type' => 'menu_entry'
             },
@@ -1268,15 +1240,13 @@ $result_trees{'index_split'} = {
               },
               'source_info' => {
                 'file_name' => 'index_split.texi',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 40,
-            'macro' => ''
+            'line_nr' => 40
           }
         },
         {
@@ -1295,8 +1265,7 @@ $result_trees{'index_split'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 35,
-        'macro' => ''
+        'line_nr' => 35
       }
     },
     {
@@ -1329,8 +1298,7 @@ $result_trees{'index_split'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 49,
-        'macro' => ''
+        'line_nr' => 49
       }
     },
     {
@@ -1390,8 +1358,7 @@ $result_trees{'index_split'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 52,
-            'macro' => ''
+            'line_nr' => 52
           },
           'type' => 'index_entry_command'
         },
@@ -1457,8 +1424,7 @@ $result_trees{'index_split'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_split.texi',
-                'line_nr' => 55,
-                'macro' => ''
+                'line_nr' => 55
               },
               'type' => 'menu_entry'
             },
@@ -1505,8 +1471,7 @@ $result_trees{'index_split'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_split.texi',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               },
               'type' => 'menu_entry'
             },
@@ -1538,15 +1503,13 @@ $result_trees{'index_split'} = {
               },
               'source_info' => {
                 'file_name' => 'index_split.texi',
-                'line_nr' => 57,
-                'macro' => ''
+                'line_nr' => 57
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 54,
-            'macro' => ''
+            'line_nr' => 54
           }
         },
         {
@@ -1593,8 +1556,7 @@ $result_trees{'index_split'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 60,
-            'macro' => ''
+            'line_nr' => 60
           }
         },
         {
@@ -1635,8 +1597,7 @@ $result_trees{'index_split'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 62,
-            'macro' => ''
+            'line_nr' => 62
           },
           'type' => 'index_entry_command'
         },
@@ -1656,8 +1617,7 @@ $result_trees{'index_split'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 50,
-        'macro' => ''
+        'line_nr' => 50
       }
     },
     {
@@ -1689,8 +1649,7 @@ $result_trees{'index_split'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 64,
-        'macro' => ''
+        'line_nr' => 64
       }
     },
     {
@@ -1742,8 +1701,7 @@ $result_trees{'index_split'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 65,
-        'macro' => ''
+        'line_nr' => 65
       }
     },
     {
@@ -1776,8 +1734,7 @@ $result_trees{'index_split'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 69,
-        'macro' => ''
+        'line_nr' => 69
       }
     },
     {
@@ -1851,8 +1808,7 @@ $result_trees{'index_split'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 74,
-            'macro' => ''
+            'line_nr' => 74
           },
           'type' => 'index_entry_command'
         },
@@ -1891,8 +1847,7 @@ $result_trees{'index_split'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 76,
-            'macro' => ''
+            'line_nr' => 76
           }
         },
         {
@@ -1933,8 +1888,7 @@ $result_trees{'index_split'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 78,
-            'macro' => ''
+            'line_nr' => 78
           },
           'type' => 'index_entry_command'
         },
@@ -1954,8 +1908,7 @@ $result_trees{'index_split'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 70,
-        'macro' => ''
+        'line_nr' => 70
       }
     },
     {
@@ -1987,8 +1940,7 @@ $result_trees{'index_split'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 80,
-        'macro' => ''
+        'line_nr' => 80
       }
     },
     {
@@ -2040,8 +1992,7 @@ $result_trees{'index_split'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 81,
-        'macro' => ''
+        'line_nr' => 81
       }
     },
     {
@@ -2074,8 +2025,7 @@ $result_trees{'index_split'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 85,
-        'macro' => ''
+        'line_nr' => 85
       }
     },
     {
@@ -2135,8 +2085,7 @@ $result_trees{'index_split'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 88,
-            'macro' => ''
+            'line_nr' => 88
           },
           'type' => 'index_entry_command'
         },
@@ -2175,8 +2124,7 @@ $result_trees{'index_split'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 90,
-            'macro' => ''
+            'line_nr' => 90
           }
         },
         {
@@ -2195,8 +2143,7 @@ $result_trees{'index_split'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 86,
-        'macro' => ''
+        'line_nr' => 86
       }
     },
     {
@@ -2291,8 +2238,7 @@ $result_trees{'index_split'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 94,
-            'macro' => ''
+            'line_nr' => 94
           },
           'type' => 'index_entry_command'
         },
@@ -2322,8 +2268,7 @@ $result_trees{'index_split'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 92,
-        'macro' => ''
+        'line_nr' => 92
       }
     },
     {
@@ -2405,8 +2350,7 @@ $result_trees{'index_split'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 99,
-            'macro' => ''
+            'line_nr' => 99
           },
           'type' => 'index_entry_command'
         },
@@ -2454,8 +2398,7 @@ $result_trees{'index_split'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 102,
-            'macro' => ''
+            'line_nr' => 102
           }
         },
         {
@@ -2496,8 +2439,7 @@ $result_trees{'index_split'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 104,
-            'macro' => ''
+            'line_nr' => 104
           },
           'type' => 'index_entry_command'
         },
@@ -2536,8 +2478,7 @@ $result_trees{'index_split'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 106,
-            'macro' => ''
+            'line_nr' => 106
           }
         },
         {
@@ -2578,8 +2519,7 @@ $result_trees{'index_split'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 108,
-            'macro' => ''
+            'line_nr' => 108
           },
           'type' => 'index_entry_command'
         },
@@ -2601,8 +2541,7 @@ $result_trees{'index_split'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 97,
-        'macro' => ''
+        'line_nr' => 97
       }
     },
     {
@@ -2684,8 +2623,7 @@ $result_trees{'index_split'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 112,
-            'macro' => ''
+            'line_nr' => 112
           },
           'type' => 'index_entry_command'
         },
@@ -2706,8 +2644,7 @@ $result_trees{'index_split'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 110,
-        'macro' => ''
+        'line_nr' => 110
       }
     },
     {
@@ -2739,8 +2676,7 @@ $result_trees{'index_split'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 114,
-        'macro' => ''
+        'line_nr' => 114
       }
     },
     {
@@ -2792,8 +2728,7 @@ $result_trees{'index_split'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 115,
-        'macro' => ''
+        'line_nr' => 115
       }
     },
     {
diff --git a/tp/t/results/indices/index_split_split_chapter_no_nodes.pl 
b/tp/t/results/indices/index_split_split_chapter_no_nodes.pl
index 24de3edac5..233722e8d0 100644
--- a/tp/t/results/indices/index_split_split_chapter_no_nodes.pl
+++ b/tp/t/results/indices/index_split_split_chapter_no_nodes.pl
@@ -60,8 +60,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -116,8 +115,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           },
           'type' => 'index_entry_command'
         },
@@ -156,8 +154,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -195,8 +192,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -248,8 +244,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -314,8 +309,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_split.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               },
               'type' => 'menu_entry'
             },
@@ -362,8 +356,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_split.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               },
               'type' => 'menu_entry'
             },
@@ -410,8 +403,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_split.texi',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               },
               'type' => 'menu_entry'
             },
@@ -443,15 +435,13 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_split.texi',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         },
         {
@@ -468,8 +458,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -535,8 +524,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_split.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               },
               'type' => 'index_entry_command'
             },
@@ -573,8 +561,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_split.texi',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               },
               'type' => 'index_entry_command'
             },
@@ -611,8 +598,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_split.texi',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               },
               'type' => 'index_entry_command'
             },
@@ -649,8 +635,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_split.texi',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               },
               'type' => 'index_entry_command'
             }
@@ -692,8 +677,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 29,
-            'macro' => ''
+            'line_nr' => 29
           }
         },
         {
@@ -731,8 +715,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 31,
-            'macro' => ''
+            'line_nr' => 31
           }
         },
         {
@@ -773,8 +756,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 33,
-            'macro' => ''
+            'line_nr' => 33
           },
           'type' => 'index_entry_command'
         },
@@ -796,8 +778,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 21,
-        'macro' => ''
+        'line_nr' => 21
       }
     },
     {
@@ -852,8 +833,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 36,
-            'macro' => ''
+            'line_nr' => 36
           },
           'type' => 'index_entry_command'
         },
@@ -890,8 +870,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 37,
-            'macro' => ''
+            'line_nr' => 37
           },
           'type' => 'index_entry_command'
         },
@@ -928,8 +907,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 38,
-            'macro' => ''
+            'line_nr' => 38
           },
           'type' => 'index_entry_command'
         },
@@ -995,8 +973,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_split.texi',
-                'line_nr' => 41,
-                'macro' => ''
+                'line_nr' => 41
               },
               'type' => 'menu_entry'
             },
@@ -1043,8 +1020,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_split.texi',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               },
               'type' => 'menu_entry'
             },
@@ -1091,8 +1067,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_split.texi',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               },
               'type' => 'menu_entry'
             },
@@ -1139,8 +1114,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_split.texi',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               },
               'type' => 'menu_entry'
             },
@@ -1187,8 +1161,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_split.texi',
-                'line_nr' => 45,
-                'macro' => ''
+                'line_nr' => 45
               },
               'type' => 'menu_entry'
             },
@@ -1235,8 +1208,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_split.texi',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               },
               'type' => 'menu_entry'
             },
@@ -1268,15 +1240,13 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_split.texi',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 40,
-            'macro' => ''
+            'line_nr' => 40
           }
         },
         {
@@ -1295,8 +1265,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 35,
-        'macro' => ''
+        'line_nr' => 35
       }
     },
     {
@@ -1329,8 +1298,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 49,
-        'macro' => ''
+        'line_nr' => 49
       }
     },
     {
@@ -1390,8 +1358,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 52,
-            'macro' => ''
+            'line_nr' => 52
           },
           'type' => 'index_entry_command'
         },
@@ -1457,8 +1424,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_split.texi',
-                'line_nr' => 55,
-                'macro' => ''
+                'line_nr' => 55
               },
               'type' => 'menu_entry'
             },
@@ -1505,8 +1471,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_split.texi',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               },
               'type' => 'menu_entry'
             },
@@ -1538,15 +1503,13 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_split.texi',
-                'line_nr' => 57,
-                'macro' => ''
+                'line_nr' => 57
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 54,
-            'macro' => ''
+            'line_nr' => 54
           }
         },
         {
@@ -1593,8 +1556,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 60,
-            'macro' => ''
+            'line_nr' => 60
           }
         },
         {
@@ -1635,8 +1597,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 62,
-            'macro' => ''
+            'line_nr' => 62
           },
           'type' => 'index_entry_command'
         },
@@ -1656,8 +1617,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 50,
-        'macro' => ''
+        'line_nr' => 50
       }
     },
     {
@@ -1689,8 +1649,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 64,
-        'macro' => ''
+        'line_nr' => 64
       }
     },
     {
@@ -1742,8 +1701,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 65,
-        'macro' => ''
+        'line_nr' => 65
       }
     },
     {
@@ -1776,8 +1734,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 69,
-        'macro' => ''
+        'line_nr' => 69
       }
     },
     {
@@ -1851,8 +1808,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 74,
-            'macro' => ''
+            'line_nr' => 74
           },
           'type' => 'index_entry_command'
         },
@@ -1891,8 +1847,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 76,
-            'macro' => ''
+            'line_nr' => 76
           }
         },
         {
@@ -1933,8 +1888,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 78,
-            'macro' => ''
+            'line_nr' => 78
           },
           'type' => 'index_entry_command'
         },
@@ -1954,8 +1908,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 70,
-        'macro' => ''
+        'line_nr' => 70
       }
     },
     {
@@ -1987,8 +1940,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 80,
-        'macro' => ''
+        'line_nr' => 80
       }
     },
     {
@@ -2040,8 +1992,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 81,
-        'macro' => ''
+        'line_nr' => 81
       }
     },
     {
@@ -2074,8 +2025,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 85,
-        'macro' => ''
+        'line_nr' => 85
       }
     },
     {
@@ -2135,8 +2085,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 88,
-            'macro' => ''
+            'line_nr' => 88
           },
           'type' => 'index_entry_command'
         },
@@ -2175,8 +2124,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 90,
-            'macro' => ''
+            'line_nr' => 90
           }
         },
         {
@@ -2195,8 +2143,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 86,
-        'macro' => ''
+        'line_nr' => 86
       }
     },
     {
@@ -2291,8 +2238,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 94,
-            'macro' => ''
+            'line_nr' => 94
           },
           'type' => 'index_entry_command'
         },
@@ -2322,8 +2268,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 92,
-        'macro' => ''
+        'line_nr' => 92
       }
     },
     {
@@ -2405,8 +2350,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 99,
-            'macro' => ''
+            'line_nr' => 99
           },
           'type' => 'index_entry_command'
         },
@@ -2454,8 +2398,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 102,
-            'macro' => ''
+            'line_nr' => 102
           }
         },
         {
@@ -2496,8 +2439,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 104,
-            'macro' => ''
+            'line_nr' => 104
           },
           'type' => 'index_entry_command'
         },
@@ -2536,8 +2478,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 106,
-            'macro' => ''
+            'line_nr' => 106
           }
         },
         {
@@ -2578,8 +2519,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 108,
-            'macro' => ''
+            'line_nr' => 108
           },
           'type' => 'index_entry_command'
         },
@@ -2601,8 +2541,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 97,
-        'macro' => ''
+        'line_nr' => 97
       }
     },
     {
@@ -2684,8 +2623,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_split.texi',
-            'line_nr' => 112,
-            'macro' => ''
+            'line_nr' => 112
           },
           'type' => 'index_entry_command'
         },
@@ -2706,8 +2644,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 110,
-        'macro' => ''
+        'line_nr' => 110
       }
     },
     {
@@ -2739,8 +2676,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 114,
-        'macro' => ''
+        'line_nr' => 114
       }
     },
     {
@@ -2792,8 +2728,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_split.texi',
-        'line_nr' => 115,
-        'macro' => ''
+        'line_nr' => 115
       }
     },
     {
@@ -3555,7 +3490,6 @@ $result_errors{'index_split_split_chapter_no_nodes'} = [
 ',
     'file_name' => 'index_split.texi',
     'line_nr' => 85,
-    'macro' => '',
     'text' => 'node `node in section 3\' is next for `section 3\' in menu but 
not in sectioning',
     'type' => 'warning'
   }
diff --git a/tp/t/results/indices/index_table.pl 
b/tp/t/results/indices/index_table.pl
index f7bec6ebbc..46fe302bd8 100644
--- a/tp/t/results/indices/index_table.pl
+++ b/tp/t/results/indices/index_table.pl
@@ -59,8 +59,7 @@ $result_trees{'index_table'} = {
       },
       'source_info' => {
         'file_name' => 'index_table.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -139,8 +138,7 @@ $result_trees{'index_table'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_table.texi',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -187,8 +185,7 @@ $result_trees{'index_table'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_table.texi',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -235,8 +232,7 @@ $result_trees{'index_table'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_table.texi',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               },
               'type' => 'menu_entry'
             },
@@ -268,15 +264,13 @@ $result_trees{'index_table'} = {
               },
               'source_info' => {
                 'file_name' => 'index_table.texi',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -293,8 +287,7 @@ $result_trees{'index_table'} = {
       },
       'source_info' => {
         'file_name' => 'index_table.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -326,8 +319,7 @@ $result_trees{'index_table'} = {
       },
       'source_info' => {
         'file_name' => 'index_table.texi',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -387,8 +379,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           },
           'type' => 'index_entry_command'
         },
@@ -436,8 +427,7 @@ $result_trees{'index_table'} = {
               },
               'source_info' => {
                 'file_name' => 'index_table.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               },
               'type' => 'index_entry_command'
             }
@@ -471,8 +461,7 @@ $result_trees{'index_table'} = {
                   'cmdname' => 'bullet',
                   'source_info' => {
                     'file_name' => 'index_table.texi',
-                    'line_nr' => 21,
-                    'macro' => ''
+                    'line_nr' => 21
                   },
                   'type' => 'command_as_argument'
                 }
@@ -524,8 +513,7 @@ $result_trees{'index_table'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_table.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -560,8 +548,7 @@ $result_trees{'index_table'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_table.texi',
-                        'line_nr' => 23,
-                        'macro' => ''
+                        'line_nr' => 23
                       }
                     }
                   ],
@@ -612,8 +599,7 @@ $result_trees{'index_table'} = {
               },
               'source_info' => {
                 'file_name' => 'index_table.texi',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               }
             }
           ],
@@ -627,8 +613,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 21,
-            'macro' => ''
+            'line_nr' => 21
           }
         },
         {
@@ -657,8 +642,7 @@ $result_trees{'index_table'} = {
                   'cmdname' => 'bullet',
                   'source_info' => {
                     'file_name' => 'index_table.texi',
-                    'line_nr' => 28,
-                    'macro' => ''
+                    'line_nr' => 28
                   },
                   'type' => 'command_as_argument'
                 }
@@ -710,8 +694,7 @@ $result_trees{'index_table'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_table.texi',
-                        'line_nr' => 29,
-                        'macro' => ''
+                        'line_nr' => 29
                       }
                     },
                     {
@@ -746,8 +729,7 @@ $result_trees{'index_table'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_table.texi',
-                        'line_nr' => 30,
-                        'macro' => ''
+                        'line_nr' => 30
                       }
                     }
                   ],
@@ -806,8 +788,7 @@ $result_trees{'index_table'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_table.texi',
-                        'line_nr' => 32,
-                        'macro' => ''
+                        'line_nr' => 32
                       }
                     }
                   ],
@@ -858,8 +839,7 @@ $result_trees{'index_table'} = {
               },
               'source_info' => {
                 'file_name' => 'index_table.texi',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             }
           ],
@@ -873,8 +853,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 28,
-            'macro' => ''
+            'line_nr' => 28
           }
         },
         {
@@ -893,8 +872,7 @@ $result_trees{'index_table'} = {
       },
       'source_info' => {
         'file_name' => 'index_table.texi',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -927,8 +905,7 @@ $result_trees{'index_table'} = {
       },
       'source_info' => {
         'file_name' => 'index_table.texi',
-        'line_nr' => 36,
-        'macro' => ''
+        'line_nr' => 36
       }
     },
     {
@@ -985,8 +962,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 39,
-            'macro' => ''
+            'line_nr' => 39
           }
         },
         {
@@ -1019,8 +995,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 40,
-            'macro' => ''
+            'line_nr' => 40
           }
         },
         {
@@ -1053,8 +1028,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 41,
-            'macro' => ''
+            'line_nr' => 41
           }
         },
         {
@@ -1073,8 +1047,7 @@ $result_trees{'index_table'} = {
       },
       'source_info' => {
         'file_name' => 'index_table.texi',
-        'line_nr' => 37,
-        'macro' => ''
+        'line_nr' => 37
       }
     },
     {
@@ -1107,8 +1080,7 @@ $result_trees{'index_table'} = {
       },
       'source_info' => {
         'file_name' => 'index_table.texi',
-        'line_nr' => 43,
-        'macro' => ''
+        'line_nr' => 43
       }
     },
     {
@@ -1187,8 +1159,7 @@ $result_trees{'index_table'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_table.texi',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               },
               'type' => 'menu_entry'
             },
@@ -1220,15 +1191,13 @@ $result_trees{'index_table'} = {
               },
               'source_info' => {
                 'file_name' => 'index_table.texi',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 45,
-            'macro' => ''
+            'line_nr' => 45
           }
         },
         {
@@ -1264,8 +1233,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 48,
-            'macro' => ''
+            'line_nr' => 48
           },
           'type' => 'index_entry_command'
         },
@@ -1302,8 +1270,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 49,
-            'macro' => ''
+            'line_nr' => 49
           },
           'type' => 'index_entry_command'
         },
@@ -1340,8 +1307,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 50,
-            'macro' => ''
+            'line_nr' => 50
           },
           'type' => 'index_entry_command'
         },
@@ -1378,8 +1344,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 51,
-            'macro' => ''
+            'line_nr' => 51
           },
           'type' => 'index_entry_command'
         },
@@ -1416,8 +1381,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 52,
-            'macro' => ''
+            'line_nr' => 52
           },
           'type' => 'index_entry_command'
         },
@@ -1454,8 +1418,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 53,
-            'macro' => ''
+            'line_nr' => 53
           },
           'type' => 'index_entry_command'
         },
@@ -1492,8 +1455,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 54,
-            'macro' => ''
+            'line_nr' => 54
           },
           'type' => 'index_entry_command'
         },
@@ -1530,8 +1492,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 55,
-            'macro' => ''
+            'line_nr' => 55
           },
           'type' => 'index_entry_command'
         },
@@ -1568,8 +1529,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 56,
-            'macro' => ''
+            'line_nr' => 56
           },
           'type' => 'index_entry_command'
         },
@@ -1606,8 +1566,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 57,
-            'macro' => ''
+            'line_nr' => 57
           },
           'type' => 'index_entry_command'
         },
@@ -1644,8 +1603,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 58,
-            'macro' => ''
+            'line_nr' => 58
           },
           'type' => 'index_entry_command'
         },
@@ -1682,8 +1640,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 59,
-            'macro' => ''
+            'line_nr' => 59
           },
           'type' => 'index_entry_command'
         },
@@ -1720,8 +1677,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 60,
-            'macro' => ''
+            'line_nr' => 60
           },
           'type' => 'index_entry_command'
         },
@@ -1758,8 +1714,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 61,
-            'macro' => ''
+            'line_nr' => 61
           },
           'type' => 'index_entry_command'
         },
@@ -1796,8 +1751,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 62,
-            'macro' => ''
+            'line_nr' => 62
           },
           'type' => 'index_entry_command'
         },
@@ -1834,8 +1788,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 63,
-            'macro' => ''
+            'line_nr' => 63
           },
           'type' => 'index_entry_command'
         },
@@ -1872,8 +1825,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 64,
-            'macro' => ''
+            'line_nr' => 64
           },
           'type' => 'index_entry_command'
         },
@@ -1910,8 +1862,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 65,
-            'macro' => ''
+            'line_nr' => 65
           },
           'type' => 'index_entry_command'
         },
@@ -1948,8 +1899,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 66,
-            'macro' => ''
+            'line_nr' => 66
           },
           'type' => 'index_entry_command'
         },
@@ -1986,8 +1936,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 67,
-            'macro' => ''
+            'line_nr' => 67
           },
           'type' => 'index_entry_command'
         },
@@ -2024,8 +1973,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 68,
-            'macro' => ''
+            'line_nr' => 68
           },
           'type' => 'index_entry_command'
         },
@@ -2062,8 +2010,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 69,
-            'macro' => ''
+            'line_nr' => 69
           },
           'type' => 'index_entry_command'
         },
@@ -2100,8 +2047,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 70,
-            'macro' => ''
+            'line_nr' => 70
           },
           'type' => 'index_entry_command'
         },
@@ -2138,8 +2084,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 71,
-            'macro' => ''
+            'line_nr' => 71
           },
           'type' => 'index_entry_command'
         },
@@ -2176,8 +2121,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 72,
-            'macro' => ''
+            'line_nr' => 72
           },
           'type' => 'index_entry_command'
         },
@@ -2214,8 +2158,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 73,
-            'macro' => ''
+            'line_nr' => 73
           },
           'type' => 'index_entry_command'
         },
@@ -2252,8 +2195,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 74,
-            'macro' => ''
+            'line_nr' => 74
           },
           'type' => 'index_entry_command'
         },
@@ -2290,8 +2232,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 75,
-            'macro' => ''
+            'line_nr' => 75
           },
           'type' => 'index_entry_command'
         },
@@ -2328,8 +2269,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 76,
-            'macro' => ''
+            'line_nr' => 76
           },
           'type' => 'index_entry_command'
         },
@@ -2366,8 +2306,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 77,
-            'macro' => ''
+            'line_nr' => 77
           },
           'type' => 'index_entry_command'
         },
@@ -2404,8 +2343,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 78,
-            'macro' => ''
+            'line_nr' => 78
           },
           'type' => 'index_entry_command'
         },
@@ -2442,8 +2380,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 79,
-            'macro' => ''
+            'line_nr' => 79
           },
           'type' => 'index_entry_command'
         },
@@ -2480,8 +2417,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 80,
-            'macro' => ''
+            'line_nr' => 80
           },
           'type' => 'index_entry_command'
         },
@@ -2518,8 +2454,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 81,
-            'macro' => ''
+            'line_nr' => 81
           },
           'type' => 'index_entry_command'
         },
@@ -2556,8 +2491,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 82,
-            'macro' => ''
+            'line_nr' => 82
           },
           'type' => 'index_entry_command'
         },
@@ -2594,8 +2528,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 83,
-            'macro' => ''
+            'line_nr' => 83
           },
           'type' => 'index_entry_command'
         },
@@ -2632,8 +2565,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 84,
-            'macro' => ''
+            'line_nr' => 84
           },
           'type' => 'index_entry_command'
         },
@@ -2670,8 +2602,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 85,
-            'macro' => ''
+            'line_nr' => 85
           },
           'type' => 'index_entry_command'
         },
@@ -2708,8 +2639,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 86,
-            'macro' => ''
+            'line_nr' => 86
           },
           'type' => 'index_entry_command'
         },
@@ -2746,8 +2676,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 87,
-            'macro' => ''
+            'line_nr' => 87
           },
           'type' => 'index_entry_command'
         },
@@ -2784,8 +2713,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 88,
-            'macro' => ''
+            'line_nr' => 88
           },
           'type' => 'index_entry_command'
         },
@@ -2822,8 +2750,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 89,
-            'macro' => ''
+            'line_nr' => 89
           },
           'type' => 'index_entry_command'
         },
@@ -2860,8 +2787,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 90,
-            'macro' => ''
+            'line_nr' => 90
           },
           'type' => 'index_entry_command'
         },
@@ -2898,8 +2824,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 91,
-            'macro' => ''
+            'line_nr' => 91
           },
           'type' => 'index_entry_command'
         },
@@ -2936,8 +2861,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 92,
-            'macro' => ''
+            'line_nr' => 92
           },
           'type' => 'index_entry_command'
         },
@@ -2974,8 +2898,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 93,
-            'macro' => ''
+            'line_nr' => 93
           },
           'type' => 'index_entry_command'
         },
@@ -3012,8 +2935,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 94,
-            'macro' => ''
+            'line_nr' => 94
           },
           'type' => 'index_entry_command'
         },
@@ -3050,8 +2972,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 95,
-            'macro' => ''
+            'line_nr' => 95
           },
           'type' => 'index_entry_command'
         },
@@ -3088,8 +3009,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 96,
-            'macro' => ''
+            'line_nr' => 96
           },
           'type' => 'index_entry_command'
         },
@@ -3126,8 +3046,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 97,
-            'macro' => ''
+            'line_nr' => 97
           },
           'type' => 'index_entry_command'
         },
@@ -3164,8 +3083,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 98,
-            'macro' => ''
+            'line_nr' => 98
           },
           'type' => 'index_entry_command'
         },
@@ -3202,8 +3120,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 99,
-            'macro' => ''
+            'line_nr' => 99
           },
           'type' => 'index_entry_command'
         },
@@ -3240,8 +3157,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 100,
-            'macro' => ''
+            'line_nr' => 100
           },
           'type' => 'index_entry_command'
         },
@@ -3278,8 +3194,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 101,
-            'macro' => ''
+            'line_nr' => 101
           },
           'type' => 'index_entry_command'
         },
@@ -3316,8 +3231,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 102,
-            'macro' => ''
+            'line_nr' => 102
           },
           'type' => 'index_entry_command'
         },
@@ -3354,8 +3268,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 103,
-            'macro' => ''
+            'line_nr' => 103
           },
           'type' => 'index_entry_command'
         },
@@ -3392,8 +3305,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 104,
-            'macro' => ''
+            'line_nr' => 104
           },
           'type' => 'index_entry_command'
         },
@@ -3430,8 +3342,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 105,
-            'macro' => ''
+            'line_nr' => 105
           },
           'type' => 'index_entry_command'
         },
@@ -3468,8 +3379,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 106,
-            'macro' => ''
+            'line_nr' => 106
           },
           'type' => 'index_entry_command'
         },
@@ -3506,8 +3416,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 107,
-            'macro' => ''
+            'line_nr' => 107
           },
           'type' => 'index_entry_command'
         },
@@ -3544,8 +3453,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 108,
-            'macro' => ''
+            'line_nr' => 108
           },
           'type' => 'index_entry_command'
         },
@@ -3582,8 +3490,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 109,
-            'macro' => ''
+            'line_nr' => 109
           },
           'type' => 'index_entry_command'
         },
@@ -3620,8 +3527,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 110,
-            'macro' => ''
+            'line_nr' => 110
           },
           'type' => 'index_entry_command'
         },
@@ -3658,8 +3564,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 111,
-            'macro' => ''
+            'line_nr' => 111
           },
           'type' => 'index_entry_command'
         },
@@ -3696,8 +3601,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 112,
-            'macro' => ''
+            'line_nr' => 112
           },
           'type' => 'index_entry_command'
         },
@@ -3734,8 +3638,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 113,
-            'macro' => ''
+            'line_nr' => 113
           },
           'type' => 'index_entry_command'
         },
@@ -3772,8 +3675,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 114,
-            'macro' => ''
+            'line_nr' => 114
           },
           'type' => 'index_entry_command'
         },
@@ -3810,8 +3712,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 115,
-            'macro' => ''
+            'line_nr' => 115
           },
           'type' => 'index_entry_command'
         },
@@ -3848,8 +3749,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 116,
-            'macro' => ''
+            'line_nr' => 116
           },
           'type' => 'index_entry_command'
         },
@@ -3886,8 +3786,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 117,
-            'macro' => ''
+            'line_nr' => 117
           },
           'type' => 'index_entry_command'
         },
@@ -3924,8 +3823,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 118,
-            'macro' => ''
+            'line_nr' => 118
           },
           'type' => 'index_entry_command'
         },
@@ -3962,8 +3860,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 119,
-            'macro' => ''
+            'line_nr' => 119
           },
           'type' => 'index_entry_command'
         },
@@ -4000,8 +3897,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 120,
-            'macro' => ''
+            'line_nr' => 120
           },
           'type' => 'index_entry_command'
         },
@@ -4038,8 +3934,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 121,
-            'macro' => ''
+            'line_nr' => 121
           },
           'type' => 'index_entry_command'
         },
@@ -4076,8 +3971,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 122,
-            'macro' => ''
+            'line_nr' => 122
           },
           'type' => 'index_entry_command'
         },
@@ -4114,8 +4008,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 123,
-            'macro' => ''
+            'line_nr' => 123
           },
           'type' => 'index_entry_command'
         },
@@ -4152,8 +4045,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 124,
-            'macro' => ''
+            'line_nr' => 124
           },
           'type' => 'index_entry_command'
         },
@@ -4190,8 +4082,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 125,
-            'macro' => ''
+            'line_nr' => 125
           },
           'type' => 'index_entry_command'
         },
@@ -4228,8 +4119,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 126,
-            'macro' => ''
+            'line_nr' => 126
           },
           'type' => 'index_entry_command'
         },
@@ -4266,8 +4156,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 127,
-            'macro' => ''
+            'line_nr' => 127
           },
           'type' => 'index_entry_command'
         },
@@ -4304,8 +4193,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 128,
-            'macro' => ''
+            'line_nr' => 128
           },
           'type' => 'index_entry_command'
         },
@@ -4342,8 +4230,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 129,
-            'macro' => ''
+            'line_nr' => 129
           },
           'type' => 'index_entry_command'
         },
@@ -4380,8 +4267,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 130,
-            'macro' => ''
+            'line_nr' => 130
           },
           'type' => 'index_entry_command'
         },
@@ -4418,8 +4304,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 131,
-            'macro' => ''
+            'line_nr' => 131
           },
           'type' => 'index_entry_command'
         },
@@ -4456,8 +4341,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 132,
-            'macro' => ''
+            'line_nr' => 132
           },
           'type' => 'index_entry_command'
         },
@@ -4494,8 +4378,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 133,
-            'macro' => ''
+            'line_nr' => 133
           },
           'type' => 'index_entry_command'
         },
@@ -4532,8 +4415,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 134,
-            'macro' => ''
+            'line_nr' => 134
           },
           'type' => 'index_entry_command'
         },
@@ -4570,8 +4452,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 135,
-            'macro' => ''
+            'line_nr' => 135
           },
           'type' => 'index_entry_command'
         },
@@ -4608,8 +4489,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 136,
-            'macro' => ''
+            'line_nr' => 136
           },
           'type' => 'index_entry_command'
         },
@@ -4646,8 +4526,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 137,
-            'macro' => ''
+            'line_nr' => 137
           },
           'type' => 'index_entry_command'
         },
@@ -4684,8 +4563,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 138,
-            'macro' => ''
+            'line_nr' => 138
           },
           'type' => 'index_entry_command'
         },
@@ -4722,8 +4600,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 139,
-            'macro' => ''
+            'line_nr' => 139
           },
           'type' => 'index_entry_command'
         },
@@ -4760,8 +4637,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 140,
-            'macro' => ''
+            'line_nr' => 140
           },
           'type' => 'index_entry_command'
         },
@@ -4798,8 +4674,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 141,
-            'macro' => ''
+            'line_nr' => 141
           },
           'type' => 'index_entry_command'
         },
@@ -4836,8 +4711,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 142,
-            'macro' => ''
+            'line_nr' => 142
           },
           'type' => 'index_entry_command'
         },
@@ -4874,8 +4748,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 143,
-            'macro' => ''
+            'line_nr' => 143
           },
           'type' => 'index_entry_command'
         },
@@ -4912,8 +4785,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 144,
-            'macro' => ''
+            'line_nr' => 144
           },
           'type' => 'index_entry_command'
         },
@@ -4950,8 +4822,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 145,
-            'macro' => ''
+            'line_nr' => 145
           },
           'type' => 'index_entry_command'
         },
@@ -4988,8 +4859,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 146,
-            'macro' => ''
+            'line_nr' => 146
           },
           'type' => 'index_entry_command'
         },
@@ -5026,8 +4896,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 147,
-            'macro' => ''
+            'line_nr' => 147
           },
           'type' => 'index_entry_command'
         },
@@ -5064,8 +4933,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 148,
-            'macro' => ''
+            'line_nr' => 148
           },
           'type' => 'index_entry_command'
         },
@@ -5102,8 +4970,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 149,
-            'macro' => ''
+            'line_nr' => 149
           },
           'type' => 'index_entry_command'
         },
@@ -5140,8 +5007,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 150,
-            'macro' => ''
+            'line_nr' => 150
           },
           'type' => 'index_entry_command'
         },
@@ -5178,8 +5044,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 151,
-            'macro' => ''
+            'line_nr' => 151
           },
           'type' => 'index_entry_command'
         },
@@ -5216,8 +5081,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 152,
-            'macro' => ''
+            'line_nr' => 152
           },
           'type' => 'index_entry_command'
         },
@@ -5254,8 +5118,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 153,
-            'macro' => ''
+            'line_nr' => 153
           },
           'type' => 'index_entry_command'
         },
@@ -5292,8 +5155,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 154,
-            'macro' => ''
+            'line_nr' => 154
           },
           'type' => 'index_entry_command'
         },
@@ -5330,8 +5192,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 155,
-            'macro' => ''
+            'line_nr' => 155
           },
           'type' => 'index_entry_command'
         },
@@ -5368,8 +5229,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 156,
-            'macro' => ''
+            'line_nr' => 156
           },
           'type' => 'index_entry_command'
         },
@@ -5406,8 +5266,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 157,
-            'macro' => ''
+            'line_nr' => 157
           },
           'type' => 'index_entry_command'
         },
@@ -5444,8 +5303,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 158,
-            'macro' => ''
+            'line_nr' => 158
           },
           'type' => 'index_entry_command'
         },
@@ -5482,8 +5340,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 159,
-            'macro' => ''
+            'line_nr' => 159
           },
           'type' => 'index_entry_command'
         },
@@ -5520,8 +5377,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 160,
-            'macro' => ''
+            'line_nr' => 160
           },
           'type' => 'index_entry_command'
         },
@@ -5558,8 +5414,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 161,
-            'macro' => ''
+            'line_nr' => 161
           },
           'type' => 'index_entry_command'
         },
@@ -5596,8 +5451,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 162,
-            'macro' => ''
+            'line_nr' => 162
           },
           'type' => 'index_entry_command'
         },
@@ -5634,8 +5488,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 163,
-            'macro' => ''
+            'line_nr' => 163
           },
           'type' => 'index_entry_command'
         },
@@ -5672,8 +5525,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 164,
-            'macro' => ''
+            'line_nr' => 164
           },
           'type' => 'index_entry_command'
         },
@@ -5710,8 +5562,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 165,
-            'macro' => ''
+            'line_nr' => 165
           },
           'type' => 'index_entry_command'
         },
@@ -5748,8 +5599,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 166,
-            'macro' => ''
+            'line_nr' => 166
           },
           'type' => 'index_entry_command'
         },
@@ -5786,8 +5636,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 167,
-            'macro' => ''
+            'line_nr' => 167
           },
           'type' => 'index_entry_command'
         },
@@ -5824,8 +5673,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 168,
-            'macro' => ''
+            'line_nr' => 168
           },
           'type' => 'index_entry_command'
         },
@@ -5862,8 +5710,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 169,
-            'macro' => ''
+            'line_nr' => 169
           },
           'type' => 'index_entry_command'
         },
@@ -5900,8 +5747,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 170,
-            'macro' => ''
+            'line_nr' => 170
           },
           'type' => 'index_entry_command'
         },
@@ -5938,8 +5784,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 171,
-            'macro' => ''
+            'line_nr' => 171
           },
           'type' => 'index_entry_command'
         },
@@ -5976,8 +5821,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 172,
-            'macro' => ''
+            'line_nr' => 172
           },
           'type' => 'index_entry_command'
         },
@@ -6014,8 +5858,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 173,
-            'macro' => ''
+            'line_nr' => 173
           },
           'type' => 'index_entry_command'
         },
@@ -6052,8 +5895,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 174,
-            'macro' => ''
+            'line_nr' => 174
           },
           'type' => 'index_entry_command'
         },
@@ -6090,8 +5932,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 175,
-            'macro' => ''
+            'line_nr' => 175
           },
           'type' => 'index_entry_command'
         },
@@ -6150,8 +5991,7 @@ $result_trees{'index_table'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 179,
-            'macro' => ''
+            'line_nr' => 179
           }
         },
         {
@@ -6170,8 +6010,7 @@ $result_trees{'index_table'} = {
       },
       'source_info' => {
         'file_name' => 'index_table.texi',
-        'line_nr' => 44,
-        'macro' => ''
+        'line_nr' => 44
       }
     },
     {
@@ -6212,8 +6051,7 @@ $result_trees{'index_table'} = {
       },
       'source_info' => {
         'file_name' => 'index_table.texi',
-        'line_nr' => 181,
-        'macro' => ''
+        'line_nr' => 181
       }
     },
     {
@@ -6265,8 +6103,7 @@ $result_trees{'index_table'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 186,
-            'macro' => ''
+            'line_nr' => 186
           }
         }
       ],
@@ -6280,8 +6117,7 @@ $result_trees{'index_table'} = {
       },
       'source_info' => {
         'file_name' => 'index_table.texi',
-        'line_nr' => 182,
-        'macro' => ''
+        'line_nr' => 182
       }
     },
     {
@@ -6942,7 +6778,6 @@ $result_errors{'index_table'} = [
 ',
     'file_name' => 'index_table.texi',
     'line_nr' => 21,
-    'macro' => '',
     'text' => 'command @bullet not accepting argument in brace should not be 
on @vtable line',
     'type' => 'error'
   },
@@ -6951,7 +6786,6 @@ $result_errors{'index_table'} = [
 ',
     'file_name' => 'index_table.texi',
     'line_nr' => 28,
-    'macro' => '',
     'text' => 'command @bullet not accepting argument in brace should not be 
on @ftable line',
     'type' => 'error'
   }
diff --git a/tp/t/results/indices/index_table_chapter_no_node.pl 
b/tp/t/results/indices/index_table_chapter_no_node.pl
index 981e242b84..9fa3164e98 100644
--- a/tp/t/results/indices/index_table_chapter_no_node.pl
+++ b/tp/t/results/indices/index_table_chapter_no_node.pl
@@ -59,8 +59,7 @@ $result_trees{'index_table_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'index_table.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -139,8 +138,7 @@ $result_trees{'index_table_chapter_no_node'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_table.texi',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -187,8 +185,7 @@ $result_trees{'index_table_chapter_no_node'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_table.texi',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -235,8 +232,7 @@ $result_trees{'index_table_chapter_no_node'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_table.texi',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               },
               'type' => 'menu_entry'
             },
@@ -268,15 +264,13 @@ $result_trees{'index_table_chapter_no_node'} = {
               },
               'source_info' => {
                 'file_name' => 'index_table.texi',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -293,8 +287,7 @@ $result_trees{'index_table_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'index_table.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -326,8 +319,7 @@ $result_trees{'index_table_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'index_table.texi',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -387,8 +379,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           },
           'type' => 'index_entry_command'
         },
@@ -436,8 +427,7 @@ $result_trees{'index_table_chapter_no_node'} = {
               },
               'source_info' => {
                 'file_name' => 'index_table.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               },
               'type' => 'index_entry_command'
             }
@@ -471,8 +461,7 @@ $result_trees{'index_table_chapter_no_node'} = {
                   'cmdname' => 'bullet',
                   'source_info' => {
                     'file_name' => 'index_table.texi',
-                    'line_nr' => 21,
-                    'macro' => ''
+                    'line_nr' => 21
                   },
                   'type' => 'command_as_argument'
                 }
@@ -524,8 +513,7 @@ $result_trees{'index_table_chapter_no_node'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_table.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -560,8 +548,7 @@ $result_trees{'index_table_chapter_no_node'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_table.texi',
-                        'line_nr' => 23,
-                        'macro' => ''
+                        'line_nr' => 23
                       }
                     }
                   ],
@@ -612,8 +599,7 @@ $result_trees{'index_table_chapter_no_node'} = {
               },
               'source_info' => {
                 'file_name' => 'index_table.texi',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               }
             }
           ],
@@ -627,8 +613,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 21,
-            'macro' => ''
+            'line_nr' => 21
           }
         },
         {
@@ -657,8 +642,7 @@ $result_trees{'index_table_chapter_no_node'} = {
                   'cmdname' => 'bullet',
                   'source_info' => {
                     'file_name' => 'index_table.texi',
-                    'line_nr' => 28,
-                    'macro' => ''
+                    'line_nr' => 28
                   },
                   'type' => 'command_as_argument'
                 }
@@ -710,8 +694,7 @@ $result_trees{'index_table_chapter_no_node'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_table.texi',
-                        'line_nr' => 29,
-                        'macro' => ''
+                        'line_nr' => 29
                       }
                     },
                     {
@@ -746,8 +729,7 @@ $result_trees{'index_table_chapter_no_node'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_table.texi',
-                        'line_nr' => 30,
-                        'macro' => ''
+                        'line_nr' => 30
                       }
                     }
                   ],
@@ -806,8 +788,7 @@ $result_trees{'index_table_chapter_no_node'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_table.texi',
-                        'line_nr' => 32,
-                        'macro' => ''
+                        'line_nr' => 32
                       }
                     }
                   ],
@@ -858,8 +839,7 @@ $result_trees{'index_table_chapter_no_node'} = {
               },
               'source_info' => {
                 'file_name' => 'index_table.texi',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             }
           ],
@@ -873,8 +853,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 28,
-            'macro' => ''
+            'line_nr' => 28
           }
         },
         {
@@ -893,8 +872,7 @@ $result_trees{'index_table_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'index_table.texi',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -927,8 +905,7 @@ $result_trees{'index_table_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'index_table.texi',
-        'line_nr' => 36,
-        'macro' => ''
+        'line_nr' => 36
       }
     },
     {
@@ -985,8 +962,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 39,
-            'macro' => ''
+            'line_nr' => 39
           }
         },
         {
@@ -1019,8 +995,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 40,
-            'macro' => ''
+            'line_nr' => 40
           }
         },
         {
@@ -1053,8 +1028,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 41,
-            'macro' => ''
+            'line_nr' => 41
           }
         },
         {
@@ -1073,8 +1047,7 @@ $result_trees{'index_table_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'index_table.texi',
-        'line_nr' => 37,
-        'macro' => ''
+        'line_nr' => 37
       }
     },
     {
@@ -1107,8 +1080,7 @@ $result_trees{'index_table_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'index_table.texi',
-        'line_nr' => 43,
-        'macro' => ''
+        'line_nr' => 43
       }
     },
     {
@@ -1187,8 +1159,7 @@ $result_trees{'index_table_chapter_no_node'} = {
               ],
               'source_info' => {
                 'file_name' => 'index_table.texi',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               },
               'type' => 'menu_entry'
             },
@@ -1220,15 +1191,13 @@ $result_trees{'index_table_chapter_no_node'} = {
               },
               'source_info' => {
                 'file_name' => 'index_table.texi',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 45,
-            'macro' => ''
+            'line_nr' => 45
           }
         },
         {
@@ -1264,8 +1233,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 48,
-            'macro' => ''
+            'line_nr' => 48
           },
           'type' => 'index_entry_command'
         },
@@ -1302,8 +1270,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 49,
-            'macro' => ''
+            'line_nr' => 49
           },
           'type' => 'index_entry_command'
         },
@@ -1340,8 +1307,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 50,
-            'macro' => ''
+            'line_nr' => 50
           },
           'type' => 'index_entry_command'
         },
@@ -1378,8 +1344,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 51,
-            'macro' => ''
+            'line_nr' => 51
           },
           'type' => 'index_entry_command'
         },
@@ -1416,8 +1381,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 52,
-            'macro' => ''
+            'line_nr' => 52
           },
           'type' => 'index_entry_command'
         },
@@ -1454,8 +1418,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 53,
-            'macro' => ''
+            'line_nr' => 53
           },
           'type' => 'index_entry_command'
         },
@@ -1492,8 +1455,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 54,
-            'macro' => ''
+            'line_nr' => 54
           },
           'type' => 'index_entry_command'
         },
@@ -1530,8 +1492,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 55,
-            'macro' => ''
+            'line_nr' => 55
           },
           'type' => 'index_entry_command'
         },
@@ -1568,8 +1529,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 56,
-            'macro' => ''
+            'line_nr' => 56
           },
           'type' => 'index_entry_command'
         },
@@ -1606,8 +1566,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 57,
-            'macro' => ''
+            'line_nr' => 57
           },
           'type' => 'index_entry_command'
         },
@@ -1644,8 +1603,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 58,
-            'macro' => ''
+            'line_nr' => 58
           },
           'type' => 'index_entry_command'
         },
@@ -1682,8 +1640,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 59,
-            'macro' => ''
+            'line_nr' => 59
           },
           'type' => 'index_entry_command'
         },
@@ -1720,8 +1677,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 60,
-            'macro' => ''
+            'line_nr' => 60
           },
           'type' => 'index_entry_command'
         },
@@ -1758,8 +1714,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 61,
-            'macro' => ''
+            'line_nr' => 61
           },
           'type' => 'index_entry_command'
         },
@@ -1796,8 +1751,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 62,
-            'macro' => ''
+            'line_nr' => 62
           },
           'type' => 'index_entry_command'
         },
@@ -1834,8 +1788,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 63,
-            'macro' => ''
+            'line_nr' => 63
           },
           'type' => 'index_entry_command'
         },
@@ -1872,8 +1825,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 64,
-            'macro' => ''
+            'line_nr' => 64
           },
           'type' => 'index_entry_command'
         },
@@ -1910,8 +1862,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 65,
-            'macro' => ''
+            'line_nr' => 65
           },
           'type' => 'index_entry_command'
         },
@@ -1948,8 +1899,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 66,
-            'macro' => ''
+            'line_nr' => 66
           },
           'type' => 'index_entry_command'
         },
@@ -1986,8 +1936,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 67,
-            'macro' => ''
+            'line_nr' => 67
           },
           'type' => 'index_entry_command'
         },
@@ -2024,8 +1973,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 68,
-            'macro' => ''
+            'line_nr' => 68
           },
           'type' => 'index_entry_command'
         },
@@ -2062,8 +2010,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 69,
-            'macro' => ''
+            'line_nr' => 69
           },
           'type' => 'index_entry_command'
         },
@@ -2100,8 +2047,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 70,
-            'macro' => ''
+            'line_nr' => 70
           },
           'type' => 'index_entry_command'
         },
@@ -2138,8 +2084,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 71,
-            'macro' => ''
+            'line_nr' => 71
           },
           'type' => 'index_entry_command'
         },
@@ -2176,8 +2121,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 72,
-            'macro' => ''
+            'line_nr' => 72
           },
           'type' => 'index_entry_command'
         },
@@ -2214,8 +2158,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 73,
-            'macro' => ''
+            'line_nr' => 73
           },
           'type' => 'index_entry_command'
         },
@@ -2252,8 +2195,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 74,
-            'macro' => ''
+            'line_nr' => 74
           },
           'type' => 'index_entry_command'
         },
@@ -2290,8 +2232,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 75,
-            'macro' => ''
+            'line_nr' => 75
           },
           'type' => 'index_entry_command'
         },
@@ -2328,8 +2269,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 76,
-            'macro' => ''
+            'line_nr' => 76
           },
           'type' => 'index_entry_command'
         },
@@ -2366,8 +2306,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 77,
-            'macro' => ''
+            'line_nr' => 77
           },
           'type' => 'index_entry_command'
         },
@@ -2404,8 +2343,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 78,
-            'macro' => ''
+            'line_nr' => 78
           },
           'type' => 'index_entry_command'
         },
@@ -2442,8 +2380,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 79,
-            'macro' => ''
+            'line_nr' => 79
           },
           'type' => 'index_entry_command'
         },
@@ -2480,8 +2417,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 80,
-            'macro' => ''
+            'line_nr' => 80
           },
           'type' => 'index_entry_command'
         },
@@ -2518,8 +2454,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 81,
-            'macro' => ''
+            'line_nr' => 81
           },
           'type' => 'index_entry_command'
         },
@@ -2556,8 +2491,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 82,
-            'macro' => ''
+            'line_nr' => 82
           },
           'type' => 'index_entry_command'
         },
@@ -2594,8 +2528,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 83,
-            'macro' => ''
+            'line_nr' => 83
           },
           'type' => 'index_entry_command'
         },
@@ -2632,8 +2565,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 84,
-            'macro' => ''
+            'line_nr' => 84
           },
           'type' => 'index_entry_command'
         },
@@ -2670,8 +2602,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 85,
-            'macro' => ''
+            'line_nr' => 85
           },
           'type' => 'index_entry_command'
         },
@@ -2708,8 +2639,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 86,
-            'macro' => ''
+            'line_nr' => 86
           },
           'type' => 'index_entry_command'
         },
@@ -2746,8 +2676,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 87,
-            'macro' => ''
+            'line_nr' => 87
           },
           'type' => 'index_entry_command'
         },
@@ -2784,8 +2713,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 88,
-            'macro' => ''
+            'line_nr' => 88
           },
           'type' => 'index_entry_command'
         },
@@ -2822,8 +2750,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 89,
-            'macro' => ''
+            'line_nr' => 89
           },
           'type' => 'index_entry_command'
         },
@@ -2860,8 +2787,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 90,
-            'macro' => ''
+            'line_nr' => 90
           },
           'type' => 'index_entry_command'
         },
@@ -2898,8 +2824,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 91,
-            'macro' => ''
+            'line_nr' => 91
           },
           'type' => 'index_entry_command'
         },
@@ -2936,8 +2861,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 92,
-            'macro' => ''
+            'line_nr' => 92
           },
           'type' => 'index_entry_command'
         },
@@ -2974,8 +2898,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 93,
-            'macro' => ''
+            'line_nr' => 93
           },
           'type' => 'index_entry_command'
         },
@@ -3012,8 +2935,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 94,
-            'macro' => ''
+            'line_nr' => 94
           },
           'type' => 'index_entry_command'
         },
@@ -3050,8 +2972,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 95,
-            'macro' => ''
+            'line_nr' => 95
           },
           'type' => 'index_entry_command'
         },
@@ -3088,8 +3009,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 96,
-            'macro' => ''
+            'line_nr' => 96
           },
           'type' => 'index_entry_command'
         },
@@ -3126,8 +3046,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 97,
-            'macro' => ''
+            'line_nr' => 97
           },
           'type' => 'index_entry_command'
         },
@@ -3164,8 +3083,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 98,
-            'macro' => ''
+            'line_nr' => 98
           },
           'type' => 'index_entry_command'
         },
@@ -3202,8 +3120,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 99,
-            'macro' => ''
+            'line_nr' => 99
           },
           'type' => 'index_entry_command'
         },
@@ -3240,8 +3157,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 100,
-            'macro' => ''
+            'line_nr' => 100
           },
           'type' => 'index_entry_command'
         },
@@ -3278,8 +3194,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 101,
-            'macro' => ''
+            'line_nr' => 101
           },
           'type' => 'index_entry_command'
         },
@@ -3316,8 +3231,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 102,
-            'macro' => ''
+            'line_nr' => 102
           },
           'type' => 'index_entry_command'
         },
@@ -3354,8 +3268,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 103,
-            'macro' => ''
+            'line_nr' => 103
           },
           'type' => 'index_entry_command'
         },
@@ -3392,8 +3305,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 104,
-            'macro' => ''
+            'line_nr' => 104
           },
           'type' => 'index_entry_command'
         },
@@ -3430,8 +3342,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 105,
-            'macro' => ''
+            'line_nr' => 105
           },
           'type' => 'index_entry_command'
         },
@@ -3468,8 +3379,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 106,
-            'macro' => ''
+            'line_nr' => 106
           },
           'type' => 'index_entry_command'
         },
@@ -3506,8 +3416,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 107,
-            'macro' => ''
+            'line_nr' => 107
           },
           'type' => 'index_entry_command'
         },
@@ -3544,8 +3453,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 108,
-            'macro' => ''
+            'line_nr' => 108
           },
           'type' => 'index_entry_command'
         },
@@ -3582,8 +3490,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 109,
-            'macro' => ''
+            'line_nr' => 109
           },
           'type' => 'index_entry_command'
         },
@@ -3620,8 +3527,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 110,
-            'macro' => ''
+            'line_nr' => 110
           },
           'type' => 'index_entry_command'
         },
@@ -3658,8 +3564,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 111,
-            'macro' => ''
+            'line_nr' => 111
           },
           'type' => 'index_entry_command'
         },
@@ -3696,8 +3601,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 112,
-            'macro' => ''
+            'line_nr' => 112
           },
           'type' => 'index_entry_command'
         },
@@ -3734,8 +3638,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 113,
-            'macro' => ''
+            'line_nr' => 113
           },
           'type' => 'index_entry_command'
         },
@@ -3772,8 +3675,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 114,
-            'macro' => ''
+            'line_nr' => 114
           },
           'type' => 'index_entry_command'
         },
@@ -3810,8 +3712,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 115,
-            'macro' => ''
+            'line_nr' => 115
           },
           'type' => 'index_entry_command'
         },
@@ -3848,8 +3749,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 116,
-            'macro' => ''
+            'line_nr' => 116
           },
           'type' => 'index_entry_command'
         },
@@ -3886,8 +3786,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 117,
-            'macro' => ''
+            'line_nr' => 117
           },
           'type' => 'index_entry_command'
         },
@@ -3924,8 +3823,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 118,
-            'macro' => ''
+            'line_nr' => 118
           },
           'type' => 'index_entry_command'
         },
@@ -3962,8 +3860,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 119,
-            'macro' => ''
+            'line_nr' => 119
           },
           'type' => 'index_entry_command'
         },
@@ -4000,8 +3897,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 120,
-            'macro' => ''
+            'line_nr' => 120
           },
           'type' => 'index_entry_command'
         },
@@ -4038,8 +3934,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 121,
-            'macro' => ''
+            'line_nr' => 121
           },
           'type' => 'index_entry_command'
         },
@@ -4076,8 +3971,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 122,
-            'macro' => ''
+            'line_nr' => 122
           },
           'type' => 'index_entry_command'
         },
@@ -4114,8 +4008,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 123,
-            'macro' => ''
+            'line_nr' => 123
           },
           'type' => 'index_entry_command'
         },
@@ -4152,8 +4045,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 124,
-            'macro' => ''
+            'line_nr' => 124
           },
           'type' => 'index_entry_command'
         },
@@ -4190,8 +4082,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 125,
-            'macro' => ''
+            'line_nr' => 125
           },
           'type' => 'index_entry_command'
         },
@@ -4228,8 +4119,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 126,
-            'macro' => ''
+            'line_nr' => 126
           },
           'type' => 'index_entry_command'
         },
@@ -4266,8 +4156,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 127,
-            'macro' => ''
+            'line_nr' => 127
           },
           'type' => 'index_entry_command'
         },
@@ -4304,8 +4193,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 128,
-            'macro' => ''
+            'line_nr' => 128
           },
           'type' => 'index_entry_command'
         },
@@ -4342,8 +4230,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 129,
-            'macro' => ''
+            'line_nr' => 129
           },
           'type' => 'index_entry_command'
         },
@@ -4380,8 +4267,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 130,
-            'macro' => ''
+            'line_nr' => 130
           },
           'type' => 'index_entry_command'
         },
@@ -4418,8 +4304,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 131,
-            'macro' => ''
+            'line_nr' => 131
           },
           'type' => 'index_entry_command'
         },
@@ -4456,8 +4341,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 132,
-            'macro' => ''
+            'line_nr' => 132
           },
           'type' => 'index_entry_command'
         },
@@ -4494,8 +4378,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 133,
-            'macro' => ''
+            'line_nr' => 133
           },
           'type' => 'index_entry_command'
         },
@@ -4532,8 +4415,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 134,
-            'macro' => ''
+            'line_nr' => 134
           },
           'type' => 'index_entry_command'
         },
@@ -4570,8 +4452,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 135,
-            'macro' => ''
+            'line_nr' => 135
           },
           'type' => 'index_entry_command'
         },
@@ -4608,8 +4489,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 136,
-            'macro' => ''
+            'line_nr' => 136
           },
           'type' => 'index_entry_command'
         },
@@ -4646,8 +4526,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 137,
-            'macro' => ''
+            'line_nr' => 137
           },
           'type' => 'index_entry_command'
         },
@@ -4684,8 +4563,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 138,
-            'macro' => ''
+            'line_nr' => 138
           },
           'type' => 'index_entry_command'
         },
@@ -4722,8 +4600,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 139,
-            'macro' => ''
+            'line_nr' => 139
           },
           'type' => 'index_entry_command'
         },
@@ -4760,8 +4637,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 140,
-            'macro' => ''
+            'line_nr' => 140
           },
           'type' => 'index_entry_command'
         },
@@ -4798,8 +4674,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 141,
-            'macro' => ''
+            'line_nr' => 141
           },
           'type' => 'index_entry_command'
         },
@@ -4836,8 +4711,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 142,
-            'macro' => ''
+            'line_nr' => 142
           },
           'type' => 'index_entry_command'
         },
@@ -4874,8 +4748,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 143,
-            'macro' => ''
+            'line_nr' => 143
           },
           'type' => 'index_entry_command'
         },
@@ -4912,8 +4785,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 144,
-            'macro' => ''
+            'line_nr' => 144
           },
           'type' => 'index_entry_command'
         },
@@ -4950,8 +4822,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 145,
-            'macro' => ''
+            'line_nr' => 145
           },
           'type' => 'index_entry_command'
         },
@@ -4988,8 +4859,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 146,
-            'macro' => ''
+            'line_nr' => 146
           },
           'type' => 'index_entry_command'
         },
@@ -5026,8 +4896,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 147,
-            'macro' => ''
+            'line_nr' => 147
           },
           'type' => 'index_entry_command'
         },
@@ -5064,8 +4933,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 148,
-            'macro' => ''
+            'line_nr' => 148
           },
           'type' => 'index_entry_command'
         },
@@ -5102,8 +4970,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 149,
-            'macro' => ''
+            'line_nr' => 149
           },
           'type' => 'index_entry_command'
         },
@@ -5140,8 +5007,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 150,
-            'macro' => ''
+            'line_nr' => 150
           },
           'type' => 'index_entry_command'
         },
@@ -5178,8 +5044,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 151,
-            'macro' => ''
+            'line_nr' => 151
           },
           'type' => 'index_entry_command'
         },
@@ -5216,8 +5081,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 152,
-            'macro' => ''
+            'line_nr' => 152
           },
           'type' => 'index_entry_command'
         },
@@ -5254,8 +5118,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 153,
-            'macro' => ''
+            'line_nr' => 153
           },
           'type' => 'index_entry_command'
         },
@@ -5292,8 +5155,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 154,
-            'macro' => ''
+            'line_nr' => 154
           },
           'type' => 'index_entry_command'
         },
@@ -5330,8 +5192,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 155,
-            'macro' => ''
+            'line_nr' => 155
           },
           'type' => 'index_entry_command'
         },
@@ -5368,8 +5229,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 156,
-            'macro' => ''
+            'line_nr' => 156
           },
           'type' => 'index_entry_command'
         },
@@ -5406,8 +5266,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 157,
-            'macro' => ''
+            'line_nr' => 157
           },
           'type' => 'index_entry_command'
         },
@@ -5444,8 +5303,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 158,
-            'macro' => ''
+            'line_nr' => 158
           },
           'type' => 'index_entry_command'
         },
@@ -5482,8 +5340,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 159,
-            'macro' => ''
+            'line_nr' => 159
           },
           'type' => 'index_entry_command'
         },
@@ -5520,8 +5377,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 160,
-            'macro' => ''
+            'line_nr' => 160
           },
           'type' => 'index_entry_command'
         },
@@ -5558,8 +5414,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 161,
-            'macro' => ''
+            'line_nr' => 161
           },
           'type' => 'index_entry_command'
         },
@@ -5596,8 +5451,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 162,
-            'macro' => ''
+            'line_nr' => 162
           },
           'type' => 'index_entry_command'
         },
@@ -5634,8 +5488,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 163,
-            'macro' => ''
+            'line_nr' => 163
           },
           'type' => 'index_entry_command'
         },
@@ -5672,8 +5525,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 164,
-            'macro' => ''
+            'line_nr' => 164
           },
           'type' => 'index_entry_command'
         },
@@ -5710,8 +5562,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 165,
-            'macro' => ''
+            'line_nr' => 165
           },
           'type' => 'index_entry_command'
         },
@@ -5748,8 +5599,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 166,
-            'macro' => ''
+            'line_nr' => 166
           },
           'type' => 'index_entry_command'
         },
@@ -5786,8 +5636,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 167,
-            'macro' => ''
+            'line_nr' => 167
           },
           'type' => 'index_entry_command'
         },
@@ -5824,8 +5673,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 168,
-            'macro' => ''
+            'line_nr' => 168
           },
           'type' => 'index_entry_command'
         },
@@ -5862,8 +5710,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 169,
-            'macro' => ''
+            'line_nr' => 169
           },
           'type' => 'index_entry_command'
         },
@@ -5900,8 +5747,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 170,
-            'macro' => ''
+            'line_nr' => 170
           },
           'type' => 'index_entry_command'
         },
@@ -5938,8 +5784,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 171,
-            'macro' => ''
+            'line_nr' => 171
           },
           'type' => 'index_entry_command'
         },
@@ -5976,8 +5821,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 172,
-            'macro' => ''
+            'line_nr' => 172
           },
           'type' => 'index_entry_command'
         },
@@ -6014,8 +5858,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 173,
-            'macro' => ''
+            'line_nr' => 173
           },
           'type' => 'index_entry_command'
         },
@@ -6052,8 +5895,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 174,
-            'macro' => ''
+            'line_nr' => 174
           },
           'type' => 'index_entry_command'
         },
@@ -6090,8 +5932,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 175,
-            'macro' => ''
+            'line_nr' => 175
           },
           'type' => 'index_entry_command'
         },
@@ -6150,8 +5991,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 179,
-            'macro' => ''
+            'line_nr' => 179
           }
         },
         {
@@ -6170,8 +6010,7 @@ $result_trees{'index_table_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'index_table.texi',
-        'line_nr' => 44,
-        'macro' => ''
+        'line_nr' => 44
       }
     },
     {
@@ -6212,8 +6051,7 @@ $result_trees{'index_table_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'index_table.texi',
-        'line_nr' => 181,
-        'macro' => ''
+        'line_nr' => 181
       }
     },
     {
@@ -6265,8 +6103,7 @@ $result_trees{'index_table_chapter_no_node'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'index_table.texi',
-            'line_nr' => 186,
-            'macro' => ''
+            'line_nr' => 186
           }
         }
       ],
@@ -6280,8 +6117,7 @@ $result_trees{'index_table_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'index_table.texi',
-        'line_nr' => 182,
-        'macro' => ''
+        'line_nr' => 182
       }
     },
     {
@@ -6942,7 +6778,6 @@ $result_errors{'index_table_chapter_no_node'} = [
 ',
     'file_name' => 'index_table.texi',
     'line_nr' => 21,
-    'macro' => '',
     'text' => 'command @bullet not accepting argument in brace should not be 
on @vtable line',
     'type' => 'error'
   },
@@ -6951,7 +6786,6 @@ $result_errors{'index_table_chapter_no_node'} = [
 ',
     'file_name' => 'index_table.texi',
     'line_nr' => 28,
-    'macro' => '',
     'text' => 'command @bullet not accepting argument in brace should not be 
on @ftable line',
     'type' => 'error'
   }
diff --git 
a/tp/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl 
b/tp/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl
index af219a0aaf..281b798b8f 100644
--- a/tp/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl
+++ b/tp/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl
@@ -44,8 +44,7 @@ $result_trees{'multiple_index_text_sortas_seeentry_seealso'} 
= {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -71,8 +70,7 @@ $result_trees{'multiple_index_text_sortas_seeentry_seealso'} 
= {
       'extra' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -105,8 +103,7 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -157,8 +154,7 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
                   'cmdname' => 'sortas',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 },
                 {
@@ -185,8 +181,7 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
                   'cmdname' => 'seeentry',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 },
                 {
@@ -214,8 +209,7 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
                   'cmdname' => 'seealso',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
@@ -247,8 +241,7 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           },
           'type' => 'index_entry_command'
         },
@@ -276,8 +269,7 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
                   'cmdname' => 'sortas',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 8,
-                    'macro' => ''
+                    'line_nr' => 8
                   }
                 },
                 {
@@ -314,8 +306,7 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           },
           'type' => 'index_entry_command'
         },
@@ -343,8 +334,7 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
                   'cmdname' => 'seeentry',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 },
                 {
@@ -381,8 +371,7 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           },
           'type' => 'index_entry_command'
         },
@@ -421,8 +410,7 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         }
       ],
@@ -436,8 +424,7 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
diff --git a/tp/t/results/indices/nodes_before_top.pl 
b/tp/t/results/indices/nodes_before_top.pl
index af4126df66..8bb668be09 100644
--- a/tp/t/results/indices/nodes_before_top.pl
+++ b/tp/t/results/indices/nodes_before_top.pl
@@ -154,8 +154,7 @@ $result_trees{'nodes_before_top'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           },
           'type' => 'index_entry_command'
         },
@@ -189,8 +188,7 @@ $result_trees{'nodes_before_top'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -259,8 +257,7 @@ $result_trees{'nodes_before_top'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -292,15 +289,13 @@ $result_trees{'nodes_before_top'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -321,8 +316,7 @@ $result_trees{'nodes_before_top'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -404,8 +398,7 @@ $result_trees{'nodes_before_top'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           },
           'type' => 'index_entry_command'
         },
@@ -439,8 +432,7 @@ $result_trees{'nodes_before_top'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -490,8 +482,7 @@ $result_trees{'nodes_before_top'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           },
           'type' => 'index_entry_command'
         },
@@ -518,8 +509,7 @@ $result_trees{'nodes_before_top'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top.texi',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -598,8 +588,7 @@ $result_trees{'nodes_before_top'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 24,
-            'macro' => ''
+            'line_nr' => 24
           },
           'type' => 'index_entry_command'
         },
@@ -638,8 +627,7 @@ $result_trees{'nodes_before_top'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         },
         {
@@ -677,8 +665,7 @@ $result_trees{'nodes_before_top'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 28,
-            'macro' => ''
+            'line_nr' => 28
           }
         },
         {
@@ -730,8 +717,7 @@ $result_trees{'nodes_before_top'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 32,
-            'macro' => ''
+            'line_nr' => 32
           }
         },
         {
@@ -796,8 +782,7 @@ $result_trees{'nodes_before_top'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               },
               'type' => 'menu_entry'
             },
@@ -829,15 +814,13 @@ $result_trees{'nodes_before_top'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 34,
-            'macro' => ''
+            'line_nr' => 34
           }
         },
         {
@@ -858,8 +841,7 @@ $result_trees{'nodes_before_top'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top.texi',
-        'line_nr' => 23,
-        'macro' => ''
+        'line_nr' => 23
       }
     },
     {
@@ -958,8 +940,7 @@ $result_trees{'nodes_before_top'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               },
               'type' => 'index_entry_command'
             },
@@ -996,8 +977,7 @@ $result_trees{'nodes_before_top'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
-                'line_nr' => 41,
-                'macro' => ''
+                'line_nr' => 41
               },
               'type' => 'index_entry_command'
             },
@@ -1034,8 +1014,7 @@ $result_trees{'nodes_before_top'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               },
               'type' => 'index_entry_command'
             }
@@ -1077,8 +1056,7 @@ $result_trees{'nodes_before_top'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 44,
-            'macro' => ''
+            'line_nr' => 44
           }
         },
         {
@@ -1143,8 +1121,7 @@ $result_trees{'nodes_before_top'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               },
               'type' => 'menu_entry'
             },
@@ -1176,15 +1153,13 @@ $result_trees{'nodes_before_top'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 46,
-            'macro' => ''
+            'line_nr' => 46
           }
         },
         {
@@ -1205,8 +1180,7 @@ $result_trees{'nodes_before_top'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top.texi',
-        'line_nr' => 38,
-        'macro' => ''
+        'line_nr' => 38
       }
     },
     {
@@ -1307,8 +1281,7 @@ $result_trees{'nodes_before_top'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               },
               'type' => 'menu_entry'
             },
@@ -1355,8 +1328,7 @@ $result_trees{'nodes_before_top'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               },
               'type' => 'menu_entry'
             },
@@ -1388,15 +1360,13 @@ $result_trees{'nodes_before_top'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
-                'line_nr' => 54,
-                'macro' => ''
+                'line_nr' => 54
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 51,
-            'macro' => ''
+            'line_nr' => 51
           }
         },
         {
@@ -1434,8 +1404,7 @@ $result_trees{'nodes_before_top'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 56,
-            'macro' => ''
+            'line_nr' => 56
           }
         },
         {
@@ -1456,8 +1425,7 @@ $result_trees{'nodes_before_top'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top.texi',
-        'line_nr' => 50,
-        'macro' => ''
+        'line_nr' => 50
       }
     },
     {
@@ -1565,8 +1533,7 @@ $result_trees{'nodes_before_top'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 60,
-            'macro' => ''
+            'line_nr' => 60
           },
           'type' => 'index_entry_command'
         },
@@ -1603,8 +1570,7 @@ $result_trees{'nodes_before_top'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 61,
-            'macro' => ''
+            'line_nr' => 61
           },
           'type' => 'index_entry_command'
         },
@@ -1641,8 +1607,7 @@ $result_trees{'nodes_before_top'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 62,
-            'macro' => ''
+            'line_nr' => 62
           },
           'type' => 'index_entry_command'
         },
@@ -1663,8 +1628,7 @@ $result_trees{'nodes_before_top'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top.texi',
-        'line_nr' => 58,
-        'macro' => ''
+        'line_nr' => 58
       }
     },
     {
@@ -1764,8 +1728,7 @@ $result_trees{'nodes_before_top'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 65,
-            'macro' => ''
+            'line_nr' => 65
           },
           'type' => 'index_entry_command'
         },
@@ -1804,8 +1767,7 @@ $result_trees{'nodes_before_top'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 67,
-            'macro' => ''
+            'line_nr' => 67
           }
         },
         {
@@ -1846,8 +1808,7 @@ $result_trees{'nodes_before_top'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 69,
-            'macro' => ''
+            'line_nr' => 69
           },
           'type' => 'index_entry_command'
         },
@@ -1884,8 +1845,7 @@ $result_trees{'nodes_before_top'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 70,
-            'macro' => ''
+            'line_nr' => 70
           },
           'type' => 'index_entry_command'
         },
@@ -1924,8 +1884,7 @@ $result_trees{'nodes_before_top'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 72,
-            'macro' => ''
+            'line_nr' => 72
           }
         },
         {
@@ -1946,8 +1905,7 @@ $result_trees{'nodes_before_top'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top.texi',
-        'line_nr' => 64,
-        'macro' => ''
+        'line_nr' => 64
       }
     },
     {
diff --git a/tp/t/results/indices/nodes_before_top_and_sections_chapter.pl 
b/tp/t/results/indices/nodes_before_top_and_sections_chapter.pl
index fdf060b7b6..65fd4b71d2 100644
--- a/tp/t/results/indices/nodes_before_top_and_sections_chapter.pl
+++ b/tp/t/results/indices/nodes_before_top_and_sections_chapter.pl
@@ -132,8 +132,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           },
           'type' => 'index_entry_command'
         },
@@ -181,8 +180,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -224,8 +222,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -294,8 +291,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               },
               'type' => 'menu_entry'
             },
@@ -327,15 +323,13 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -356,8 +350,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -439,8 +432,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           },
           'type' => 'index_entry_command'
         },
@@ -483,8 +475,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         },
         {
@@ -534,8 +525,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 22,
-            'macro' => ''
+            'line_nr' => 22
           },
           'type' => 'index_entry_command'
         },
@@ -562,8 +552,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -642,8 +631,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           },
           'type' => 'index_entry_command'
         },
@@ -686,8 +674,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 28,
-            'macro' => ''
+            'line_nr' => 28
           }
         },
         {
@@ -725,8 +712,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 30,
-            'macro' => ''
+            'line_nr' => 30
           }
         },
         {
@@ -778,8 +764,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 34,
-            'macro' => ''
+            'line_nr' => 34
           }
         },
         {
@@ -800,8 +785,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
@@ -856,8 +840,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 37,
-            'macro' => ''
+            'line_nr' => 37
           },
           'type' => 'index_entry_command'
         },
@@ -937,8 +920,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               },
               'type' => 'menu_entry'
             },
@@ -985,8 +967,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               },
               'type' => 'menu_entry'
             },
@@ -1033,8 +1014,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               },
               'type' => 'menu_entry'
             },
@@ -1066,15 +1046,13 @@ $result_trees{'nodes_before_top_and_sections_chapter'} 
= {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 45,
-                'macro' => ''
+                'line_nr' => 45
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 41,
-            'macro' => ''
+            'line_nr' => 41
           }
         },
         {
@@ -1091,8 +1069,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 36,
-        'macro' => ''
+        'line_nr' => 36
       }
     },
     {
@@ -1191,8 +1168,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               },
               'type' => 'index_entry_command'
             },
@@ -1229,8 +1205,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               },
               'type' => 'index_entry_command'
             },
@@ -1267,8 +1242,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 51,
-                'macro' => ''
+                'line_nr' => 51
               },
               'type' => 'index_entry_command'
             }
@@ -1310,8 +1284,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 53,
-            'macro' => ''
+            'line_nr' => 53
           }
         },
         {
@@ -1376,8 +1349,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               },
               'type' => 'menu_entry'
             },
@@ -1409,15 +1381,13 @@ $result_trees{'nodes_before_top_and_sections_chapter'} 
= {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 57,
-                'macro' => ''
+                'line_nr' => 57
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 55,
-            'macro' => ''
+            'line_nr' => 55
           }
         },
         {
@@ -1438,8 +1408,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 47,
-        'macro' => ''
+        'line_nr' => 47
       }
     },
     {
@@ -1540,8 +1509,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               },
               'type' => 'menu_entry'
             },
@@ -1588,8 +1556,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               },
               'type' => 'menu_entry'
             },
@@ -1621,15 +1588,13 @@ $result_trees{'nodes_before_top_and_sections_chapter'} 
= {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 63,
-                'macro' => ''
+                'line_nr' => 63
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 60,
-            'macro' => ''
+            'line_nr' => 60
           }
         },
         {
@@ -1667,8 +1632,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 65,
-            'macro' => ''
+            'line_nr' => 65
           }
         },
         {
@@ -1689,8 +1653,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 59,
-        'macro' => ''
+        'line_nr' => 59
       }
     },
     {
@@ -1798,8 +1761,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 69,
-            'macro' => ''
+            'line_nr' => 69
           },
           'type' => 'index_entry_command'
         },
@@ -1836,8 +1798,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 70,
-            'macro' => ''
+            'line_nr' => 70
           },
           'type' => 'index_entry_command'
         },
@@ -1874,8 +1835,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 71,
-            'macro' => ''
+            'line_nr' => 71
           },
           'type' => 'index_entry_command'
         },
@@ -1896,8 +1856,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 67,
-        'macro' => ''
+        'line_nr' => 67
       }
     },
     {
@@ -1997,8 +1956,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 74,
-            'macro' => ''
+            'line_nr' => 74
           },
           'type' => 'index_entry_command'
         },
@@ -2037,8 +1995,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 76,
-            'macro' => ''
+            'line_nr' => 76
           }
         },
         {
@@ -2079,8 +2036,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 78,
-            'macro' => ''
+            'line_nr' => 78
           },
           'type' => 'index_entry_command'
         },
@@ -2117,8 +2073,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 79,
-            'macro' => ''
+            'line_nr' => 79
           },
           'type' => 'index_entry_command'
         },
@@ -2157,8 +2112,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 81,
-            'macro' => ''
+            'line_nr' => 81
           }
         },
         {
@@ -2179,8 +2133,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 73,
-        'macro' => ''
+        'line_nr' => 73
       }
     },
     {
@@ -2248,8 +2201,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 83,
-        'macro' => ''
+        'line_nr' => 83
       }
     },
     {
@@ -2306,8 +2258,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 86,
-            'macro' => ''
+            'line_nr' => 86
           }
         },
         {
@@ -2326,8 +2277,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 84,
-        'macro' => ''
+        'line_nr' => 84
       }
     },
     {
@@ -2427,8 +2377,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 90,
-            'macro' => ''
+            'line_nr' => 90
           },
           'type' => 'index_entry_command'
         },
@@ -2449,8 +2398,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 88,
-        'macro' => ''
+        'line_nr' => 88
       }
     },
     {
diff --git 
a/tp/t/results/indices/nodes_before_top_and_sections_chapter_no_node.pl 
b/tp/t/results/indices/nodes_before_top_and_sections_chapter_no_node.pl
index 5af01984a6..4d4c060756 100644
--- a/tp/t/results/indices/nodes_before_top_and_sections_chapter_no_node.pl
+++ b/tp/t/results/indices/nodes_before_top_and_sections_chapter_no_node.pl
@@ -132,8 +132,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           },
           'type' => 'index_entry_command'
         },
@@ -181,8 +180,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -224,8 +222,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -294,8 +291,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               },
               'type' => 'menu_entry'
             },
@@ -327,15 +323,13 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -356,8 +350,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -439,8 +432,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           },
           'type' => 'index_entry_command'
         },
@@ -483,8 +475,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         },
         {
@@ -534,8 +525,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 22,
-            'macro' => ''
+            'line_nr' => 22
           },
           'type' => 'index_entry_command'
         },
@@ -562,8 +552,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -642,8 +631,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           },
           'type' => 'index_entry_command'
         },
@@ -686,8 +674,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 28,
-            'macro' => ''
+            'line_nr' => 28
           }
         },
         {
@@ -725,8 +712,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 30,
-            'macro' => ''
+            'line_nr' => 30
           }
         },
         {
@@ -778,8 +764,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 34,
-            'macro' => ''
+            'line_nr' => 34
           }
         },
         {
@@ -800,8 +785,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
@@ -856,8 +840,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 37,
-            'macro' => ''
+            'line_nr' => 37
           },
           'type' => 'index_entry_command'
         },
@@ -937,8 +920,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               },
               'type' => 'menu_entry'
             },
@@ -985,8 +967,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               },
               'type' => 'menu_entry'
             },
@@ -1033,8 +1014,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               },
               'type' => 'menu_entry'
             },
@@ -1066,15 +1046,13 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 45,
-                'macro' => ''
+                'line_nr' => 45
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 41,
-            'macro' => ''
+            'line_nr' => 41
           }
         },
         {
@@ -1091,8 +1069,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 36,
-        'macro' => ''
+        'line_nr' => 36
       }
     },
     {
@@ -1191,8 +1168,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               },
               'type' => 'index_entry_command'
             },
@@ -1229,8 +1205,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               },
               'type' => 'index_entry_command'
             },
@@ -1267,8 +1242,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 51,
-                'macro' => ''
+                'line_nr' => 51
               },
               'type' => 'index_entry_command'
             }
@@ -1310,8 +1284,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 53,
-            'macro' => ''
+            'line_nr' => 53
           }
         },
         {
@@ -1376,8 +1349,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               },
               'type' => 'menu_entry'
             },
@@ -1409,15 +1381,13 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 57,
-                'macro' => ''
+                'line_nr' => 57
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 55,
-            'macro' => ''
+            'line_nr' => 55
           }
         },
         {
@@ -1438,8 +1408,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 47,
-        'macro' => ''
+        'line_nr' => 47
       }
     },
     {
@@ -1540,8 +1509,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               },
               'type' => 'menu_entry'
             },
@@ -1588,8 +1556,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               },
               'type' => 'menu_entry'
             },
@@ -1621,15 +1588,13 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 63,
-                'macro' => ''
+                'line_nr' => 63
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 60,
-            'macro' => ''
+            'line_nr' => 60
           }
         },
         {
@@ -1667,8 +1632,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 65,
-            'macro' => ''
+            'line_nr' => 65
           }
         },
         {
@@ -1689,8 +1653,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 59,
-        'macro' => ''
+        'line_nr' => 59
       }
     },
     {
@@ -1798,8 +1761,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 69,
-            'macro' => ''
+            'line_nr' => 69
           },
           'type' => 'index_entry_command'
         },
@@ -1836,8 +1798,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 70,
-            'macro' => ''
+            'line_nr' => 70
           },
           'type' => 'index_entry_command'
         },
@@ -1874,8 +1835,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 71,
-            'macro' => ''
+            'line_nr' => 71
           },
           'type' => 'index_entry_command'
         },
@@ -1896,8 +1856,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 67,
-        'macro' => ''
+        'line_nr' => 67
       }
     },
     {
@@ -1997,8 +1956,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 74,
-            'macro' => ''
+            'line_nr' => 74
           },
           'type' => 'index_entry_command'
         },
@@ -2037,8 +1995,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 76,
-            'macro' => ''
+            'line_nr' => 76
           }
         },
         {
@@ -2079,8 +2036,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 78,
-            'macro' => ''
+            'line_nr' => 78
           },
           'type' => 'index_entry_command'
         },
@@ -2117,8 +2073,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 79,
-            'macro' => ''
+            'line_nr' => 79
           },
           'type' => 'index_entry_command'
         },
@@ -2157,8 +2112,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 81,
-            'macro' => ''
+            'line_nr' => 81
           }
         },
         {
@@ -2179,8 +2133,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 73,
-        'macro' => ''
+        'line_nr' => 73
       }
     },
     {
@@ -2248,8 +2201,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 83,
-        'macro' => ''
+        'line_nr' => 83
       }
     },
     {
@@ -2306,8 +2258,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 86,
-            'macro' => ''
+            'line_nr' => 86
           }
         },
         {
@@ -2326,8 +2277,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 84,
-        'macro' => ''
+        'line_nr' => 84
       }
     },
     {
@@ -2427,8 +2377,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 90,
-            'macro' => ''
+            'line_nr' => 90
           },
           'type' => 'index_entry_command'
         },
@@ -2449,8 +2398,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 88,
-        'macro' => ''
+        'line_nr' => 88
       }
     },
     {
diff --git 
a/tp/t/results/indices/nodes_before_top_and_sections_unsplit_no_nodes.pl 
b/tp/t/results/indices/nodes_before_top_and_sections_unsplit_no_nodes.pl
index 914c763d27..223623a1dd 100644
--- a/tp/t/results/indices/nodes_before_top_and_sections_unsplit_no_nodes.pl
+++ b/tp/t/results/indices/nodes_before_top_and_sections_unsplit_no_nodes.pl
@@ -132,8 +132,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           },
           'type' => 'index_entry_command'
         },
@@ -181,8 +180,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -224,8 +222,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -294,8 +291,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               },
               'type' => 'menu_entry'
             },
@@ -327,15 +323,13 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -356,8 +350,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -439,8 +432,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           },
           'type' => 'index_entry_command'
         },
@@ -483,8 +475,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         },
         {
@@ -534,8 +525,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 22,
-            'macro' => ''
+            'line_nr' => 22
           },
           'type' => 'index_entry_command'
         },
@@ -562,8 +552,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -642,8 +631,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           },
           'type' => 'index_entry_command'
         },
@@ -686,8 +674,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 28,
-            'macro' => ''
+            'line_nr' => 28
           }
         },
         {
@@ -725,8 +712,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 30,
-            'macro' => ''
+            'line_nr' => 30
           }
         },
         {
@@ -778,8 +764,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 34,
-            'macro' => ''
+            'line_nr' => 34
           }
         },
         {
@@ -800,8 +785,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
@@ -856,8 +840,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 37,
-            'macro' => ''
+            'line_nr' => 37
           },
           'type' => 'index_entry_command'
         },
@@ -937,8 +920,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               },
               'type' => 'menu_entry'
             },
@@ -985,8 +967,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               },
               'type' => 'menu_entry'
             },
@@ -1033,8 +1014,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               },
               'type' => 'menu_entry'
             },
@@ -1066,15 +1046,13 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 45,
-                'macro' => ''
+                'line_nr' => 45
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 41,
-            'macro' => ''
+            'line_nr' => 41
           }
         },
         {
@@ -1091,8 +1069,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 36,
-        'macro' => ''
+        'line_nr' => 36
       }
     },
     {
@@ -1191,8 +1168,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               },
               'type' => 'index_entry_command'
             },
@@ -1229,8 +1205,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               },
               'type' => 'index_entry_command'
             },
@@ -1267,8 +1242,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 51,
-                'macro' => ''
+                'line_nr' => 51
               },
               'type' => 'index_entry_command'
             }
@@ -1310,8 +1284,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 53,
-            'macro' => ''
+            'line_nr' => 53
           }
         },
         {
@@ -1376,8 +1349,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               },
               'type' => 'menu_entry'
             },
@@ -1409,15 +1381,13 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 57,
-                'macro' => ''
+                'line_nr' => 57
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 55,
-            'macro' => ''
+            'line_nr' => 55
           }
         },
         {
@@ -1438,8 +1408,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 47,
-        'macro' => ''
+        'line_nr' => 47
       }
     },
     {
@@ -1540,8 +1509,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               },
               'type' => 'menu_entry'
             },
@@ -1588,8 +1556,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               },
               'type' => 'menu_entry'
             },
@@ -1621,15 +1588,13 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 63,
-                'macro' => ''
+                'line_nr' => 63
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 60,
-            'macro' => ''
+            'line_nr' => 60
           }
         },
         {
@@ -1667,8 +1632,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 65,
-            'macro' => ''
+            'line_nr' => 65
           }
         },
         {
@@ -1689,8 +1653,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 59,
-        'macro' => ''
+        'line_nr' => 59
       }
     },
     {
@@ -1798,8 +1761,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 69,
-            'macro' => ''
+            'line_nr' => 69
           },
           'type' => 'index_entry_command'
         },
@@ -1836,8 +1798,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 70,
-            'macro' => ''
+            'line_nr' => 70
           },
           'type' => 'index_entry_command'
         },
@@ -1874,8 +1835,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 71,
-            'macro' => ''
+            'line_nr' => 71
           },
           'type' => 'index_entry_command'
         },
@@ -1896,8 +1856,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 67,
-        'macro' => ''
+        'line_nr' => 67
       }
     },
     {
@@ -1997,8 +1956,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 74,
-            'macro' => ''
+            'line_nr' => 74
           },
           'type' => 'index_entry_command'
         },
@@ -2037,8 +1995,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 76,
-            'macro' => ''
+            'line_nr' => 76
           }
         },
         {
@@ -2079,8 +2036,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 78,
-            'macro' => ''
+            'line_nr' => 78
           },
           'type' => 'index_entry_command'
         },
@@ -2117,8 +2073,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 79,
-            'macro' => ''
+            'line_nr' => 79
           },
           'type' => 'index_entry_command'
         },
@@ -2157,8 +2112,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 81,
-            'macro' => ''
+            'line_nr' => 81
           }
         },
         {
@@ -2179,8 +2133,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 73,
-        'macro' => ''
+        'line_nr' => 73
       }
     },
     {
@@ -2248,8 +2201,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 83,
-        'macro' => ''
+        'line_nr' => 83
       }
     },
     {
@@ -2306,8 +2258,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 86,
-            'macro' => ''
+            'line_nr' => 86
           }
         },
         {
@@ -2326,8 +2277,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 84,
-        'macro' => ''
+        'line_nr' => 84
       }
     },
     {
@@ -2427,8 +2377,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 90,
-            'macro' => ''
+            'line_nr' => 90
           },
           'type' => 'index_entry_command'
         },
@@ -2449,8 +2398,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 88,
-        'macro' => ''
+        'line_nr' => 88
       }
     },
     {
diff --git a/tp/t/results/indices/nodes_before_top_split_chapter.pl 
b/tp/t/results/indices/nodes_before_top_split_chapter.pl
index 22a0644253..a09bb39c99 100644
--- a/tp/t/results/indices/nodes_before_top_split_chapter.pl
+++ b/tp/t/results/indices/nodes_before_top_split_chapter.pl
@@ -154,8 +154,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           },
           'type' => 'index_entry_command'
         },
@@ -189,8 +188,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -259,8 +257,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -292,15 +289,13 @@ $result_trees{'nodes_before_top_split_chapter'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -321,8 +316,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -404,8 +398,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           },
           'type' => 'index_entry_command'
         },
@@ -439,8 +432,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -490,8 +482,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           },
           'type' => 'index_entry_command'
         },
@@ -518,8 +509,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top.texi',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -598,8 +588,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 24,
-            'macro' => ''
+            'line_nr' => 24
           },
           'type' => 'index_entry_command'
         },
@@ -638,8 +627,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         },
         {
@@ -677,8 +665,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 28,
-            'macro' => ''
+            'line_nr' => 28
           }
         },
         {
@@ -730,8 +717,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 32,
-            'macro' => ''
+            'line_nr' => 32
           }
         },
         {
@@ -796,8 +782,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               },
               'type' => 'menu_entry'
             },
@@ -829,15 +814,13 @@ $result_trees{'nodes_before_top_split_chapter'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 34,
-            'macro' => ''
+            'line_nr' => 34
           }
         },
         {
@@ -858,8 +841,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top.texi',
-        'line_nr' => 23,
-        'macro' => ''
+        'line_nr' => 23
       }
     },
     {
@@ -958,8 +940,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               },
               'type' => 'index_entry_command'
             },
@@ -996,8 +977,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
-                'line_nr' => 41,
-                'macro' => ''
+                'line_nr' => 41
               },
               'type' => 'index_entry_command'
             },
@@ -1034,8 +1014,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               },
               'type' => 'index_entry_command'
             }
@@ -1077,8 +1056,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 44,
-            'macro' => ''
+            'line_nr' => 44
           }
         },
         {
@@ -1143,8 +1121,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               },
               'type' => 'menu_entry'
             },
@@ -1176,15 +1153,13 @@ $result_trees{'nodes_before_top_split_chapter'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 46,
-            'macro' => ''
+            'line_nr' => 46
           }
         },
         {
@@ -1205,8 +1180,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top.texi',
-        'line_nr' => 38,
-        'macro' => ''
+        'line_nr' => 38
       }
     },
     {
@@ -1307,8 +1281,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               },
               'type' => 'menu_entry'
             },
@@ -1355,8 +1328,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               },
               'type' => 'menu_entry'
             },
@@ -1388,15 +1360,13 @@ $result_trees{'nodes_before_top_split_chapter'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
-                'line_nr' => 54,
-                'macro' => ''
+                'line_nr' => 54
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 51,
-            'macro' => ''
+            'line_nr' => 51
           }
         },
         {
@@ -1434,8 +1404,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 56,
-            'macro' => ''
+            'line_nr' => 56
           }
         },
         {
@@ -1456,8 +1425,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top.texi',
-        'line_nr' => 50,
-        'macro' => ''
+        'line_nr' => 50
       }
     },
     {
@@ -1565,8 +1533,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 60,
-            'macro' => ''
+            'line_nr' => 60
           },
           'type' => 'index_entry_command'
         },
@@ -1603,8 +1570,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 61,
-            'macro' => ''
+            'line_nr' => 61
           },
           'type' => 'index_entry_command'
         },
@@ -1641,8 +1607,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 62,
-            'macro' => ''
+            'line_nr' => 62
           },
           'type' => 'index_entry_command'
         },
@@ -1663,8 +1628,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top.texi',
-        'line_nr' => 58,
-        'macro' => ''
+        'line_nr' => 58
       }
     },
     {
@@ -1764,8 +1728,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 65,
-            'macro' => ''
+            'line_nr' => 65
           },
           'type' => 'index_entry_command'
         },
@@ -1804,8 +1767,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 67,
-            'macro' => ''
+            'line_nr' => 67
           }
         },
         {
@@ -1846,8 +1808,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 69,
-            'macro' => ''
+            'line_nr' => 69
           },
           'type' => 'index_entry_command'
         },
@@ -1884,8 +1845,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 70,
-            'macro' => ''
+            'line_nr' => 70
           },
           'type' => 'index_entry_command'
         },
@@ -1924,8 +1884,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 72,
-            'macro' => ''
+            'line_nr' => 72
           }
         },
         {
@@ -1946,8 +1905,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top.texi',
-        'line_nr' => 64,
-        'macro' => ''
+        'line_nr' => 64
       }
     },
     {
diff --git a/tp/t/results/indices/nodes_before_top_split_chapter_no_nodes.pl 
b/tp/t/results/indices/nodes_before_top_split_chapter_no_nodes.pl
index 6f74d83506..71aa877cd6 100644
--- a/tp/t/results/indices/nodes_before_top_split_chapter_no_nodes.pl
+++ b/tp/t/results/indices/nodes_before_top_split_chapter_no_nodes.pl
@@ -154,8 +154,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           },
           'type' => 'index_entry_command'
         },
@@ -189,8 +188,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -259,8 +257,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -292,15 +289,13 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -321,8 +316,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -404,8 +398,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           },
           'type' => 'index_entry_command'
         },
@@ -439,8 +432,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -490,8 +482,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           },
           'type' => 'index_entry_command'
         },
@@ -518,8 +509,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top.texi',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -598,8 +588,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 24,
-            'macro' => ''
+            'line_nr' => 24
           },
           'type' => 'index_entry_command'
         },
@@ -638,8 +627,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         },
         {
@@ -677,8 +665,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 28,
-            'macro' => ''
+            'line_nr' => 28
           }
         },
         {
@@ -730,8 +717,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 32,
-            'macro' => ''
+            'line_nr' => 32
           }
         },
         {
@@ -796,8 +782,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               },
               'type' => 'menu_entry'
             },
@@ -829,15 +814,13 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 34,
-            'macro' => ''
+            'line_nr' => 34
           }
         },
         {
@@ -858,8 +841,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top.texi',
-        'line_nr' => 23,
-        'macro' => ''
+        'line_nr' => 23
       }
     },
     {
@@ -958,8 +940,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               },
               'type' => 'index_entry_command'
             },
@@ -996,8 +977,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
-                'line_nr' => 41,
-                'macro' => ''
+                'line_nr' => 41
               },
               'type' => 'index_entry_command'
             },
@@ -1034,8 +1014,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               },
               'type' => 'index_entry_command'
             }
@@ -1077,8 +1056,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 44,
-            'macro' => ''
+            'line_nr' => 44
           }
         },
         {
@@ -1143,8 +1121,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
               ],
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               },
               'type' => 'menu_entry'
             },
@@ -1176,15 +1153,13 @@ 
$result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 46,
-            'macro' => ''
+            'line_nr' => 46
           }
         },
         {
@@ -1205,8 +1180,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top.texi',
-        'line_nr' => 38,
-        'macro' => ''
+        'line_nr' => 38
       }
     },
     {
@@ -1307,8 +1281,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
               ],
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               },
               'type' => 'menu_entry'
             },
@@ -1355,8 +1328,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
               ],
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               },
               'type' => 'menu_entry'
             },
@@ -1388,15 +1360,13 @@ 
$result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
-                'line_nr' => 54,
-                'macro' => ''
+                'line_nr' => 54
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 51,
-            'macro' => ''
+            'line_nr' => 51
           }
         },
         {
@@ -1434,8 +1404,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 56,
-            'macro' => ''
+            'line_nr' => 56
           }
         },
         {
@@ -1456,8 +1425,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top.texi',
-        'line_nr' => 50,
-        'macro' => ''
+        'line_nr' => 50
       }
     },
     {
@@ -1565,8 +1533,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 60,
-            'macro' => ''
+            'line_nr' => 60
           },
           'type' => 'index_entry_command'
         },
@@ -1603,8 +1570,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 61,
-            'macro' => ''
+            'line_nr' => 61
           },
           'type' => 'index_entry_command'
         },
@@ -1641,8 +1607,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 62,
-            'macro' => ''
+            'line_nr' => 62
           },
           'type' => 'index_entry_command'
         },
@@ -1663,8 +1628,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top.texi',
-        'line_nr' => 58,
-        'macro' => ''
+        'line_nr' => 58
       }
     },
     {
@@ -1764,8 +1728,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 65,
-            'macro' => ''
+            'line_nr' => 65
           },
           'type' => 'index_entry_command'
         },
@@ -1804,8 +1767,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 67,
-            'macro' => ''
+            'line_nr' => 67
           }
         },
         {
@@ -1846,8 +1808,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 69,
-            'macro' => ''
+            'line_nr' => 69
           },
           'type' => 'index_entry_command'
         },
@@ -1884,8 +1845,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 70,
-            'macro' => ''
+            'line_nr' => 70
           },
           'type' => 'index_entry_command'
         },
@@ -1924,8 +1884,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
-            'line_nr' => 72,
-            'macro' => ''
+            'line_nr' => 72
           }
         },
         {
@@ -1946,8 +1905,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top.texi',
-        'line_nr' => 64,
-        'macro' => ''
+        'line_nr' => 64
       }
     },
     {
@@ -2310,7 +2268,6 @@ 
$result_converted_errors{'file_html'}->{'nodes_before_top_split_chapter_no_nodes
 ',
     'file_name' => 'nodes_before_top.texi',
     'line_nr' => 40,
-    'macro' => '',
     'text' => 'entry for index `cp\' for @printindex cp outside of any 
section',
     'type' => 'warning'
   },
@@ -2319,7 +2276,6 @@ 
$result_converted_errors{'file_html'}->{'nodes_before_top_split_chapter_no_nodes
 ',
     'file_name' => 'nodes_before_top.texi',
     'line_nr' => 70,
-    'macro' => '',
     'text' => 'entry for index `cp\' for @printindex cp outside of any 
section',
     'type' => 'warning'
   },
@@ -2328,7 +2284,6 @@ 
$result_converted_errors{'file_html'}->{'nodes_before_top_split_chapter_no_nodes
 ',
     'file_name' => 'nodes_before_top.texi',
     'line_nr' => 62,
-    'macro' => '',
     'text' => 'entry for index `cp\' for @printindex cp outside of any 
section',
     'type' => 'warning'
   },
@@ -2337,7 +2292,6 @@ 
$result_converted_errors{'file_html'}->{'nodes_before_top_split_chapter_no_nodes
 ',
     'file_name' => 'nodes_before_top.texi',
     'line_nr' => 24,
-    'macro' => '',
     'text' => 'entry for index `cp\' for @printindex cp outside of any 
section',
     'type' => 'warning'
   },
@@ -2346,7 +2300,6 @@ 
$result_converted_errors{'file_html'}->{'nodes_before_top_split_chapter_no_nodes
 ',
     'file_name' => 'nodes_before_top.texi',
     'line_nr' => 65,
-    'macro' => '',
     'text' => 'entry for index `cp\' for @printindex cp outside of any 
section',
     'type' => 'warning'
   },
@@ -2355,7 +2308,6 @@ 
$result_converted_errors{'file_html'}->{'nodes_before_top_split_chapter_no_nodes
 ',
     'file_name' => 'nodes_before_top.texi',
     'line_nr' => 42,
-    'macro' => '',
     'text' => 'entry for index `cp\' for @printindex cp outside of any 
section',
     'type' => 'warning'
   },
@@ -2364,7 +2316,6 @@ 
$result_converted_errors{'file_html'}->{'nodes_before_top_split_chapter_no_nodes
 ',
     'file_name' => 'nodes_before_top.texi',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'entry for index `cp\' for @printindex cp outside of any 
section',
     'type' => 'warning'
   },
@@ -2373,7 +2324,6 @@ 
$result_converted_errors{'file_html'}->{'nodes_before_top_split_chapter_no_nodes
 ',
     'file_name' => 'nodes_before_top.texi',
     'line_nr' => 16,
-    'macro' => '',
     'text' => 'entry for index `cp\' for @printindex cp outside of any 
section',
     'type' => 'warning'
   },
@@ -2382,7 +2332,6 @@ 
$result_converted_errors{'file_html'}->{'nodes_before_top_split_chapter_no_nodes
 ',
     'file_name' => 'nodes_before_top.texi',
     'line_nr' => 20,
-    'macro' => '',
     'text' => 'entry for index `cp\' for @printindex cp outside of any 
section',
     'type' => 'warning'
   },
@@ -2391,7 +2340,6 @@ 
$result_converted_errors{'file_html'}->{'nodes_before_top_split_chapter_no_nodes
 ',
     'file_name' => 'nodes_before_top.texi',
     'line_nr' => 60,
-    'macro' => '',
     'text' => 'entry for index `cp\' for @printindex cp outside of any 
section',
     'type' => 'warning'
   },
@@ -2400,7 +2348,6 @@ 
$result_converted_errors{'file_html'}->{'nodes_before_top_split_chapter_no_nodes
 ',
     'file_name' => 'nodes_before_top.texi',
     'line_nr' => 69,
-    'macro' => '',
     'text' => 'entry for index `fn\' for @printindex fn outside of any 
section',
     'type' => 'warning'
   },
@@ -2409,7 +2356,6 @@ 
$result_converted_errors{'file_html'}->{'nodes_before_top_split_chapter_no_nodes
 ',
     'file_name' => 'nodes_before_top.texi',
     'line_nr' => 41,
-    'macro' => '',
     'text' => 'entry for index `fn\' for @printindex fn outside of any 
section',
     'type' => 'warning'
   },
@@ -2418,7 +2364,6 @@ 
$result_converted_errors{'file_html'}->{'nodes_before_top_split_chapter_no_nodes
 ',
     'file_name' => 'nodes_before_top.texi',
     'line_nr' => 61,
-    'macro' => '',
     'text' => 'entry for index `fn\' for @printindex fn outside of any 
section',
     'type' => 'warning'
   }
diff --git a/tp/t/results/indices/print_merged_index.pl 
b/tp/t/results/indices/print_merged_index.pl
index 980881dd49..2007561d1b 100644
--- a/tp/t/results/indices/print_merged_index.pl
+++ b/tp/t/results/indices/print_merged_index.pl
@@ -40,8 +40,7 @@ $result_trees{'print_merged_index'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -76,8 +75,7 @@ $result_trees{'print_merged_index'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -123,8 +121,7 @@ $result_trees{'print_merged_index'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         }
       ],
@@ -140,8 +137,7 @@ $result_trees{'print_merged_index'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     }
   ],
@@ -199,7 +195,6 @@ $result_errors{'print_merged_index'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'printing an index `fn\' merged in another one, `cp\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/indices/printindex_before_document.pl 
b/tp/t/results/indices/printindex_before_document.pl
index 41900f2f1b..85ff9d4ab0 100644
--- a/tp/t/results/indices/printindex_before_document.pl
+++ b/tp/t/results/indices/printindex_before_document.pl
@@ -44,8 +44,7 @@ $result_trees{'printindex_before_document'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
@@ -69,7 +68,6 @@ $result_errors{'printindex_before_document'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'printindex before document beginning: @printindex cp',
     'type' => 'warning'
   }
diff --git a/tp/t/results/indices/printindex_between_node_section.pl 
b/tp/t/results/indices/printindex_between_node_section.pl
index e164b0a696..7d4967b429 100644
--- a/tp/t/results/indices/printindex_between_node_section.pl
+++ b/tp/t/results/indices/printindex_between_node_section.pl
@@ -44,8 +44,7 @@ $result_trees{'printindex_between_node_section'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -105,8 +104,7 @@ $result_trees{'printindex_between_node_section'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           },
           'type' => 'index_entry_command'
         },
@@ -143,8 +141,7 @@ $result_trees{'printindex_between_node_section'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           },
           'type' => 'index_entry_command'
         },
@@ -181,8 +178,7 @@ $result_trees{'printindex_between_node_section'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           },
           'type' => 'index_entry_command'
         },
@@ -219,8 +215,7 @@ $result_trees{'printindex_between_node_section'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           },
           'type' => 'index_entry_command'
         },
@@ -238,8 +233,7 @@ $result_trees{'printindex_between_node_section'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -271,8 +265,7 @@ $result_trees{'printindex_between_node_section'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -332,8 +325,7 @@ $result_trees{'printindex_between_node_section'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           },
           'type' => 'index_entry_command'
         },
@@ -370,8 +362,7 @@ $result_trees{'printindex_between_node_section'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           },
           'type' => 'index_entry_command'
         },
@@ -391,8 +382,7 @@ $result_trees{'printindex_between_node_section'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -444,8 +434,7 @@ $result_trees{'printindex_between_node_section'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           }
         }
       ],
@@ -461,8 +450,7 @@ $result_trees{'printindex_between_node_section'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -493,8 +481,7 @@ $result_trees{'printindex_between_node_section'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     }
   ],
diff --git a/tp/t/results/indices/printindex_between_part_chapter.pl 
b/tp/t/results/indices/printindex_between_part_chapter.pl
index fd03ef2c45..52a0f92371 100644
--- a/tp/t/results/indices/printindex_between_part_chapter.pl
+++ b/tp/t/results/indices/printindex_between_part_chapter.pl
@@ -45,8 +45,7 @@ $result_trees{'printindex_between_part_chapter'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -106,8 +105,7 @@ $result_trees{'printindex_between_part_chapter'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           },
           'type' => 'index_entry_command'
         },
@@ -144,8 +142,7 @@ $result_trees{'printindex_between_part_chapter'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           },
           'type' => 'index_entry_command'
         },
@@ -182,8 +179,7 @@ $result_trees{'printindex_between_part_chapter'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           },
           'type' => 'index_entry_command'
         },
@@ -220,8 +216,7 @@ $result_trees{'printindex_between_part_chapter'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           },
           'type' => 'index_entry_command'
         },
@@ -239,8 +234,7 @@ $result_trees{'printindex_between_part_chapter'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -297,8 +291,7 @@ $result_trees{'printindex_between_part_chapter'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -315,8 +308,7 @@ $result_trees{'printindex_between_part_chapter'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -348,8 +340,7 @@ $result_trees{'printindex_between_part_chapter'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -388,8 +379,7 @@ $result_trees{'printindex_between_part_chapter'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -421,8 +411,7 @@ $result_trees{'printindex_between_part_chapter'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 16,
-        'macro' => ''
+        'line_nr' => 16
       }
     },
     {
@@ -482,8 +471,7 @@ $result_trees{'printindex_between_part_chapter'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           },
           'type' => 'index_entry_command'
         },
@@ -520,8 +508,7 @@ $result_trees{'printindex_between_part_chapter'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           },
           'type' => 'index_entry_command'
         },
@@ -541,8 +528,7 @@ $result_trees{'printindex_between_part_chapter'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     }
   ],
@@ -774,7 +760,6 @@ $result_errors{'printindex_between_part_chapter'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@part not empty',
     'type' => 'warning'
   }
diff --git a/tp/t/results/indices/printindex_index_entry_in_copying.pl 
b/tp/t/results/indices/printindex_index_entry_in_copying.pl
index 997dbd89c1..68836a997c 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying.pl
@@ -63,8 +63,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   },
                   'type' => 'index_entry_command'
                 },
@@ -139,8 +138,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       },
                       'type' => 'def_line'
                     },
@@ -213,8 +211,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       },
                       'type' => 'def_line'
                     },
@@ -260,8 +257,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     }
                   ],
@@ -272,8 +268,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 },
                 {
@@ -289,8 +284,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                           'cmdname' => 'asis',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 10,
-                            'macro' => ''
+                            'line_nr' => 10
                           },
                           'type' => 'command_as_argument'
                         }
@@ -342,8 +336,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 11,
-                                'macro' => ''
+                                'line_nr' => 11
                               }
                             },
                             {
@@ -378,8 +371,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 12,
-                                'macro' => ''
+                                'line_nr' => 12
                               }
                             }
                           ],
@@ -416,8 +408,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     }
                   ],
@@ -431,8 +422,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 },
                 {
@@ -470,8 +460,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 15,
-                    'macro' => ''
+                    'line_nr' => 15
                   }
                 },
                 {
@@ -507,15 +496,13 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 17,
-                    'macro' => ''
+                    'line_nr' => 17
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -558,8 +545,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 19,
-        'macro' => ''
+        'line_nr' => 19
       }
     },
     {
@@ -606,8 +592,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           }
         },
         {
@@ -672,8 +657,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               },
               'type' => 'menu_entry'
             },
@@ -705,15 +689,13 @@ $result_trees{'printindex_index_entry_in_copying'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           }
         },
         {
@@ -730,8 +712,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 20,
-        'macro' => ''
+        'line_nr' => 20
       }
     },
     {
@@ -764,8 +745,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 29,
-        'macro' => ''
+        'line_nr' => 29
       }
     },
     {
@@ -803,8 +783,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 32,
-            'macro' => ''
+            'line_nr' => 32
           }
         },
         {
@@ -842,8 +821,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 34,
-            'macro' => ''
+            'line_nr' => 34
           }
         },
         {
@@ -862,8 +840,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 30,
-        'macro' => ''
+        'line_nr' => 30
       }
     }
   ],
diff --git 
a/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl 
b/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl
index 4c29ea2ae4..4878c6666e 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl
@@ -78,8 +78,7 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
                                   },
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 5,
-                                    'macro' => ''
+                                    'line_nr' => 5
                                   },
                                   'type' => 'index_entry_command'
                                 }
@@ -104,8 +103,7 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     },
                     {
@@ -150,8 +148,7 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 },
                 {
@@ -187,15 +184,13 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -238,8 +233,7 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -286,8 +280,7 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -352,8 +345,7 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               },
               'type' => 'menu_entry'
             },
@@ -385,15 +377,13 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         },
         {
@@ -410,8 +400,7 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -443,8 +432,7 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 23,
-        'macro' => ''
+        'line_nr' => 23
       }
     },
     {
@@ -482,8 +470,7 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         },
         {
@@ -502,8 +489,7 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     }
   ],
diff --git 
a/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl 
b/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
index e6e771ebf3..db0594ae7b 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
@@ -63,8 +63,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   },
                   'type' => 'index_entry_command'
                 },
@@ -139,8 +138,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       },
                       'type' => 'def_line'
                     },
@@ -213,8 +211,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       },
                       'type' => 'def_line'
                     },
@@ -260,8 +257,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     }
                   ],
@@ -272,8 +268,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 },
                 {
@@ -289,8 +284,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                           'cmdname' => 'asis',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 10,
-                            'macro' => ''
+                            'line_nr' => 10
                           },
                           'type' => 'command_as_argument'
                         }
@@ -342,8 +336,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 11,
-                                'macro' => ''
+                                'line_nr' => 11
                               }
                             },
                             {
@@ -378,8 +371,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 12,
-                                'macro' => ''
+                                'line_nr' => 12
                               }
                             }
                           ],
@@ -416,8 +408,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     }
                   ],
@@ -431,8 +422,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 },
                 {
@@ -470,8 +460,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 15,
-                    'macro' => ''
+                    'line_nr' => 15
                   }
                 },
                 {
@@ -507,15 +496,13 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 17,
-                    'macro' => ''
+                    'line_nr' => 17
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -558,8 +545,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 19,
-        'macro' => ''
+        'line_nr' => 19
       }
     },
     {
@@ -657,8 +643,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               },
               'type' => 'menu_entry'
             },
@@ -690,15 +675,13 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 24,
-            'macro' => ''
+            'line_nr' => 24
           }
         },
         {
@@ -715,8 +698,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 20,
-        'macro' => ''
+        'line_nr' => 20
       }
     },
     {
@@ -749,8 +731,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 28,
-        'macro' => ''
+        'line_nr' => 28
       }
     },
     {
@@ -812,8 +793,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 32,
-            'macro' => ''
+            'line_nr' => 32
           }
         },
         {
@@ -832,8 +812,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 29,
-        'macro' => ''
+        'line_nr' => 29
       }
     }
   ],
diff --git a/tp/t/results/indices/printindex_with_space_before.pl 
b/tp/t/results/indices/printindex_with_space_before.pl
index 2b2aa5e36a..be9fef0970 100644
Binary files a/tp/t/results/indices/printindex_with_space_before.pl and 
b/tp/t/results/indices/printindex_with_space_before.pl differ
diff --git a/tp/t/results/indices/recursive_synindex.pl 
b/tp/t/results/indices/recursive_synindex.pl
index 6dfee13b16..ae75cd5b5d 100644
--- a/tp/t/results/indices/recursive_synindex.pl
+++ b/tp/t/results/indices/recursive_synindex.pl
@@ -39,8 +39,7 @@ $result_trees{'recursive_synindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -73,8 +72,7 @@ $result_trees{'recursive_synindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -108,8 +106,7 @@ $result_trees{'recursive_synindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -131,8 +128,7 @@ $result_trees{'recursive_synindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         }
       ],
@@ -156,7 +152,6 @@ $result_errors{'recursive_synindex'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '@synindex leads to a merging of bbb in itself, ignoring',
     'type' => 'warning'
   }
diff --git a/tp/t/results/indices/same_index_entry_merged_indices.pl 
b/tp/t/results/indices/same_index_entry_merged_indices.pl
index 50354d2b13..25558f344c 100644
--- a/tp/t/results/indices/same_index_entry_merged_indices.pl
+++ b/tp/t/results/indices/same_index_entry_merged_indices.pl
@@ -42,8 +42,7 @@ $result_trees{'same_index_entry_merged_indices'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -86,8 +85,7 @@ $result_trees{'same_index_entry_merged_indices'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -113,8 +111,7 @@ $result_trees{'same_index_entry_merged_indices'} = {
       'extra' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -147,8 +144,7 @@ $result_trees{'same_index_entry_merged_indices'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -239,8 +235,7 @@ $result_trees{'same_index_entry_merged_indices'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     }
                   ],
@@ -265,8 +260,7 @@ $result_trees{'same_index_entry_merged_indices'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'def_line'
             },
@@ -312,8 +306,7 @@ $result_trees{'same_index_entry_merged_indices'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             }
           ],
@@ -324,8 +317,7 @@ $result_trees{'same_index_entry_merged_indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -386,8 +378,7 @@ $result_trees{'same_index_entry_merged_indices'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               },
               'type' => 'def_line'
             },
@@ -433,8 +424,7 @@ $result_trees{'same_index_entry_merged_indices'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             }
           ],
@@ -445,8 +435,7 @@ $result_trees{'same_index_entry_merged_indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         },
         {
@@ -484,8 +473,7 @@ $result_trees{'same_index_entry_merged_indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         }
       ],
@@ -499,8 +487,7 @@ $result_trees{'same_index_entry_merged_indices'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     }
   ],
diff --git a/tp/t/results/indices/same_only_seealso_seeentry.pl 
b/tp/t/results/indices/same_only_seealso_seeentry.pl
index c6dda08013..d1e60b9ff7 100644
--- a/tp/t/results/indices/same_only_seealso_seeentry.pl
+++ b/tp/t/results/indices/same_only_seealso_seeentry.pl
@@ -44,8 +44,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -81,8 +80,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -115,8 +113,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -168,8 +165,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
                   'cmdname' => 'seealso',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
@@ -199,8 +195,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           },
           'type' => 'index_entry_command'
         },
@@ -229,8 +224,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
                   'cmdname' => 'seealso',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 8,
-                    'macro' => ''
+                    'line_nr' => 8
                   }
                 }
               ],
@@ -260,8 +254,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           },
           'type' => 'index_entry_command'
         },
@@ -295,8 +288,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
                   'cmdname' => 'seeentry',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 }
               ],
@@ -326,8 +318,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           },
           'type' => 'index_entry_command'
         },
@@ -356,8 +347,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
                   'cmdname' => 'seeentry',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 }
               ],
@@ -387,8 +377,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           },
           'type' => 'index_entry_command'
         },
@@ -422,8 +411,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
                   'cmdname' => 'seealso',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 13,
-                    'macro' => ''
+                    'line_nr' => 13
                   }
                 }
               ],
@@ -453,8 +441,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           },
           'type' => 'index_entry_command'
         },
@@ -483,8 +470,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
                   'cmdname' => 'seeentry',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 14,
-                    'macro' => ''
+                    'line_nr' => 14
                   }
                 }
               ],
@@ -514,8 +500,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           },
           'type' => 'index_entry_command'
         },
@@ -554,8 +539,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           }
         }
       ],
@@ -569,8 +553,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
diff --git a/tp/t/results/indices/same_seealso_seeentry.pl 
b/tp/t/results/indices/same_seealso_seeentry.pl
index 3a36fb8b09..18e00926e6 100644
--- a/tp/t/results/indices/same_seealso_seeentry.pl
+++ b/tp/t/results/indices/same_seealso_seeentry.pl
@@ -44,8 +44,7 @@ $result_trees{'same_seealso_seeentry'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -81,8 +80,7 @@ $result_trees{'same_seealso_seeentry'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -115,8 +113,7 @@ $result_trees{'same_seealso_seeentry'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -168,8 +165,7 @@ $result_trees{'same_seealso_seeentry'} = {
                   'cmdname' => 'seealso',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
@@ -199,8 +195,7 @@ $result_trees{'same_seealso_seeentry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           },
           'type' => 'index_entry_command'
         },
@@ -229,8 +224,7 @@ $result_trees{'same_seealso_seeentry'} = {
                   'cmdname' => 'seealso',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 8,
-                    'macro' => ''
+                    'line_nr' => 8
                   }
                 }
               ],
@@ -260,8 +254,7 @@ $result_trees{'same_seealso_seeentry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           },
           'type' => 'index_entry_command'
         },
@@ -295,8 +288,7 @@ $result_trees{'same_seealso_seeentry'} = {
                   'cmdname' => 'seeentry',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 }
               ],
@@ -326,8 +318,7 @@ $result_trees{'same_seealso_seeentry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           },
           'type' => 'index_entry_command'
         },
@@ -356,8 +347,7 @@ $result_trees{'same_seealso_seeentry'} = {
                   'cmdname' => 'seeentry',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 }
               ],
@@ -387,8 +377,7 @@ $result_trees{'same_seealso_seeentry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           },
           'type' => 'index_entry_command'
         },
@@ -422,8 +411,7 @@ $result_trees{'same_seealso_seeentry'} = {
                   'cmdname' => 'seealso',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 13,
-                    'macro' => ''
+                    'line_nr' => 13
                   }
                 }
               ],
@@ -453,8 +441,7 @@ $result_trees{'same_seealso_seeentry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           },
           'type' => 'index_entry_command'
         },
@@ -483,8 +470,7 @@ $result_trees{'same_seealso_seeentry'} = {
                   'cmdname' => 'seeentry',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 14,
-                    'macro' => ''
+                    'line_nr' => 14
                   }
                 }
               ],
@@ -514,8 +500,7 @@ $result_trees{'same_seealso_seeentry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           },
           'type' => 'index_entry_command'
         },
@@ -557,8 +542,7 @@ $result_trees{'same_seealso_seeentry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           },
           'type' => 'index_entry_command'
         },
@@ -597,8 +581,7 @@ $result_trees{'same_seealso_seeentry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           }
         }
       ],
@@ -612,8 +595,7 @@ $result_trees{'same_seealso_seeentry'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
diff --git a/tp/t/results/indices/seealso_duplicate.pl 
b/tp/t/results/indices/seealso_duplicate.pl
index 5374a62eb0..f78d5d5370 100644
--- a/tp/t/results/indices/seealso_duplicate.pl
+++ b/tp/t/results/indices/seealso_duplicate.pl
@@ -44,8 +44,7 @@ $result_trees{'seealso_duplicate'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -90,8 +89,7 @@ $result_trees{'seealso_duplicate'} = {
                   'cmdname' => 'command',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 }
               ],
@@ -138,8 +136,7 @@ $result_trees{'seealso_duplicate'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           },
@@ -151,8 +148,7 @@ $result_trees{'seealso_duplicate'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           },
           'type' => 'index_entry_command'
         },
@@ -175,8 +171,7 @@ $result_trees{'seealso_duplicate'} = {
                   'cmdname' => 'command',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 }
               ],
@@ -227,8 +222,7 @@ $result_trees{'seealso_duplicate'} = {
                               'cmdname' => 'command',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 5,
-                                'macro' => ''
+                                'line_nr' => 5
                               }
                             }
                           ],
@@ -238,8 +232,7 @@ $result_trees{'seealso_duplicate'} = {
                       'cmdname' => 'seealso',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
@@ -264,8 +257,7 @@ $result_trees{'seealso_duplicate'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           },
@@ -277,8 +269,7 @@ $result_trees{'seealso_duplicate'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           },
           'type' => 'index_entry_command'
         },
@@ -318,8 +309,7 @@ $result_trees{'seealso_duplicate'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         }
       ],
@@ -335,8 +325,7 @@ $result_trees{'seealso_duplicate'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
diff --git a/tp/t/results/indices/seeentry.pl b/tp/t/results/indices/seeentry.pl
index 9d53118c2d..a712ce4ece 100644
--- a/tp/t/results/indices/seeentry.pl
+++ b/tp/t/results/indices/seeentry.pl
@@ -44,8 +44,7 @@ $result_trees{'seeentry'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -71,8 +70,7 @@ $result_trees{'seeentry'} = {
       'extra' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -105,8 +103,7 @@ $result_trees{'seeentry'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -158,8 +155,7 @@ $result_trees{'seeentry'} = {
                   'cmdname' => 'seeentry',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
@@ -189,8 +185,7 @@ $result_trees{'seeentry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           },
           'type' => 'index_entry_command'
         },
@@ -212,8 +207,7 @@ $result_trees{'seeentry'} = {
                   'cmdname' => 'seealso',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 8,
-                    'macro' => ''
+                    'line_nr' => 8
                   }
                 },
                 {
@@ -250,8 +244,7 @@ $result_trees{'seeentry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           },
           'type' => 'index_entry_command'
         },
@@ -285,8 +278,7 @@ $result_trees{'seeentry'} = {
                   'cmdname' => 'seeentry',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 }
               ],
@@ -316,8 +308,7 @@ $result_trees{'seeentry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           },
           'type' => 'index_entry_command'
         },
@@ -339,8 +330,7 @@ $result_trees{'seeentry'} = {
                   'cmdname' => 'seealso',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 },
                 {
@@ -377,8 +367,7 @@ $result_trees{'seeentry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           },
           'type' => 'index_entry_command'
         },
@@ -417,8 +406,7 @@ $result_trees{'seeentry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -451,8 +439,7 @@ $result_trees{'seeentry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           }
         }
       ],
@@ -466,8 +453,7 @@ $result_trees{'seeentry'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
diff --git a/tp/t/results/indices/sorted_subentries.pl 
b/tp/t/results/indices/sorted_subentries.pl
index db3823e9e4..8da8d97e69 100644
--- a/tp/t/results/indices/sorted_subentries.pl
+++ b/tp/t/results/indices/sorted_subentries.pl
@@ -44,8 +44,7 @@ $result_trees{'sorted_subentries'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -71,8 +70,7 @@ $result_trees{'sorted_subentries'} = {
       'extra' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -104,8 +102,7 @@ $result_trees{'sorted_subentries'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -183,8 +180,7 @@ $result_trees{'sorted_subentries'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           },
@@ -196,8 +192,7 @@ $result_trees{'sorted_subentries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           },
           'type' => 'index_entry_command'
         },
@@ -253,8 +248,7 @@ $result_trees{'sorted_subentries'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           },
@@ -266,8 +260,7 @@ $result_trees{'sorted_subentries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           },
           'type' => 'index_entry_command'
         },
@@ -323,8 +316,7 @@ $result_trees{'sorted_subentries'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           },
@@ -336,8 +328,7 @@ $result_trees{'sorted_subentries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           },
           'type' => 'index_entry_command'
         },
@@ -393,8 +384,7 @@ $result_trees{'sorted_subentries'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           },
@@ -406,8 +396,7 @@ $result_trees{'sorted_subentries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           },
           'type' => 'index_entry_command'
         },
@@ -487,8 +476,7 @@ $result_trees{'sorted_subentries'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 12,
-                    'macro' => ''
+                    'line_nr' => 12
                   }
                 }
               },
@@ -499,8 +487,7 @@ $result_trees{'sorted_subentries'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           },
@@ -512,8 +499,7 @@ $result_trees{'sorted_subentries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           },
           'type' => 'index_entry_command'
         },
@@ -570,8 +556,7 @@ $result_trees{'sorted_subentries'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             }
           },
@@ -583,8 +568,7 @@ $result_trees{'sorted_subentries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           },
           'type' => 'index_entry_command'
         },
@@ -622,8 +606,7 @@ $result_trees{'sorted_subentries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           },
           'type' => 'index_entry_command'
         },
@@ -678,8 +661,7 @@ $result_trees{'sorted_subentries'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           },
@@ -691,8 +673,7 @@ $result_trees{'sorted_subentries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           },
           'type' => 'index_entry_command'
         },
@@ -738,8 +719,7 @@ $result_trees{'sorted_subentries'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           },
@@ -751,8 +731,7 @@ $result_trees{'sorted_subentries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           },
           'type' => 'index_entry_command'
         },
@@ -790,8 +769,7 @@ $result_trees{'sorted_subentries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           },
           'type' => 'index_entry_command'
         },
@@ -884,8 +862,7 @@ $result_trees{'sorted_subentries'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       }
                     }
                   },
@@ -896,8 +873,7 @@ $result_trees{'sorted_subentries'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 18,
-                    'macro' => ''
+                    'line_nr' => 18
                   }
                 }
               },
@@ -908,8 +884,7 @@ $result_trees{'sorted_subentries'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             }
           },
@@ -921,8 +896,7 @@ $result_trees{'sorted_subentries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           },
           'type' => 'index_entry_command'
         },
@@ -945,8 +919,7 @@ $result_trees{'sorted_subentries'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -979,8 +952,7 @@ $result_trees{'sorted_subentries'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 20,
-        'macro' => ''
+        'line_nr' => 20
       }
     },
     {
@@ -1072,8 +1044,7 @@ $result_trees{'sorted_subentries'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 22,
-                    'macro' => ''
+                    'line_nr' => 22
                   }
                 }
               },
@@ -1084,8 +1055,7 @@ $result_trees{'sorted_subentries'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           },
@@ -1097,8 +1067,7 @@ $result_trees{'sorted_subentries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 22,
-            'macro' => ''
+            'line_nr' => 22
           },
           'type' => 'index_entry_command'
         },
@@ -1137,8 +1106,7 @@ $result_trees{'sorted_subentries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           },
           'type' => 'index_entry_command'
         },
@@ -1160,8 +1128,7 @@ $result_trees{'sorted_subentries'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 24,
-                    'macro' => ''
+                    'line_nr' => 24
                   }
                 }
               ],
@@ -1208,8 +1175,7 @@ $result_trees{'sorted_subentries'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             }
           },
@@ -1221,8 +1187,7 @@ $result_trees{'sorted_subentries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 24,
-            'macro' => ''
+            'line_nr' => 24
           },
           'type' => 'index_entry_command'
         },
@@ -1245,8 +1210,7 @@ $result_trees{'sorted_subentries'} = {
                   'cmdname' => 'kbd',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 25,
-                    'macro' => ''
+                    'line_nr' => 25
                   }
                 }
               ],
@@ -1283,8 +1247,7 @@ $result_trees{'sorted_subentries'} = {
                       'cmdname' => 'sc',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 25,
-                        'macro' => ''
+                        'line_nr' => 25
                       }
                     }
                   ],
@@ -1325,8 +1288,7 @@ $result_trees{'sorted_subentries'} = {
                           'cmdname' => 'email',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 25,
-                            'macro' => ''
+                            'line_nr' => 25
                           }
                         }
                       ],
@@ -1350,8 +1312,7 @@ $result_trees{'sorted_subentries'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 25,
-                    'macro' => ''
+                    'line_nr' => 25
                   }
                 }
               },
@@ -1362,8 +1323,7 @@ $result_trees{'sorted_subentries'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               }
             }
           },
@@ -1375,8 +1335,7 @@ $result_trees{'sorted_subentries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           },
           'type' => 'index_entry_command'
         },
@@ -1418,8 +1377,7 @@ $result_trees{'sorted_subentries'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             }
           },
@@ -1431,8 +1389,7 @@ $result_trees{'sorted_subentries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           },
           'type' => 'index_entry_command'
         },
@@ -1504,8 +1461,7 @@ $result_trees{'sorted_subentries'} = {
                           'cmdname' => 'sortas',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 27,
-                            'macro' => ''
+                            'line_nr' => 27
                           }
                         }
                       ],
@@ -1530,8 +1486,7 @@ $result_trees{'sorted_subentries'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 27,
-                    'macro' => ''
+                    'line_nr' => 27
                   }
                 }
               },
@@ -1542,8 +1497,7 @@ $result_trees{'sorted_subentries'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             }
           },
@@ -1555,8 +1509,7 @@ $result_trees{'sorted_subentries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 27,
-            'macro' => ''
+            'line_nr' => 27
           },
           'type' => 'index_entry_command'
         },
@@ -1632,8 +1585,7 @@ $result_trees{'sorted_subentries'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 28,
-                    'macro' => ''
+                    'line_nr' => 28
                   }
                 }
               },
@@ -1644,8 +1596,7 @@ $result_trees{'sorted_subentries'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             }
           },
@@ -1657,8 +1608,7 @@ $result_trees{'sorted_subentries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 28,
-            'macro' => ''
+            'line_nr' => 28
           },
           'type' => 'index_entry_command'
         },
@@ -1734,8 +1684,7 @@ $result_trees{'sorted_subentries'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 29,
-                    'macro' => ''
+                    'line_nr' => 29
                   }
                 }
               },
@@ -1746,8 +1695,7 @@ $result_trees{'sorted_subentries'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             }
           },
@@ -1759,8 +1707,7 @@ $result_trees{'sorted_subentries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 29,
-            'macro' => ''
+            'line_nr' => 29
           },
           'type' => 'index_entry_command'
         },
@@ -1801,8 +1748,7 @@ $result_trees{'sorted_subentries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 31,
-            'macro' => ''
+            'line_nr' => 31
           }
         }
       ],
@@ -1816,8 +1762,7 @@ $result_trees{'sorted_subentries'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 21,
-        'macro' => ''
+        'line_nr' => 21
       }
     }
   ],
@@ -2065,7 +2010,6 @@ $result_errors{'sorted_subentries'} = [
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => '@subentry missing argument',
     'type' => 'warning'
   },
@@ -2074,7 +2018,6 @@ $result_errors{'sorted_subentries'} = [
 ',
     'file_name' => '',
     'line_nr' => 18,
-    'macro' => '',
     'text' => 'no more than two levels of index subentry are allowed',
     'type' => 'error'
   },
@@ -2083,7 +2026,6 @@ $result_errors{'sorted_subentries'} = [
 ',
     'file_name' => '',
     'line_nr' => 26,
-    'macro' => '',
     'text' => '@cindex missing argument',
     'type' => 'warning'
   },
@@ -2092,7 +2034,6 @@ $result_errors{'sorted_subentries'} = [
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => 'empty index sub entry 1 key in @cindex',
     'type' => 'warning'
   }
@@ -2192,7 +2133,6 @@ $result_converted_errors{'info'}->{'sorted_subentries'} = 
[
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => 'empty index sub entry 1 key in @cindex',
     'type' => 'warning'
   }
@@ -2235,7 +2175,6 @@ 
$result_converted_errors{'plaintext'}->{'sorted_subentries'} = [
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => 'empty index sub entry 1 key in @cindex',
     'type' => 'warning'
   }
@@ -2348,7 +2287,6 @@ 
$result_converted_errors{'html_text'}->{'sorted_subentries'} = [
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => 'empty index sub entry 1 key in @cindex',
     'type' => 'warning'
   }
diff --git a/tp/t/results/indices/split_chapter_index.pl 
b/tp/t/results/indices/split_chapter_index.pl
index 4eb0b64d92..6efda038ba 100644
--- a/tp/t/results/indices/split_chapter_index.pl
+++ b/tp/t/results/indices/split_chapter_index.pl
@@ -59,8 +59,7 @@ $result_trees{'split_chapter_index'} = {
               },
               'source_info' => {
                 'file_name' => 'split_chapter_index.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -103,8 +102,7 @@ $result_trees{'split_chapter_index'} = {
       },
       'source_info' => {
         'file_name' => 'split_chapter_index.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -159,8 +157,7 @@ $result_trees{'split_chapter_index'} = {
           },
           'source_info' => {
             'file_name' => 'split_chapter_index.texi',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           },
           'type' => 'index_entry_command'
         },
@@ -245,8 +242,7 @@ $result_trees{'split_chapter_index'} = {
               ],
               'source_info' => {
                 'file_name' => 'split_chapter_index.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               },
               'type' => 'menu_entry'
             },
@@ -278,15 +274,13 @@ $result_trees{'split_chapter_index'} = {
               },
               'source_info' => {
                 'file_name' => 'split_chapter_index.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
           'source_info' => {
             'file_name' => 'split_chapter_index.texi',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           }
         },
         {
@@ -303,8 +297,7 @@ $result_trees{'split_chapter_index'} = {
       },
       'source_info' => {
         'file_name' => 'split_chapter_index.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -337,8 +330,7 @@ $result_trees{'split_chapter_index'} = {
       },
       'source_info' => {
         'file_name' => 'split_chapter_index.texi',
-        'line_nr' => 16,
-        'macro' => ''
+        'line_nr' => 16
       }
     },
     {
@@ -404,8 +396,7 @@ $result_trees{'split_chapter_index'} = {
               },
               'source_info' => {
                 'file_name' => 'split_chapter_index.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               },
               'type' => 'index_entry_command'
             },
@@ -442,8 +433,7 @@ $result_trees{'split_chapter_index'} = {
               },
               'source_info' => {
                 'file_name' => 'split_chapter_index.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               },
               'type' => 'index_entry_command'
             },
@@ -480,8 +470,7 @@ $result_trees{'split_chapter_index'} = {
               },
               'source_info' => {
                 'file_name' => 'split_chapter_index.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               },
               'type' => 'index_entry_command'
             },
@@ -518,8 +507,7 @@ $result_trees{'split_chapter_index'} = {
               },
               'source_info' => {
                 'file_name' => 'split_chapter_index.texi',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               },
               'type' => 'index_entry_command'
             }
@@ -561,8 +549,7 @@ $result_trees{'split_chapter_index'} = {
           },
           'source_info' => {
             'file_name' => 'split_chapter_index.texi',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           }
         },
         {
@@ -603,8 +590,7 @@ $result_trees{'split_chapter_index'} = {
           },
           'source_info' => {
             'file_name' => 'split_chapter_index.texi',
-            'line_nr' => 27,
-            'macro' => ''
+            'line_nr' => 27
           },
           'type' => 'index_entry_command'
         },
@@ -646,8 +632,7 @@ $result_trees{'split_chapter_index'} = {
           },
           'source_info' => {
             'file_name' => 'split_chapter_index.texi',
-            'line_nr' => 29,
-            'macro' => ''
+            'line_nr' => 29
           },
           'type' => 'index_entry_command'
         },
@@ -684,8 +669,7 @@ $result_trees{'split_chapter_index'} = {
           },
           'source_info' => {
             'file_name' => 'split_chapter_index.texi',
-            'line_nr' => 30,
-            'macro' => ''
+            'line_nr' => 30
           },
           'type' => 'index_entry_command'
         },
@@ -722,8 +706,7 @@ $result_trees{'split_chapter_index'} = {
           },
           'source_info' => {
             'file_name' => 'split_chapter_index.texi',
-            'line_nr' => 31,
-            'macro' => ''
+            'line_nr' => 31
           },
           'type' => 'index_entry_command'
         },
@@ -789,8 +772,7 @@ $result_trees{'split_chapter_index'} = {
               ],
               'source_info' => {
                 'file_name' => 'split_chapter_index.texi',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               },
               'type' => 'menu_entry'
             },
@@ -822,15 +804,13 @@ $result_trees{'split_chapter_index'} = {
               },
               'source_info' => {
                 'file_name' => 'split_chapter_index.texi',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             }
           ],
           'source_info' => {
             'file_name' => 'split_chapter_index.texi',
-            'line_nr' => 33,
-            'macro' => ''
+            'line_nr' => 33
           }
         },
         {
@@ -849,8 +829,7 @@ $result_trees{'split_chapter_index'} = {
       },
       'source_info' => {
         'file_name' => 'split_chapter_index.texi',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -882,8 +861,7 @@ $result_trees{'split_chapter_index'} = {
       },
       'source_info' => {
         'file_name' => 'split_chapter_index.texi',
-        'line_nr' => 37,
-        'macro' => ''
+        'line_nr' => 37
       }
     },
     {
@@ -967,8 +945,7 @@ $result_trees{'split_chapter_index'} = {
               ],
               'source_info' => {
                 'file_name' => 'split_chapter_index.texi',
-                'line_nr' => 41,
-                'macro' => ''
+                'line_nr' => 41
               },
               'type' => 'menu_entry'
             },
@@ -1000,15 +977,13 @@ $result_trees{'split_chapter_index'} = {
               },
               'source_info' => {
                 'file_name' => 'split_chapter_index.texi',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               }
             }
           ],
           'source_info' => {
             'file_name' => 'split_chapter_index.texi',
-            'line_nr' => 40,
-            'macro' => ''
+            'line_nr' => 40
           }
         },
         {
@@ -1049,8 +1024,7 @@ $result_trees{'split_chapter_index'} = {
           },
           'source_info' => {
             'file_name' => 'split_chapter_index.texi',
-            'line_nr' => 44,
-            'macro' => ''
+            'line_nr' => 44
           },
           'type' => 'index_entry_command'
         },
@@ -1092,8 +1066,7 @@ $result_trees{'split_chapter_index'} = {
           },
           'source_info' => {
             'file_name' => 'split_chapter_index.texi',
-            'line_nr' => 46,
-            'macro' => ''
+            'line_nr' => 46
           },
           'type' => 'index_entry_command'
         },
@@ -1113,8 +1086,7 @@ $result_trees{'split_chapter_index'} = {
       },
       'source_info' => {
         'file_name' => 'split_chapter_index.texi',
-        'line_nr' => 38,
-        'macro' => ''
+        'line_nr' => 38
       }
     },
     {
@@ -1146,8 +1118,7 @@ $result_trees{'split_chapter_index'} = {
       },
       'source_info' => {
         'file_name' => 'split_chapter_index.texi',
-        'line_nr' => 48,
-        'macro' => ''
+        'line_nr' => 48
       }
     },
     {
@@ -1221,8 +1192,7 @@ $result_trees{'split_chapter_index'} = {
           },
           'source_info' => {
             'file_name' => 'split_chapter_index.texi',
-            'line_nr' => 53,
-            'macro' => ''
+            'line_nr' => 53
           },
           'type' => 'index_entry_command'
         },
@@ -1242,8 +1212,7 @@ $result_trees{'split_chapter_index'} = {
       },
       'source_info' => {
         'file_name' => 'split_chapter_index.texi',
-        'line_nr' => 49,
-        'macro' => ''
+        'line_nr' => 49
       }
     },
     {
diff --git a/tp/t/results/indices/subentries.pl 
b/tp/t/results/indices/subentries.pl
index 9ce54b3275..11230f748f 100644
--- a/tp/t/results/indices/subentries.pl
+++ b/tp/t/results/indices/subentries.pl
@@ -44,8 +44,7 @@ $result_trees{'subentries'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -71,8 +70,7 @@ $result_trees{'subentries'} = {
       'extra' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -105,8 +103,7 @@ $result_trees{'subentries'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -166,8 +163,7 @@ $result_trees{'subentries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           },
           'type' => 'index_entry_command'
         },
@@ -222,8 +218,7 @@ $result_trees{'subentries'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           },
@@ -235,8 +230,7 @@ $result_trees{'subentries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           },
           'type' => 'index_entry_command'
         },
@@ -311,8 +305,7 @@ $result_trees{'subentries'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 }
               },
@@ -323,8 +316,7 @@ $result_trees{'subentries'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           },
@@ -336,8 +328,7 @@ $result_trees{'subentries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           },
           'type' => 'index_entry_command'
         },
@@ -432,8 +423,7 @@ $result_trees{'subentries'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     }
                   },
@@ -444,8 +434,7 @@ $result_trees{'subentries'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 }
               },
@@ -456,8 +445,7 @@ $result_trees{'subentries'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           },
@@ -469,8 +457,7 @@ $result_trees{'subentries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           },
           'type' => 'index_entry_command'
         },
@@ -515,8 +502,7 @@ $result_trees{'subentries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           },
           'type' => 'index_entry_command'
         },
@@ -571,8 +557,7 @@ $result_trees{'subentries'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             }
           },
@@ -584,8 +569,7 @@ $result_trees{'subentries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           },
           'type' => 'index_entry_command'
         },
@@ -660,8 +644,7 @@ $result_trees{'subentries'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 14,
-                    'macro' => ''
+                    'line_nr' => 14
                   }
                 }
               },
@@ -672,8 +655,7 @@ $result_trees{'subentries'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           },
@@ -685,8 +667,7 @@ $result_trees{'subentries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           },
           'type' => 'index_entry_command'
         },
@@ -781,8 +762,7 @@ $result_trees{'subentries'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     }
                   },
@@ -793,8 +773,7 @@ $result_trees{'subentries'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 15,
-                    'macro' => ''
+                    'line_nr' => 15
                   }
                 }
               },
@@ -805,8 +784,7 @@ $result_trees{'subentries'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           },
@@ -818,8 +796,7 @@ $result_trees{'subentries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           },
           'type' => 'index_entry_command'
         },
@@ -861,8 +838,7 @@ $result_trees{'subentries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -895,8 +871,7 @@ $result_trees{'subentries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           }
         }
       ],
@@ -910,8 +885,7 @@ $result_trees{'subentries'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
@@ -1071,7 +1045,6 @@ $result_errors{'subentries'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => 'no more than two levels of index subentry are allowed',
     'type' => 'error'
   },
@@ -1080,7 +1053,6 @@ $result_errors{'subentries'} = [
 ',
     'file_name' => '',
     'line_nr' => 15,
-    'macro' => '',
     'text' => 'no more than two levels of index subentry are allowed',
     'type' => 'error'
   }
diff --git a/tp/t/results/indices/subentries_and_comments.pl 
b/tp/t/results/indices/subentries_and_comments.pl
index 65201ee706..175682f827 100644
--- a/tp/t/results/indices/subentries_and_comments.pl
+++ b/tp/t/results/indices/subentries_and_comments.pl
@@ -44,8 +44,7 @@ $result_trees{'subentries_and_comments'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -71,8 +70,7 @@ $result_trees{'subentries_and_comments'} = {
       'extra' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -105,8 +103,7 @@ $result_trees{'subentries_and_comments'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -190,8 +187,7 @@ $result_trees{'subentries_and_comments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           },
@@ -203,8 +199,7 @@ $result_trees{'subentries_and_comments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           },
           'type' => 'index_entry_command'
         },
@@ -269,8 +264,7 @@ $result_trees{'subentries_and_comments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           },
@@ -282,8 +276,7 @@ $result_trees{'subentries_and_comments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           },
           'type' => 'index_entry_command'
         },
@@ -323,8 +316,7 @@ $result_trees{'subentries_and_comments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         }
       ],
@@ -338,8 +330,7 @@ $result_trees{'subentries_and_comments'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
diff --git a/tp/t/results/indices/subentry_and_sortas.pl 
b/tp/t/results/indices/subentry_and_sortas.pl
index 41fadcc33b..322540012a 100644
--- a/tp/t/results/indices/subentry_and_sortas.pl
+++ b/tp/t/results/indices/subentry_and_sortas.pl
@@ -44,8 +44,7 @@ $result_trees{'subentry_and_sortas'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -71,8 +70,7 @@ $result_trees{'subentry_and_sortas'} = {
       'extra' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -105,8 +103,7 @@ $result_trees{'subentry_and_sortas'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -158,8 +155,7 @@ $result_trees{'subentry_and_sortas'} = {
                   'cmdname' => 'sortas',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
@@ -197,8 +193,7 @@ $result_trees{'subentry_and_sortas'} = {
                       'cmdname' => 'sortas',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     },
                     {
@@ -230,8 +225,7 @@ $result_trees{'subentry_and_sortas'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           },
@@ -243,8 +237,7 @@ $result_trees{'subentry_and_sortas'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           },
           'type' => 'index_entry_command'
         },
@@ -279,8 +272,7 @@ $result_trees{'subentry_and_sortas'} = {
                   'cmdname' => 'sortas',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 }
               ],
@@ -318,8 +310,7 @@ $result_trees{'subentry_and_sortas'} = {
                       'cmdname' => 'sortas',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -351,8 +342,7 @@ $result_trees{'subentry_and_sortas'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           },
@@ -364,8 +354,7 @@ $result_trees{'subentry_and_sortas'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           },
           'type' => 'index_entry_command'
         },
@@ -405,8 +394,7 @@ $result_trees{'subentry_and_sortas'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -439,8 +427,7 @@ $result_trees{'subentry_and_sortas'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           }
         }
       ],
@@ -454,8 +441,7 @@ $result_trees{'subentry_and_sortas'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
diff --git a/tp/t/results/indices/subentry_and_sortas_spaces.pl 
b/tp/t/results/indices/subentry_and_sortas_spaces.pl
index 4739d85c32..fb2c690604 100644
--- a/tp/t/results/indices/subentry_and_sortas_spaces.pl
+++ b/tp/t/results/indices/subentry_and_sortas_spaces.pl
@@ -44,8 +44,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -71,8 +70,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
       'extra' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -105,8 +103,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -158,8 +155,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
                   'cmdname' => 'sortas',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
@@ -192,8 +188,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
                       'cmdname' => 'sortas',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     },
                     {
@@ -221,8 +216,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           },
@@ -234,8 +228,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           },
           'type' => 'index_entry_command'
         },
@@ -281,8 +274,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
                       'cmdname' => 'sortas',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     }
                   ],
@@ -302,8 +294,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           },
@@ -315,8 +306,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           },
           'type' => 'index_entry_command'
         },
@@ -379,8 +369,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
                           'cmdname' => 'sortas',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 9,
-                            'macro' => ''
+                            'line_nr' => 9
                           }
                         }
                       ],
@@ -405,8 +394,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 }
               },
@@ -417,8 +405,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           },
@@ -430,8 +417,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           },
           'type' => 'index_entry_command'
         },
@@ -502,8 +488,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 }
               },
@@ -514,8 +499,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           },
@@ -527,8 +511,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           },
           'type' => 'index_entry_command'
         },
@@ -569,8 +552,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           }
         }
       ],
@@ -584,8 +566,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
diff --git a/tp/t/results/indices/syncode_index_print_both.pl 
b/tp/t/results/indices/syncode_index_print_both.pl
index fb350de78c..20eaa67196 100644
--- a/tp/t/results/indices/syncode_index_print_both.pl
+++ b/tp/t/results/indices/syncode_index_print_both.pl
@@ -42,8 +42,7 @@ $result_trees{'syncode_index_print_both'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -86,8 +85,7 @@ $result_trees{'syncode_index_print_both'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -123,8 +121,7 @@ $result_trees{'syncode_index_print_both'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -157,8 +154,7 @@ $result_trees{'syncode_index_print_both'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -218,8 +214,7 @@ $result_trees{'syncode_index_print_both'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           },
           'type' => 'index_entry_command'
         },
@@ -256,8 +251,7 @@ $result_trees{'syncode_index_print_both'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           },
           'type' => 'index_entry_command'
         },
@@ -315,8 +309,7 @@ $result_trees{'syncode_index_print_both'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         },
         {
@@ -368,8 +361,7 @@ $result_trees{'syncode_index_print_both'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         },
         {
@@ -388,8 +380,7 @@ $result_trees{'syncode_index_print_both'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     }
   ],
@@ -542,7 +533,6 @@ $result_errors{'syncode_index_print_both'} = [
 ',
     'file_name' => '',
     'line_nr' => 15,
-    'macro' => '',
     'text' => 'printing an index `fn\' merged in another one, `cp\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/indices/syncodeindex_to_plain.pl 
b/tp/t/results/indices/syncodeindex_to_plain.pl
index d1fb95199b..39d78ea295 100644
--- a/tp/t/results/indices/syncodeindex_to_plain.pl
+++ b/tp/t/results/indices/syncodeindex_to_plain.pl
@@ -42,8 +42,7 @@ $result_trees{'syncodeindex_to_plain'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -86,8 +85,7 @@ $result_trees{'syncodeindex_to_plain'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -147,8 +145,7 @@ $result_trees{'syncodeindex_to_plain'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           },
           'type' => 'index_entry_command'
         },
@@ -185,8 +182,7 @@ $result_trees{'syncodeindex_to_plain'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           },
           'type' => 'index_entry_command'
         },
@@ -223,8 +219,7 @@ $result_trees{'syncodeindex_to_plain'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           },
           'type' => 'index_entry_command'
         },
@@ -272,8 +267,7 @@ $result_trees{'syncodeindex_to_plain'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -320,8 +314,7 @@ $result_trees{'syncodeindex_to_plain'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           }
         }
       ],
@@ -337,8 +330,7 @@ $result_trees{'syncodeindex_to_plain'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     }
   ],
diff --git a/tp/t/results/indices/transparent_sort_chars.pl 
b/tp/t/results/indices/transparent_sort_chars.pl
index e77d09551e..d9acb42594 100644
--- a/tp/t/results/indices/transparent_sort_chars.pl
+++ b/tp/t/results/indices/transparent_sort_chars.pl
@@ -68,8 +68,7 @@ $result_trees{'transparent_sort_chars'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -95,8 +94,7 @@ $result_trees{'transparent_sort_chars'} = {
       'extra' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -141,8 +139,7 @@ $result_trees{'transparent_sort_chars'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 8,
-                    'macro' => ''
+                    'line_nr' => 8
                   }
                 },
                 {
@@ -162,8 +159,7 @@ $result_trees{'transparent_sort_chars'} = {
                   'cmdname' => 'command',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 8,
-                    'macro' => ''
+                    'line_nr' => 8
                   }
                 }
               ],
@@ -193,8 +189,7 @@ $result_trees{'transparent_sort_chars'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           },
           'type' => 'index_entry_command'
         },
@@ -232,8 +227,7 @@ $result_trees{'transparent_sort_chars'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           },
           'type' => 'index_entry_command'
         },
@@ -271,8 +265,7 @@ $result_trees{'transparent_sort_chars'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           },
           'type' => 'index_entry_command'
         },
@@ -311,8 +304,7 @@ $result_trees{'transparent_sort_chars'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           }
         }
       ],
@@ -328,8 +320,7 @@ $result_trees{'transparent_sort_chars'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     }
   ],
diff --git a/tp/t/results/indices/unknown_index_entry.pl 
b/tp/t/results/indices/unknown_index_entry.pl
index c4cc816584..9c9dfccb3d 100644
--- a/tp/t/results/indices/unknown_index_entry.pl
+++ b/tp/t/results/indices/unknown_index_entry.pl
@@ -42,7 +42,6 @@ $result_errors{'unknown_index_entry'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'unknown command `someindex\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/indices/unknown_printindex.pl 
b/tp/t/results/indices/unknown_printindex.pl
index 70ba2965d1..72a5dcd6a5 100644
--- a/tp/t/results/indices/unknown_printindex.pl
+++ b/tp/t/results/indices/unknown_printindex.pl
@@ -28,8 +28,7 @@ $result_trees{'unknown_printindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -50,7 +49,6 @@ $result_errors{'unknown_printindex'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'unknown index `bidule\' in @printindex',
     'type' => 'error'
   }
diff --git a/tp/t/results/indices/unknown_synindex.pl 
b/tp/t/results/indices/unknown_synindex.pl
index e5ca82403d..c1d92b4eb1 100644
--- a/tp/t/results/indices/unknown_synindex.pl
+++ b/tp/t/results/indices/unknown_synindex.pl
@@ -28,8 +28,7 @@ $result_trees{'unknown_synindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -50,7 +49,6 @@ $result_errors{'unknown_synindex'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'unknown source index in @synindex: c',
     'type' => 'error'
   },
@@ -59,7 +57,6 @@ $result_errors{'unknown_synindex'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'unknown destination index in @synindex: truc',
     'type' => 'error'
   }
diff --git a/tp/t/results/indices/unknown_then_known_index_entry.pl 
b/tp/t/results/indices/unknown_then_known_index_entry.pl
index 5570ef0996..46b38004b3 100644
--- a/tp/t/results/indices/unknown_then_known_index_entry.pl
+++ b/tp/t/results/indices/unknown_then_known_index_entry.pl
@@ -49,8 +49,7 @@ $result_trees{'unknown_then_known_index_entry'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -85,8 +84,7 @@ $result_trees{'unknown_then_known_index_entry'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               },
               'type' => 'index_entry_command'
             }
@@ -115,7 +113,6 @@ $result_errors{'unknown_then_known_index_entry'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'unknown command `someindex\'',
     'type' => 'error'
   },
@@ -124,7 +121,6 @@ $result_errors{'unknown_then_known_index_entry'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'entry for index `some\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/indices/w_lines_count.pl 
b/tp/t/results/indices/w_lines_count.pl
index 4805c44ce4..1e44053bc7 100644
Binary files a/tp/t/results/indices/w_lines_count.pl and 
b/tp/t/results/indices/w_lines_count.pl differ
diff --git a/tp/t/results/indices/wrong_synindex.pl 
b/tp/t/results/indices/wrong_synindex.pl
index 585ad508e1..c32ac73bdc 100644
--- a/tp/t/results/indices/wrong_synindex.pl
+++ b/tp/t/results/indices/wrong_synindex.pl
@@ -39,8 +39,7 @@ $result_trees{'wrong_synindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -62,8 +61,7 @@ $result_trees{'wrong_synindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
@@ -85,7 +83,6 @@ $result_errors{'wrong_synindex'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@synindex leads to a merging of aaa in itself, ignoring',
     'type' => 'warning'
   }
diff --git a/tp/t/results/info_tests/anchor_and_spaces.pl 
b/tp/t/results/info_tests/anchor_and_spaces.pl
index 6dc4aa54e8..f932e5555e 100644
--- a/tp/t/results/info_tests/anchor_and_spaces.pl
+++ b/tp/t/results/info_tests/anchor_and_spaces.pl
@@ -39,8 +39,7 @@ $result_trees{'anchor_and_spaces'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -80,8 +79,7 @@ $result_trees{'anchor_and_spaces'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -117,8 +115,7 @@ $result_trees{'anchor_and_spaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -156,8 +153,7 @@ $result_trees{'anchor_and_spaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -176,8 +172,7 @@ $result_trees{'anchor_and_spaces'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
diff --git a/tp/t/results/info_tests/anchor_in_command.pl 
b/tp/t/results/info_tests/anchor_in_command.pl
index 22ea282bc5..d0d80e9b25 100644
--- a/tp/t/results/info_tests/anchor_in_command.pl
+++ b/tp/t/results/info_tests/anchor_in_command.pl
@@ -52,8 +52,7 @@ $result_trees{'anchor_in_command'} = {
                       'cmdname' => 'TeX',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     },
                     {
@@ -73,8 +72,7 @@ $result_trees{'anchor_in_command'} = {
                       'cmdname' => 'emph',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     },
                     {
@@ -119,8 +117,7 @@ $result_trees{'anchor_in_command'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 5,
-                                'macro' => ''
+                                'line_nr' => 5
                               }
                             }
                           ],
@@ -130,8 +127,7 @@ $result_trees{'anchor_in_command'} = {
                       'cmdname' => 'emph',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
@@ -141,8 +137,7 @@ $result_trees{'anchor_in_command'} = {
               'cmdname' => 'strong',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -164,8 +159,7 @@ $result_trees{'anchor_in_command'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
diff --git a/tp/t/results/info_tests/before_node_and_section.pl 
b/tp/t/results/info_tests/before_node_and_section.pl
index 629533702c..966c4a1ac2 100644
--- a/tp/t/results/info_tests/before_node_and_section.pl
+++ b/tp/t/results/info_tests/before_node_and_section.pl
@@ -40,8 +40,7 @@ $result_trees{'before_node_and_section'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -80,8 +79,7 @@ $result_trees{'before_node_and_section'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               },
               'type' => 'index_entry_command'
             },
@@ -107,8 +105,7 @@ $result_trees{'before_node_and_section'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -136,8 +133,7 @@ $result_trees{'before_node_and_section'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -209,8 +205,7 @@ $result_trees{'before_node_and_section'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               },
               'type' => 'menu_entry'
             },
@@ -242,15 +237,13 @@ $result_trees{'before_node_and_section'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -290,8 +283,7 @@ $result_trees{'before_node_and_section'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -357,8 +349,7 @@ $result_trees{'before_node_and_section'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -392,8 +383,7 @@ $result_trees{'before_node_and_section'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -460,8 +450,7 @@ $result_trees{'before_node_and_section'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               },
               'type' => 'menu_entry'
             },
@@ -493,15 +482,13 @@ $result_trees{'before_node_and_section'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           }
         },
         {
@@ -518,8 +505,7 @@ $result_trees{'before_node_and_section'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -552,8 +538,7 @@ $result_trees{'before_node_and_section'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 20,
-        'macro' => ''
+        'line_nr' => 20
       }
     },
     {
@@ -610,8 +595,7 @@ $result_trees{'before_node_and_section'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           }
         },
         {
@@ -630,8 +614,7 @@ $result_trees{'before_node_and_section'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 21,
-        'macro' => ''
+        'line_nr' => 21
       }
     }
   ],
@@ -800,7 +783,6 @@ $result_errors{'before_node_and_section'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   }
@@ -879,7 +861,6 @@ 
$result_converted_errors{'info'}->{'before_node_and_section'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '@footnote outside of any node',
     'type' => 'warning'
   },
@@ -888,7 +869,6 @@ 
$result_converted_errors{'info'}->{'before_node_and_section'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@anchor outside of any node',
     'type' => 'warning'
   },
@@ -897,7 +877,6 @@ 
$result_converted_errors{'info'}->{'before_node_and_section'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/info_tests/center_flush.pl 
b/tp/t/results/info_tests/center_flush.pl
index 85f5f7bc02..dba5dd574f 100644
--- a/tp/t/results/info_tests/center_flush.pl
+++ b/tp/t/results/info_tests/center_flush.pl
@@ -34,8 +34,7 @@ $result_trees{'center_flush'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -136,8 +135,7 @@ $result_trees{'center_flush'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 14,
-                    'macro' => ''
+                    'line_nr' => 14
                   }
                 },
                 {
@@ -180,15 +178,13 @@ $result_trees{'center_flush'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -289,8 +285,7 @@ $result_trees{'center_flush'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 29,
-                    'macro' => ''
+                    'line_nr' => 29
                   }
                 },
                 {
@@ -323,8 +318,7 @@ $result_trees{'center_flush'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 31,
-                    'macro' => ''
+                    'line_nr' => 31
                   }
                 },
                 {
@@ -366,15 +360,13 @@ $result_trees{'center_flush'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           }
         }
       ],
@@ -507,7 +499,6 @@ $result_converted_errors{'info'}->{'center_flush'} = [
 ',
     'file_name' => '',
     'line_nr' => 14,
-    'macro' => '',
     'text' => '@anchor outside of any node',
     'type' => 'warning'
   },
@@ -516,7 +507,6 @@ $result_converted_errors{'info'}->{'center_flush'} = [
 ',
     'file_name' => '',
     'line_nr' => 29,
-    'macro' => '',
     'text' => '@anchor outside of any node',
     'type' => 'warning'
   },
@@ -525,7 +515,6 @@ $result_converted_errors{'info'}->{'center_flush'} = [
 ',
     'file_name' => '',
     'line_nr' => 31,
-    'macro' => '',
     'text' => '@anchor outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/info_tests/chinese_mixed_with_en_EUC_CN.pl 
b/tp/t/results/info_tests/chinese_mixed_with_en_EUC_CN.pl
index 70b1b2dc0c..7c860b0f43 100644
--- a/tp/t/results/info_tests/chinese_mixed_with_en_EUC_CN.pl
+++ b/tp/t/results/info_tests/chinese_mixed_with_en_EUC_CN.pl
@@ -50,8 +50,7 @@ $result_trees{'chinese_mixed_with_en_EUC_CN'} = {
               },
               'source_info' => {
                 'file_name' => 'chinese_mixed_with_en_EUC_CN.texi',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -79,8 +78,7 @@ $result_trees{'chinese_mixed_with_en_EUC_CN'} = {
               },
               'source_info' => {
                 'file_name' => 'chinese_mixed_with_en_EUC_CN.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -123,8 +121,7 @@ $result_trees{'chinese_mixed_with_en_EUC_CN'} = {
       },
       'source_info' => {
         'file_name' => 'chinese_mixed_with_en_EUC_CN.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -174,8 +171,7 @@ $result_trees{'chinese_mixed_with_en_EUC_CN'} = {
       },
       'source_info' => {
         'file_name' => 'chinese_mixed_with_en_EUC_CN.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -207,8 +203,7 @@ $result_trees{'chinese_mixed_with_en_EUC_CN'} = {
       },
       'source_info' => {
         'file_name' => 'chinese_mixed_with_en_EUC_CN.texi',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -399,8 +394,7 @@ $result_trees{'chinese_mixed_with_en_EUC_CN'} = {
       },
       'source_info' => {
         'file_name' => 'chinese_mixed_with_en_EUC_CN.texi',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -598,7 +592,6 @@ $result_errors{'chinese_mixed_with_en_EUC_CN'} = [
 ',
     'file_name' => 'chinese_mixed_with_en_EUC_CN.texi',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'encoding `EUC-CN\' is not a canonical texinfo encoding',
     'type' => 'warning'
   }
diff --git a/tp/t/results/info_tests/colon_in_index_entry.pl 
b/tp/t/results/info_tests/colon_in_index_entry.pl
index 07596b5a94..bdcfbda066 100644
--- a/tp/t/results/info_tests/colon_in_index_entry.pl
+++ b/tp/t/results/info_tests/colon_in_index_entry.pl
@@ -65,8 +65,7 @@ $result_trees{'colon_in_index_entry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -107,8 +106,7 @@ $result_trees{'colon_in_index_entry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           },
           'type' => 'index_entry_command'
         },
@@ -125,8 +123,7 @@ $result_trees{'colon_in_index_entry'} = {
                   'cmdname' => 'emph',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   },
                   'type' => 'command_as_argument'
                 }
@@ -178,8 +175,7 @@ $result_trees{'colon_in_index_entry'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     }
                   ],
@@ -216,8 +212,7 @@ $result_trees{'colon_in_index_entry'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
@@ -231,8 +226,7 @@ $result_trees{'colon_in_index_entry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -258,8 +252,7 @@ $result_trees{'colon_in_index_entry'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -281,8 +274,7 @@ $result_trees{'colon_in_index_entry'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -334,8 +326,7 @@ $result_trees{'colon_in_index_entry'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'def_line'
             },
@@ -354,8 +345,7 @@ $result_trees{'colon_in_index_entry'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -377,8 +367,7 @@ $result_trees{'colon_in_index_entry'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -449,8 +438,7 @@ $result_trees{'colon_in_index_entry'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               },
               'type' => 'def_line'
             },
@@ -482,8 +470,7 @@ $result_trees{'colon_in_index_entry'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             }
           ],
@@ -494,8 +481,7 @@ $result_trees{'colon_in_index_entry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -533,8 +519,7 @@ $result_trees{'colon_in_index_entry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         }
       ],
@@ -550,8 +535,7 @@ $result_trees{'colon_in_index_entry'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
diff --git a/tp/t/results/info_tests/colons_in_index_entries_and_node.pl 
b/tp/t/results/info_tests/colons_in_index_entries_and_node.pl
index 731a4e67b2..5a914972e2 100644
--- a/tp/t/results/info_tests/colons_in_index_entries_and_node.pl
+++ b/tp/t/results/info_tests/colons_in_index_entries_and_node.pl
@@ -78,8 +78,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     },
                     {
@@ -94,8 +93,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
                       'cmdname' => 'comma',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     },
                     {
@@ -137,8 +135,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -185,8 +182,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -218,15 +214,13 @@ $result_trees{'colons_in_index_entries_and_node'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -246,8 +240,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -271,8 +264,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
               'cmdname' => 'asis',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -287,8 +279,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -344,8 +335,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           },
           'type' => 'index_entry_command'
         },
@@ -382,8 +372,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           },
           'type' => 'index_entry_command'
         },
@@ -420,8 +409,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           },
           'type' => 'index_entry_command'
         },
@@ -481,15 +469,13 @@ $result_trees{'colons_in_index_entries_and_node'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           }
         },
         {
@@ -530,8 +516,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           },
           'type' => 'index_entry_command'
         },
@@ -568,8 +553,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           },
           'type' => 'index_entry_command'
         },
@@ -606,8 +590,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           },
           'type' => 'index_entry_command'
         },
@@ -642,8 +625,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -700,8 +682,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         },
         {
@@ -722,8 +703,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     }
   ],
diff --git 
a/tp/t/results/info_tests/colons_in_index_entries_and_node_no_quoting.pl 
b/tp/t/results/info_tests/colons_in_index_entries_and_node_no_quoting.pl
index fda91c93b6..f5e1ef68e7 100644
--- a/tp/t/results/info_tests/colons_in_index_entries_and_node_no_quoting.pl
+++ b/tp/t/results/info_tests/colons_in_index_entries_and_node_no_quoting.pl
@@ -78,8 +78,7 @@ $result_trees{'colons_in_index_entries_and_node_no_quoting'} 
= {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     },
                     {
@@ -94,8 +93,7 @@ $result_trees{'colons_in_index_entries_and_node_no_quoting'} 
= {
                       'cmdname' => 'comma',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     },
                     {
@@ -137,8 +135,7 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -185,8 +182,7 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -218,15 +214,13 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -246,8 +240,7 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -271,8 +264,7 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
               'cmdname' => 'asis',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -287,8 +279,7 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -344,8 +335,7 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           },
           'type' => 'index_entry_command'
         },
@@ -382,8 +372,7 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           },
           'type' => 'index_entry_command'
         },
@@ -420,8 +409,7 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           },
           'type' => 'index_entry_command'
         },
@@ -481,15 +469,13 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           }
         },
         {
@@ -530,8 +516,7 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           },
           'type' => 'index_entry_command'
         },
@@ -568,8 +553,7 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           },
           'type' => 'index_entry_command'
         },
@@ -606,8 +590,7 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           },
           'type' => 'index_entry_command'
         },
@@ -642,8 +625,7 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -700,8 +682,7 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         },
         {
@@ -722,8 +703,7 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     }
   ],
@@ -884,7 +864,6 @@ 
$result_converted_errors{'file_info'}->{'colons_in_index_entries_and_node_no_quo
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'menu entry node name should not contain `:\'',
     'type' => 'warning'
   },
@@ -893,7 +872,6 @@ 
$result_converted_errors{'file_info'}->{'colons_in_index_entries_and_node_no_quo
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => '@node name should not contain `,\': One::node, with entries.',
     'type' => 'warning'
   },
@@ -902,7 +880,6 @@ 
$result_converted_errors{'file_info'}->{'colons_in_index_entries_and_node_no_quo
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => 'node name with index entries should not contain `:\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/info_tests/def_in_copying.pl 
b/tp/t/results/info_tests/def_in_copying.pl
index b68a65edb7..528e46af59 100644
--- a/tp/t/results/info_tests/def_in_copying.pl
+++ b/tp/t/results/info_tests/def_in_copying.pl
@@ -66,8 +66,7 @@ $result_trees{'def_in_copying'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -77,8 +76,7 @@ $result_trees{'def_in_copying'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -119,8 +117,7 @@ $result_trees{'def_in_copying'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -418,15 +415,13 @@ $result_trees{'def_in_copying'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -698,8 +693,7 @@ $result_trees{'def_in_copying'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         }
       ],
@@ -711,8 +705,7 @@ $result_trees{'def_in_copying'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     }
   ],
diff --git a/tp/t/results/info_tests/direntry_dircategory.pl 
b/tp/t/results/info_tests/direntry_dircategory.pl
index 934358d1ef..b7a69c9646 100644
--- a/tp/t/results/info_tests/direntry_dircategory.pl
+++ b/tp/t/results/info_tests/direntry_dircategory.pl
@@ -59,8 +59,7 @@ $result_trees{'direntry_dircategory'} = {
               },
               'source_info' => {
                 'file_name' => 'direntry_dircategory.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -89,8 +88,7 @@ $result_trees{'direntry_dircategory'} = {
                       'cmdname' => 'var',
                       'source_info' => {
                         'file_name' => 'direntry_dircategory.texi',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -114,8 +112,7 @@ $result_trees{'direntry_dircategory'} = {
               },
               'source_info' => {
                 'file_name' => 'direntry_dircategory.texi',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -196,8 +193,7 @@ $result_trees{'direntry_dircategory'} = {
                               'cmdname' => 'var',
                               'source_info' => {
                                 'file_name' => 'direntry_dircategory.texi',
-                                'line_nr' => 7,
-                                'macro' => ''
+                                'line_nr' => 7
                               }
                             },
                             {
@@ -213,8 +209,7 @@ $result_trees{'direntry_dircategory'} = {
                   ],
                   'source_info' => {
                     'file_name' => 'direntry_dircategory.texi',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   },
                   'type' => 'menu_entry'
                 },
@@ -246,15 +241,13 @@ $result_trees{'direntry_dircategory'} = {
                   },
                   'source_info' => {
                     'file_name' => 'direntry_dircategory.texi',
-                    'line_nr' => 8,
-                    'macro' => ''
+                    'line_nr' => 8
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'direntry_dircategory.texi',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -287,8 +280,7 @@ $result_trees{'direntry_dircategory'} = {
               },
               'source_info' => {
                 'file_name' => 'direntry_dircategory.texi',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -357,8 +349,7 @@ $result_trees{'direntry_dircategory'} = {
                   ],
                   'source_info' => {
                     'file_name' => 'direntry_dircategory.texi',
-                    'line_nr' => 12,
-                    'macro' => ''
+                    'line_nr' => 12
                   },
                   'type' => 'menu_entry'
                 },
@@ -409,15 +400,13 @@ $result_trees{'direntry_dircategory'} = {
                   },
                   'source_info' => {
                     'file_name' => 'direntry_dircategory.texi',
-                    'line_nr' => 16,
-                    'macro' => ''
+                    'line_nr' => 16
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'direntry_dircategory.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -465,8 +454,7 @@ $result_trees{'direntry_dircategory'} = {
       },
       'source_info' => {
         'file_name' => 'direntry_dircategory.texi',
-        'line_nr' => 19,
-        'macro' => ''
+        'line_nr' => 19
       }
     },
     {
@@ -527,8 +515,7 @@ $result_trees{'direntry_dircategory'} = {
           },
           'source_info' => {
             'file_name' => 'direntry_dircategory.texi',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           }
         },
         {
@@ -605,8 +592,7 @@ $result_trees{'direntry_dircategory'} = {
               ],
               'source_info' => {
                 'file_name' => 'direntry_dircategory.texi',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               },
               'type' => 'menu_entry'
             },
@@ -638,15 +624,13 @@ $result_trees{'direntry_dircategory'} = {
               },
               'source_info' => {
                 'file_name' => 'direntry_dircategory.texi',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             }
           ],
           'source_info' => {
             'file_name' => 'direntry_dircategory.texi',
-            'line_nr' => 24,
-            'macro' => ''
+            'line_nr' => 24
           }
         },
         {
@@ -711,8 +695,7 @@ $result_trees{'direntry_dircategory'} = {
               ],
               'source_info' => {
                 'file_name' => 'direntry_dircategory.texi',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               },
               'type' => 'menu_entry'
             },
@@ -744,15 +727,13 @@ $result_trees{'direntry_dircategory'} = {
               },
               'source_info' => {
                 'file_name' => 'direntry_dircategory.texi',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             }
           ],
           'source_info' => {
             'file_name' => 'direntry_dircategory.texi',
-            'line_nr' => 28,
-            'macro' => ''
+            'line_nr' => 28
           }
         },
         {
@@ -769,8 +750,7 @@ $result_trees{'direntry_dircategory'} = {
       },
       'source_info' => {
         'file_name' => 'direntry_dircategory.texi',
-        'line_nr' => 20,
-        'macro' => ''
+        'line_nr' => 20
       }
     },
     {
@@ -802,8 +782,7 @@ $result_trees{'direntry_dircategory'} = {
       },
       'source_info' => {
         'file_name' => 'direntry_dircategory.texi',
-        'line_nr' => 32,
-        'macro' => ''
+        'line_nr' => 32
       }
     },
     {
@@ -855,8 +834,7 @@ $result_trees{'direntry_dircategory'} = {
       },
       'source_info' => {
         'file_name' => 'direntry_dircategory.texi',
-        'line_nr' => 33,
-        'macro' => ''
+        'line_nr' => 33
       }
     },
     {
@@ -1051,7 +1029,6 @@ $result_errors{'direntry_dircategory'} = [
 ',
     'file_name' => 'direntry_dircategory.texi',
     'line_nr' => 23,
-    'macro' => '',
     'text' => '@dircategory after first node',
     'type' => 'warning'
   },
@@ -1060,7 +1037,6 @@ $result_errors{'direntry_dircategory'} = [
 ',
     'file_name' => 'direntry_dircategory.texi',
     'line_nr' => 24,
-    'macro' => '',
     'text' => '@direntry after first node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/info_tests/direntry_dircategory_and_commands.pl 
b/tp/t/results/info_tests/direntry_dircategory_and_commands.pl
index 9924edbf51..66f584fb63 100644
--- a/tp/t/results/info_tests/direntry_dircategory_and_commands.pl
+++ b/tp/t/results/info_tests/direntry_dircategory_and_commands.pl
@@ -30,8 +30,7 @@ $result_trees{'direntry_dircategory_and_commands'} = {
                   'cmdname' => 'var',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -55,8 +54,7 @@ $result_trees{'direntry_dircategory_and_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -137,8 +135,7 @@ $result_trees{'direntry_dircategory_and_commands'} = {
                           'cmdname' => 'var',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 3,
-                            'macro' => ''
+                            'line_nr' => 3
                           }
                         },
                         {
@@ -154,8 +151,7 @@ $result_trees{'direntry_dircategory_and_commands'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               },
               'type' => 'menu_entry'
             },
@@ -187,15 +183,13 @@ $result_trees{'direntry_dircategory_and_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -228,8 +222,7 @@ $result_trees{'direntry_dircategory_and_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -298,8 +291,7 @@ $result_trees{'direntry_dircategory_and_commands'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               },
               'type' => 'menu_entry'
             },
@@ -350,15 +342,13 @@ $result_trees{'direntry_dircategory_and_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -403,8 +393,7 @@ $result_trees{'direntry_dircategory_and_commands'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -449,8 +438,7 @@ $result_trees{'direntry_dircategory_and_commands'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 16,
-        'macro' => ''
+        'line_nr' => 16
       }
     }
   ],
diff --git a/tp/t/results/info_tests/empty_arguments.pl 
b/tp/t/results/info_tests/empty_arguments.pl
index 840791d0aa..ff85717d7d 100644
--- a/tp/t/results/info_tests/empty_arguments.pl
+++ b/tp/t/results/info_tests/empty_arguments.pl
@@ -25,8 +25,7 @@ $result_trees{'empty_arguments'} = {
               'cmdname' => 'strong',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -45,8 +44,7 @@ $result_trees{'empty_arguments'} = {
               'cmdname' => 'uref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -70,8 +68,7 @@ $result_trees{'empty_arguments'} = {
               'cmdname' => 'abbr',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
diff --git a/tp/t/results/info_tests/empty_caption.pl 
b/tp/t/results/info_tests/empty_caption.pl
index 20885b6aef..adad0b4158 100644
--- a/tp/t/results/info_tests/empty_caption.pl
+++ b/tp/t/results/info_tests/empty_caption.pl
@@ -89,8 +89,7 @@ $result_trees{'empty_caption'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -126,8 +125,7 @@ $result_trees{'empty_caption'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -144,8 +142,7 @@ $result_trees{'empty_caption'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -181,8 +178,7 @@ $result_trees{'empty_caption'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         }
       ],
@@ -197,8 +193,7 @@ $result_trees{'empty_caption'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
diff --git a/tp/t/results/info_tests/empty_copying_not_ended.pl 
b/tp/t/results/info_tests/empty_copying_not_ended.pl
index faaae55ce0..28cfcb350d 100644
--- a/tp/t/results/info_tests/empty_copying_not_ended.pl
+++ b/tp/t/results/info_tests/empty_copying_not_ended.pl
@@ -29,8 +29,7 @@ $result_trees{'empty_copying_not_ended'} = {
           'cmdname' => 'copying',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
@@ -54,7 +53,6 @@ $result_errors{'empty_copying_not_ended'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'no matching `@end copying\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/info_tests/encoding_us_ascii.pl 
b/tp/t/results/info_tests/encoding_us_ascii.pl
index c63f42da98..09ff6b96f5 100644
--- a/tp/t/results/info_tests/encoding_us_ascii.pl
+++ b/tp/t/results/info_tests/encoding_us_ascii.pl
@@ -43,8 +43,7 @@ $result_trees{'encoding_us_ascii'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -91,8 +90,7 @@ $result_trees{'encoding_us_ascii'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     }
   ],
diff --git a/tp/t/results/info_tests/end_of_line_command_in_node_lines.pl 
b/tp/t/results/info_tests/end_of_line_command_in_node_lines.pl
index cc2067532a..1f0a64805d 100644
--- a/tp/t/results/info_tests/end_of_line_command_in_node_lines.pl
+++ b/tp/t/results/info_tests/end_of_line_command_in_node_lines.pl
@@ -44,8 +44,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -81,8 +80,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -127,8 +125,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -179,8 +176,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -258,8 +254,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           },
           'type' => 'index_entry_command'
         },
@@ -298,8 +293,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -318,8 +312,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -351,8 +344,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -419,8 +411,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -467,8 +458,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -534,8 +524,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -623,8 +612,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               },
               'type' => 'menu_entry'
             },
@@ -679,8 +667,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               },
               'type' => 'menu_entry'
             },
@@ -753,8 +740,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               },
               'type' => 'menu_entry'
             },
@@ -819,8 +805,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               },
               'type' => 'menu_entry'
             },
@@ -852,15 +837,13 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 24,
-            'macro' => ''
+            'line_nr' => 24
           }
         }
       ],
@@ -874,8 +857,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 16,
-        'macro' => ''
+        'line_nr' => 16
       }
     }
   ],
@@ -1150,7 +1132,6 @@ $result_errors{'end_of_line_command_in_node_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 28,
-    'macro' => '',
     'text' => '@menu entry node name `ankh p\' different from anchor name 
`ankh @* p\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/info_tests/error_in_footnote.pl 
b/tp/t/results/info_tests/error_in_footnote.pl
index 9f8b12ae87..0cc8cb5ede 100644
--- a/tp/t/results/info_tests/error_in_footnote.pl
+++ b/tp/t/results/info_tests/error_in_footnote.pl
@@ -103,8 +103,7 @@ $result_trees{'error_in_footnote'} = {
                           'cmdname' => 'TeX',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 8,
-                            'macro' => ''
+                            'line_nr' => 8
                           }
                         },
                         {
@@ -128,8 +127,7 @@ $result_trees{'error_in_footnote'} = {
                           'cmdname' => 'strong',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 9,
-                            'macro' => ''
+                            'line_nr' => 9
                           }
                         },
                         {
@@ -149,8 +147,7 @@ $result_trees{'error_in_footnote'} = {
                                       'cmdname' => 'LaTeX',
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 10,
-                                        'macro' => ''
+                                        'line_nr' => 10
                                       }
                                     },
                                     {
@@ -174,8 +171,7 @@ $result_trees{'error_in_footnote'} = {
                                       'cmdname' => 'strong',
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 11,
-                                        'macro' => ''
+                                        'line_nr' => 11
                                       }
                                     },
                                     {
@@ -191,8 +187,7 @@ $result_trees{'error_in_footnote'} = {
                           'cmdname' => 'footnote',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 10,
-                            'macro' => ''
+                            'line_nr' => 10
                           }
                         }
                       ],
@@ -208,8 +203,7 @@ $result_trees{'error_in_footnote'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -245,8 +239,7 @@ $result_trees{'error_in_footnote'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
@@ -263,8 +256,7 @@ $result_trees{'error_in_footnote'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -300,8 +292,7 @@ $result_trees{'error_in_footnote'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           }
         },
         {
@@ -337,8 +328,7 @@ $result_trees{'error_in_footnote'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           }
         }
       ],
@@ -353,8 +343,7 @@ $result_trees{'error_in_footnote'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
@@ -415,7 +404,6 @@ $result_errors{'error_in_footnote'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => '@TeX expected braces',
     'type' => 'error'
   },
@@ -424,7 +412,6 @@ $result_errors{'error_in_footnote'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => '@LaTeX expected braces',
     'type' => 'error'
   }
@@ -495,7 +482,6 @@ $result_converted_errors{'info'}->{'error_in_footnote'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@strong{Note...} produces a spurious cross-reference in Info; 
reword to avoid that',
     'type' => 'warning'
   },
@@ -504,7 +490,6 @@ $result_converted_errors{'info'}->{'error_in_footnote'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@strong{Note...} produces a spurious cross-reference in Info; 
reword to avoid that',
     'type' => 'warning'
   },
@@ -513,7 +498,6 @@ $result_converted_errors{'info'}->{'error_in_footnote'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@strong{Note...} produces a spurious cross-reference in Info; 
reword to avoid that',
     'type' => 'warning'
   },
@@ -522,7 +506,6 @@ $result_converted_errors{'info'}->{'error_in_footnote'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => '@strong{Note...} produces a spurious cross-reference in Info; 
reword to avoid that',
     'type' => 'warning'
   }
diff --git a/tp/t/results/info_tests/file_only_png.pl 
b/tp/t/results/info_tests/file_only_png.pl
index 35420c6780..05a6696bf9 100644
Binary files a/tp/t/results/info_tests/file_only_png.pl and 
b/tp/t/results/info_tests/file_only_png.pl differ
diff --git a/tp/t/results/info_tests/float_long_captions.pl 
b/tp/t/results/info_tests/float_long_captions.pl
index f3e27a73bc..87b3f24cfb 100644
--- a/tp/t/results/info_tests/float_long_captions.pl
+++ b/tp/t/results/info_tests/float_long_captions.pl
@@ -86,8 +86,7 @@ $result_trees{'float_long_captions'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -123,8 +122,7 @@ $result_trees{'float_long_captions'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -141,8 +139,7 @@ $result_trees{'float_long_captions'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -202,8 +199,7 @@ $result_trees{'float_long_captions'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -239,8 +235,7 @@ $result_trees{'float_long_captions'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
@@ -257,8 +252,7 @@ $result_trees{'float_long_captions'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -294,8 +288,7 @@ $result_trees{'float_long_captions'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         }
       ],
@@ -310,8 +303,7 @@ $result_trees{'float_long_captions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
diff --git a/tp/t/results/info_tests/float_without_type.pl 
b/tp/t/results/info_tests/float_without_type.pl
index 794c0324e3..fde9c3e519 100644
--- a/tp/t/results/info_tests/float_without_type.pl
+++ b/tp/t/results/info_tests/float_without_type.pl
@@ -100,8 +100,7 @@ $result_trees{'float_without_type'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -115,8 +114,7 @@ $result_trees{'float_without_type'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -152,8 +150,7 @@ $result_trees{'float_without_type'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         }
       ],
@@ -168,8 +165,7 @@ $result_trees{'float_without_type'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
diff --git a/tp/t/results/info_tests/image_and_punctuation.pl 
b/tp/t/results/info_tests/image_and_punctuation.pl
index 818656975b..1afdbfd4e4 100644
Binary files a/tp/t/results/info_tests/image_and_punctuation.pl and 
b/tp/t/results/info_tests/image_and_punctuation.pl differ
diff --git a/tp/t/results/info_tests/image_and_spaces_formatting.pl 
b/tp/t/results/info_tests/image_and_spaces_formatting.pl
index 12eba87ef7..952d84ac06 100644
--- a/tp/t/results/info_tests/image_and_spaces_formatting.pl
+++ b/tp/t/results/info_tests/image_and_spaces_formatting.pl
@@ -51,8 +51,7 @@ $result_trees{'image_and_spaces_formatting'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -75,8 +74,7 @@ $result_trees{'image_and_spaces_formatting'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -99,8 +97,7 @@ $result_trees{'image_and_spaces_formatting'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -123,8 +120,7 @@ $result_trees{'image_and_spaces_formatting'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -147,8 +143,7 @@ $result_trees{'image_and_spaces_formatting'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -171,8 +166,7 @@ $result_trees{'image_and_spaces_formatting'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -195,8 +189,7 @@ $result_trees{'image_and_spaces_formatting'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -230,8 +223,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -254,8 +246,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -278,8 +269,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -302,8 +292,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -326,8 +315,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -350,8 +338,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -374,8 +361,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -412,8 +398,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -436,8 +421,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -460,8 +444,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -484,8 +467,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -508,8 +490,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -532,8 +513,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -556,8 +536,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -594,8 +573,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -632,8 +610,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -670,8 +647,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -694,8 +670,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -722,8 +697,7 @@ $result_trees{'image_and_spaces_formatting'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
diff --git a/tp/t/results/info_tests/image_extension.pl 
b/tp/t/results/info_tests/image_extension.pl
index d229f4463b..1d843d0085 100644
Binary files a/tp/t/results/info_tests/image_extension.pl and 
b/tp/t/results/info_tests/image_extension.pl differ
diff --git a/tp/t/results/info_tests/image_in_paragraph.pl 
b/tp/t/results/info_tests/image_in_paragraph.pl
index bc159f01bd..201cbd563d 100644
Binary files a/tp/t/results/info_tests/image_in_paragraph.pl and 
b/tp/t/results/info_tests/image_in_paragraph.pl differ
diff --git a/tp/t/results/info_tests/image_not_found.pl 
b/tp/t/results/info_tests/image_not_found.pl
index 34b0d81a16..b76943540c 100644
--- a/tp/t/results/info_tests/image_not_found.pl
+++ b/tp/t/results/info_tests/image_not_found.pl
@@ -46,8 +46,7 @@ $result_trees{'image_not_found'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -66,8 +65,7 @@ $result_trees{'image_not_found'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
@@ -131,7 +129,6 @@ $result_converted_errors{'info'}->{'image_not_found'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'could not find @image file `n_f_image.txt\' nor alternate text',
     'type' => 'warning'
   }
diff --git a/tp/t/results/info_tests/image_quotes.pl 
b/tp/t/results/info_tests/image_quotes.pl
index 180bd5df4e..7f75dc1ff3 100644
Binary files a/tp/t/results/info_tests/image_quotes.pl and 
b/tp/t/results/info_tests/image_quotes.pl differ
diff --git a/tp/t/results/info_tests/image_text_encoded.pl 
b/tp/t/results/info_tests/image_text_encoded.pl
index 6ceb90b9c3..40f0e745ab 100644
--- a/tp/t/results/info_tests/image_text_encoded.pl
+++ b/tp/t/results/info_tests/image_text_encoded.pl
@@ -38,8 +38,7 @@ $result_trees{'image_text_encoded'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -64,8 +63,7 @@ $result_trees{'image_text_encoded'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
diff --git a/tp/t/results/info_tests/image_text_file_only_and_alt.pl 
b/tp/t/results/info_tests/image_text_file_only_and_alt.pl
index 33d1f694e9..70c5f8acdd 100644
Binary files a/tp/t/results/info_tests/image_text_file_only_and_alt.pl and 
b/tp/t/results/info_tests/image_text_file_only_and_alt.pl differ
diff --git a/tp/t/results/info_tests/index_entry_at_end_node.pl 
b/tp/t/results/info_tests/index_entry_at_end_node.pl
index ae1108d0b7..8ba3af29c0 100644
--- a/tp/t/results/info_tests/index_entry_at_end_node.pl
+++ b/tp/t/results/info_tests/index_entry_at_end_node.pl
@@ -39,8 +39,7 @@ $result_trees{'index_entry_at_end_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -129,8 +128,7 @@ $result_trees{'index_entry_at_end_node'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -177,8 +175,7 @@ $result_trees{'index_entry_at_end_node'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -210,15 +207,13 @@ $result_trees{'index_entry_at_end_node'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -235,8 +230,7 @@ $result_trees{'index_entry_at_end_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -268,8 +262,7 @@ $result_trees{'index_entry_at_end_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -339,8 +332,7 @@ $result_trees{'index_entry_at_end_node'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           },
           'type' => 'index_entry_command'
         },
@@ -360,8 +352,7 @@ $result_trees{'index_entry_at_end_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -394,8 +385,7 @@ $result_trees{'index_entry_at_end_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -452,8 +442,7 @@ $result_trees{'index_entry_at_end_node'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         }
       ],
@@ -467,8 +456,7 @@ $result_trees{'index_entry_at_end_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     }
   ],
diff --git a/tp/t/results/info_tests/invalid_node_name_no_warning.pl 
b/tp/t/results/info_tests/invalid_node_name_no_warning.pl
index 71c7d97a5e..58ec9ceee7 100644
--- a/tp/t/results/info_tests/invalid_node_name_no_warning.pl
+++ b/tp/t/results/info_tests/invalid_node_name_no_warning.pl
@@ -77,8 +77,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
@@ -104,8 +103,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -128,8 +126,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -165,8 +162,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
                       'cmdname' => 'comma',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     },
                     {
@@ -206,8 +202,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -233,8 +228,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     }
                   ],
@@ -269,8 +263,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -302,15 +295,13 @@ $result_trees{'invalid_node_name_no_warning'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -330,8 +321,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -352,8 +342,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
               'cmdname' => 'asis',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
@@ -385,8 +374,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -405,8 +393,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -441,8 +428,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -463,8 +449,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
               'cmdname' => 'asis',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
@@ -504,8 +489,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     }
                   ],
@@ -535,8 +519,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     }
                   ],
@@ -551,8 +534,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -574,8 +556,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
                       'cmdname' => 'comma',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -611,8 +592,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -637,8 +617,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     }
                   ],
@@ -656,8 +635,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -679,8 +657,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     }
   ],
diff --git a/tp/t/results/info_tests/invalid_node_name_warning.pl 
b/tp/t/results/info_tests/invalid_node_name_warning.pl
index 2c90be73b5..1e50762c03 100644
--- a/tp/t/results/info_tests/invalid_node_name_warning.pl
+++ b/tp/t/results/info_tests/invalid_node_name_warning.pl
@@ -77,8 +77,7 @@ $result_trees{'invalid_node_name_warning'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
@@ -104,8 +103,7 @@ $result_trees{'invalid_node_name_warning'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -128,8 +126,7 @@ $result_trees{'invalid_node_name_warning'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -165,8 +162,7 @@ $result_trees{'invalid_node_name_warning'} = {
                       'cmdname' => 'comma',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     },
                     {
@@ -206,8 +202,7 @@ $result_trees{'invalid_node_name_warning'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -233,8 +228,7 @@ $result_trees{'invalid_node_name_warning'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     }
                   ],
@@ -269,8 +263,7 @@ $result_trees{'invalid_node_name_warning'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -302,15 +295,13 @@ $result_trees{'invalid_node_name_warning'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -330,8 +321,7 @@ $result_trees{'invalid_node_name_warning'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -352,8 +342,7 @@ $result_trees{'invalid_node_name_warning'} = {
               'cmdname' => 'asis',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
@@ -385,8 +374,7 @@ $result_trees{'invalid_node_name_warning'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -405,8 +393,7 @@ $result_trees{'invalid_node_name_warning'} = {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -441,8 +428,7 @@ $result_trees{'invalid_node_name_warning'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -463,8 +449,7 @@ $result_trees{'invalid_node_name_warning'} = {
               'cmdname' => 'asis',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
@@ -504,8 +489,7 @@ $result_trees{'invalid_node_name_warning'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     }
                   ],
@@ -535,8 +519,7 @@ $result_trees{'invalid_node_name_warning'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     }
                   ],
@@ -551,8 +534,7 @@ $result_trees{'invalid_node_name_warning'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -574,8 +556,7 @@ $result_trees{'invalid_node_name_warning'} = {
                       'cmdname' => 'comma',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -611,8 +592,7 @@ $result_trees{'invalid_node_name_warning'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -637,8 +617,7 @@ $result_trees{'invalid_node_name_warning'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     }
                   ],
@@ -656,8 +635,7 @@ $result_trees{'invalid_node_name_warning'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -679,8 +657,7 @@ $result_trees{'invalid_node_name_warning'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     }
   ],
@@ -881,7 +858,6 @@ 
$result_converted_errors{'info'}->{'invalid_node_name_warning'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'menu entry name should not contain `:\'',
     'type' => 'warning'
   },
@@ -890,7 +866,6 @@ 
$result_converted_errors{'info'}->{'invalid_node_name_warning'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'menu entry node name should not contain `. \'',
     'type' => 'warning'
   },
@@ -899,7 +874,6 @@ 
$result_converted_errors{'info'}->{'invalid_node_name_warning'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'menu entry node name should not contain `,\'',
     'type' => 'warning'
   },
@@ -908,7 +882,6 @@ 
$result_converted_errors{'info'}->{'invalid_node_name_warning'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'menu entry node name should not contain `:\'',
     'type' => 'warning'
   },
@@ -917,7 +890,6 @@ 
$result_converted_errors{'info'}->{'invalid_node_name_warning'} = [
 ',
     'file_name' => '',
     'line_nr' => 12,
-    'macro' => '',
     'text' => '@node name should not contain `,\': node,comma',
     'type' => 'warning'
   },
@@ -926,7 +898,6 @@ 
$result_converted_errors{'info'}->{'invalid_node_name_warning'} = [
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => '@ref cross-reference name should not contain `:\'',
     'type' => 'warning'
   },
@@ -935,7 +906,6 @@ 
$result_converted_errors{'info'}->{'invalid_node_name_warning'} = [
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => '@ref node name should not contain `.\'',
     'type' => 'warning'
   },
@@ -944,7 +914,6 @@ 
$result_converted_errors{'info'}->{'invalid_node_name_warning'} = [
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => '@ref node name should not contain `,\'',
     'type' => 'warning'
   },
@@ -953,7 +922,6 @@ 
$result_converted_errors{'info'}->{'invalid_node_name_warning'} = [
 ',
     'file_name' => '',
     'line_nr' => 17,
-    'macro' => '',
     'text' => '@ref node name should not contain `:\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/info_tests/known_encoding.pl 
b/tp/t/results/info_tests/known_encoding.pl
index 1a9bb0dc2d..e3f7661bfb 100644
--- a/tp/t/results/info_tests/known_encoding.pl
+++ b/tp/t/results/info_tests/known_encoding.pl
@@ -43,8 +43,7 @@ $result_trees{'known_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -91,8 +90,7 @@ $result_trees{'known_encoding'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     }
   ],
@@ -135,7 +133,6 @@ $result_errors{'known_encoding'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'encoding `latin1\' is not a canonical texinfo encoding',
     'type' => 'warning'
   }
diff --git a/tp/t/results/info_tests/multiline_image_and_align.pl 
b/tp/t/results/info_tests/multiline_image_and_align.pl
index 64404ad3f4..5ff0ea3719 100644
--- a/tp/t/results/info_tests/multiline_image_and_align.pl
+++ b/tp/t/results/info_tests/multiline_image_and_align.pl
@@ -30,8 +30,7 @@ $result_trees{'multiline_image_and_align'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 }
               ],
@@ -52,8 +51,7 @@ $result_trees{'multiline_image_and_align'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -85,8 +83,7 @@ $result_trees{'multiline_image_and_align'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 }
               ],
@@ -107,8 +104,7 @@ $result_trees{'multiline_image_and_align'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -140,8 +136,7 @@ $result_trees{'multiline_image_and_align'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 }
               ],
@@ -162,8 +157,7 @@ $result_trees{'multiline_image_and_align'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -195,8 +189,7 @@ $result_trees{'multiline_image_and_align'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 },
                 {
@@ -220,8 +213,7 @@ $result_trees{'multiline_image_and_align'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -266,8 +258,7 @@ $result_trees{'multiline_image_and_align'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 },
                 {
@@ -304,8 +295,7 @@ $result_trees{'multiline_image_and_align'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 13,
-                    'macro' => ''
+                    'line_nr' => 13
                   }
                 },
                 {
@@ -328,8 +318,7 @@ $result_trees{'multiline_image_and_align'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 13,
-                    'macro' => ''
+                    'line_nr' => 13
                   }
                 },
                 {
@@ -367,8 +356,7 @@ $result_trees{'multiline_image_and_align'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 16,
-                    'macro' => ''
+                    'line_nr' => 16
                   }
                 },
                 {
@@ -406,15 +394,13 @@ $result_trees{'multiline_image_and_align'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -475,8 +461,7 @@ $result_trees{'multiline_image_and_align'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 19,
-                    'macro' => ''
+                    'line_nr' => 19
                   }
                 }
               ],
@@ -497,8 +482,7 @@ $result_trees{'multiline_image_and_align'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         },
         {
@@ -562,8 +546,7 @@ $result_trees{'multiline_image_and_align'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 21,
-                    'macro' => ''
+                    'line_nr' => 21
                   }
                 }
               ],
@@ -584,8 +567,7 @@ $result_trees{'multiline_image_and_align'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 21,
-            'macro' => ''
+            'line_nr' => 21
           }
         },
         {
@@ -649,8 +631,7 @@ $result_trees{'multiline_image_and_align'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 23,
-                    'macro' => ''
+                    'line_nr' => 23
                   }
                 }
               ],
@@ -671,8 +652,7 @@ $result_trees{'multiline_image_and_align'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           }
         },
         {
@@ -736,8 +716,7 @@ $result_trees{'multiline_image_and_align'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 25,
-                    'macro' => ''
+                    'line_nr' => 25
                   }
                 },
                 {
@@ -761,8 +740,7 @@ $result_trees{'multiline_image_and_align'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           }
         },
         {
@@ -839,8 +817,7 @@ $result_trees{'multiline_image_and_align'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 29,
-                    'macro' => ''
+                    'line_nr' => 29
                   }
                 },
                 {
@@ -909,8 +886,7 @@ $result_trees{'multiline_image_and_align'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 31,
-                    'macro' => ''
+                    'line_nr' => 31
                   }
                 },
                 {
@@ -965,8 +941,7 @@ $result_trees{'multiline_image_and_align'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 31,
-                    'macro' => ''
+                    'line_nr' => 31
                   }
                 },
                 {
@@ -1036,8 +1011,7 @@ $result_trees{'multiline_image_and_align'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 34,
-                    'macro' => ''
+                    'line_nr' => 34
                   }
                 },
                 {
@@ -1075,15 +1049,13 @@ $result_trees{'multiline_image_and_align'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 27,
-            'macro' => ''
+            'line_nr' => 27
           }
         }
       ],
diff --git a/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl 
b/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
index 7176a1bfc4..3021e6c7d8 100644
--- a/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
+++ b/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
@@ -69,8 +69,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 }
               ],
@@ -104,8 +103,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     },
                     {
@@ -130,8 +128,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     }
                   ],
@@ -168,8 +165,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -204,8 +200,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
@@ -237,8 +232,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     },
                     {
@@ -287,8 +281,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 8,
-                                'macro' => ''
+                                'line_nr' => 8
                               },
                               'type' => 'index_entry_command'
                             },
@@ -310,8 +303,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 9,
-                                'macro' => ''
+                                'line_nr' => 9
                               }
                             },
                             {
@@ -328,8 +320,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     }
                   ],
@@ -362,8 +353,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     }
                   ],
@@ -403,8 +393,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
@@ -419,8 +408,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -440,8 +428,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 13,
-                    'macro' => ''
+                    'line_nr' => 13
                   },
                   'type' => 'bracketed_arg'
                 },
@@ -456,8 +443,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 13,
-                    'macro' => ''
+                    'line_nr' => 13
                   },
                   'type' => 'bracketed_arg'
                 }
@@ -517,8 +503,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     },
                     {
@@ -543,8 +528,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       }
                     }
                   ],
@@ -605,8 +589,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 21,
-                                'macro' => ''
+                                'line_nr' => 21
                               },
                               'type' => 'index_entry_command'
                             }
@@ -619,8 +602,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 19,
-                        'macro' => ''
+                        'line_nr' => 19
                       }
                     }
                   ],
@@ -657,8 +639,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -695,8 +676,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 25,
-                                'macro' => ''
+                                'line_nr' => 25
                               }
                             },
                             {
@@ -732,8 +712,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     }
                   ],
@@ -773,8 +752,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             }
           ],
@@ -788,8 +766,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -827,8 +804,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 31,
-            'macro' => ''
+            'line_nr' => 31
           }
         },
         {
@@ -855,8 +831,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               }
             },
             {
@@ -885,8 +860,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               }
             },
             {
@@ -909,8 +883,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
diff --git a/tp/t/results/info_tests/nested_footnotes_separate.pl 
b/tp/t/results/info_tests/nested_footnotes_separate.pl
index 13ff75f751..d8b565e1e8 100644
--- a/tp/t/results/info_tests/nested_footnotes_separate.pl
+++ b/tp/t/results/info_tests/nested_footnotes_separate.pl
@@ -39,8 +39,7 @@ $result_trees{'nested_footnotes_separate'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -117,8 +116,7 @@ $result_trees{'nested_footnotes_separate'} = {
                           'cmdname' => 'footnote',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 6,
-                            'macro' => ''
+                            'line_nr' => 6
                           }
                         },
                         {
@@ -135,8 +133,7 @@ $result_trees{'nested_footnotes_separate'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -158,8 +155,7 @@ $result_trees{'nested_footnotes_separate'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
@@ -203,7 +199,6 @@ $result_errors{'nested_footnotes_separate'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => '@footnote should not appear anywhere inside @footnote',
     'type' => 'warning'
   }
diff --git a/tp/t/results/info_tests/nested_multitable_anchor_index.pl 
b/tp/t/results/info_tests/nested_multitable_anchor_index.pl
index b7d7292d40..6b6755e8d6 100644
--- a/tp/t/results/info_tests/nested_multitable_anchor_index.pl
+++ b/tp/t/results/info_tests/nested_multitable_anchor_index.pl
@@ -46,8 +46,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   },
                   'type' => 'bracketed_arg'
                 },
@@ -62,8 +61,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   },
                   'type' => 'bracketed_arg'
                 }
@@ -103,8 +101,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
                                   ],
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 5,
-                                    'macro' => ''
+                                    'line_nr' => 5
                                   },
                                   'type' => 'bracketed_arg'
                                 },
@@ -119,8 +116,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
                                   ],
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 5,
-                                    'macro' => ''
+                                    'line_nr' => 5
                                   },
                                   'type' => 'bracketed_arg'
                                 }
@@ -161,8 +157,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
                                       },
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 6,
-                                        'macro' => ''
+                                        'line_nr' => 6
                                       }
                                     },
                                     {
@@ -195,8 +190,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
                                               },
                                               'source_info' => {
                                                 'file_name' => '',
-                                                'line_nr' => 6,
-                                                'macro' => ''
+                                                'line_nr' => 6
                                               }
                                             },
                                             {
@@ -237,8 +231,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
                                               },
                                               'source_info' => {
                                                 'file_name' => '',
-                                                'line_nr' => 7,
-                                                'macro' => ''
+                                                'line_nr' => 7
                                               },
                                               'type' => 'index_entry_command'
                                             }
@@ -251,8 +244,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
                                       },
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 6,
-                                        'macro' => ''
+                                        'line_nr' => 6
                                       }
                                     }
                                   ],
@@ -292,8 +284,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 8,
-                                'macro' => ''
+                                'line_nr' => 8
                               }
                             }
                           ],
@@ -307,8 +298,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 5,
-                            'macro' => ''
+                            'line_nr' => 5
                           }
                         },
                         {
@@ -321,8 +311,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     },
                     {
@@ -347,8 +336,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     }
                   ],
@@ -380,8 +368,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     },
                     {
@@ -414,8 +401,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 10,
-                                'macro' => ''
+                                'line_nr' => 10
                               }
                             },
                             {
@@ -456,8 +442,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 11,
-                                'macro' => ''
+                                'line_nr' => 11
                               },
                               'type' => 'index_entry_command'
                             }
@@ -470,8 +455,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     }
                   ],
@@ -511,8 +495,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
@@ -526,8 +509,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -565,8 +547,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           }
         },
         {
@@ -598,8 +579,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -628,8 +608,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -652,8 +631,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
diff --git a/tp/t/results/info_tests/no_node_but_top.pl 
b/tp/t/results/info_tests/no_node_but_top.pl
index 1c47fea442..ea26468584 100644
--- a/tp/t/results/info_tests/no_node_but_top.pl
+++ b/tp/t/results/info_tests/no_node_but_top.pl
@@ -36,8 +36,7 @@ $result_trees{'no_node_but_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
diff --git a/tp/t/results/info_tests/no_top_node.pl 
b/tp/t/results/info_tests/no_top_node.pl
index f80310c06f..0626dfc93c 100644
--- a/tp/t/results/info_tests/no_top_node.pl
+++ b/tp/t/results/info_tests/no_top_node.pl
@@ -39,8 +39,7 @@ $result_trees{'no_top_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
diff --git a/tp/t/results/info_tests/note_in_strong.pl 
b/tp/t/results/info_tests/note_in_strong.pl
index 5b561a1025..e97a048037 100644
--- a/tp/t/results/info_tests/note_in_strong.pl
+++ b/tp/t/results/info_tests/note_in_strong.pl
@@ -53,8 +53,7 @@ $result_trees{'note_in_strong'} = {
               'cmdname' => 'strong',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -88,8 +87,7 @@ $result_trees{'note_in_strong'} = {
               'cmdname' => 'strong',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -133,8 +131,7 @@ $result_trees{'note_in_strong'} = {
               'cmdname' => 'strong',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -168,8 +165,7 @@ $result_trees{'note_in_strong'} = {
               'cmdname' => 'strong',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -203,8 +199,7 @@ $result_trees{'note_in_strong'} = {
               'cmdname' => 'strong',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -238,8 +233,7 @@ $result_trees{'note_in_strong'} = {
               'cmdname' => 'strong',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -261,8 +255,7 @@ $result_trees{'note_in_strong'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
@@ -362,7 +355,6 @@ $result_converted_errors{'info'}->{'note_in_strong'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@strong{Note...} produces a spurious cross-reference in Info; 
reword to avoid that',
     'type' => 'warning'
   },
@@ -371,7 +363,6 @@ $result_converted_errors{'info'}->{'note_in_strong'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => '@strong{Note...} produces a spurious cross-reference in Info; 
reword to avoid that',
     'type' => 'warning'
   }
diff --git a/tp/t/results/info_tests/note_in_strong_end_of_line.pl 
b/tp/t/results/info_tests/note_in_strong_end_of_line.pl
index 509800e5c8..fc48192fce 100644
--- a/tp/t/results/info_tests/note_in_strong_end_of_line.pl
+++ b/tp/t/results/info_tests/note_in_strong_end_of_line.pl
@@ -53,8 +53,7 @@ $result_trees{'note_in_strong_end_of_line'} = {
               'cmdname' => 'strong',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -92,8 +91,7 @@ $result_trees{'note_in_strong_end_of_line'} = {
               'cmdname' => 'strong',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -115,8 +113,7 @@ $result_trees{'note_in_strong_end_of_line'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
@@ -192,7 +189,6 @@ 
$result_converted_errors{'info'}->{'note_in_strong_end_of_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@strong{Note...} produces a spurious cross-reference in Info; 
reword to avoid that',
     'type' => 'warning'
   },
@@ -201,7 +197,6 @@ 
$result_converted_errors{'info'}->{'note_in_strong_end_of_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@strong{Note...} produces a spurious cross-reference in Info; 
reword to avoid that',
     'type' => 'warning'
   }
diff --git a/tp/t/results/info_tests/novalidate_empty_refs.pl 
b/tp/t/results/info_tests/novalidate_empty_refs.pl
index ef80ef712e..c26ec4de0b 100644
--- a/tp/t/results/info_tests/novalidate_empty_refs.pl
+++ b/tp/t/results/info_tests/novalidate_empty_refs.pl
@@ -25,8 +25,7 @@ $result_trees{'novalidate_empty_refs'} = {
           'cmdname' => 'novalidate',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -84,8 +83,7 @@ $result_trees{'novalidate_empty_refs'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -110,8 +108,7 @@ $result_trees{'novalidate_empty_refs'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     }
                   ],
@@ -129,8 +126,7 @@ $result_trees{'novalidate_empty_refs'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -157,8 +153,7 @@ $result_trees{'novalidate_empty_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -181,8 +176,7 @@ $result_trees{'novalidate_empty_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -210,8 +204,7 @@ $result_trees{'novalidate_empty_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -232,8 +225,7 @@ $result_trees{'novalidate_empty_refs'} = {
               'cmdname' => 'asis',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
@@ -254,8 +246,7 @@ $result_trees{'novalidate_empty_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     }
   ],
@@ -310,7 +301,6 @@ $result_errors{'novalidate_empty_refs'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'empty node name after expansion `@
 \'',
     'type' => 'error'
@@ -320,7 +310,6 @@ $result_errors{'novalidate_empty_refs'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => 'empty node name after expansion `@:\'',
     'type' => 'error'
   },
@@ -329,7 +318,6 @@ $result_errors{'novalidate_empty_refs'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'empty node name after expansion `@asis{ }\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/info_tests/one_node_counted_elements.pl 
b/tp/t/results/info_tests/one_node_counted_elements.pl
index f57ce72d34..ff5a7ca4c5 100644
--- a/tp/t/results/info_tests/one_node_counted_elements.pl
+++ b/tp/t/results/info_tests/one_node_counted_elements.pl
@@ -47,8 +47,7 @@ $result_trees{'one_node_counted_elements'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               },
               'type' => 'index_entry_command'
             }
@@ -148,8 +147,7 @@ $result_trees{'one_node_counted_elements'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'index_entry_command'
             }
@@ -184,8 +182,7 @@ $result_trees{'one_node_counted_elements'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -262,8 +259,7 @@ $result_trees{'one_node_counted_elements'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -295,15 +291,13 @@ $result_trees{'one_node_counted_elements'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -343,8 +337,7 @@ $result_trees{'one_node_counted_elements'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -403,8 +396,7 @@ $result_trees{'one_node_counted_elements'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         }
       ],
@@ -420,8 +412,7 @@ $result_trees{'one_node_counted_elements'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     }
   ],
@@ -504,7 +495,6 @@ $result_errors{'one_node_counted_elements'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   }
@@ -574,7 +564,6 @@ 
$result_converted_errors{'info'}->{'one_node_counted_elements'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/info_tests/only_documentencoding.pl 
b/tp/t/results/info_tests/only_documentencoding.pl
index d5d5dd52bd..e3211c1b85 100644
--- a/tp/t/results/info_tests/only_documentencoding.pl
+++ b/tp/t/results/info_tests/only_documentencoding.pl
@@ -32,8 +32,7 @@ $result_trees{'only_documentencoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/info_tests/paragraphindent_and_preamble.pl 
b/tp/t/results/info_tests/paragraphindent_and_preamble.pl
index a55cb1ae6d..db0eb5aa64 100644
--- a/tp/t/results/info_tests/paragraphindent_and_preamble.pl
+++ b/tp/t/results/info_tests/paragraphindent_and_preamble.pl
@@ -76,15 +76,13 @@ $result_trees{'paragraphindent_and_preamble'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -122,8 +120,7 @@ $result_trees{'paragraphindent_and_preamble'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -180,8 +177,7 @@ $result_trees{'paragraphindent_and_preamble'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -251,8 +247,7 @@ $result_trees{'paragraphindent_and_preamble'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
diff --git a/tp/t/results/info_tests/paragraphindent_asis_first.pl 
b/tp/t/results/info_tests/paragraphindent_asis_first.pl
index 7092a9d440..b988c47dd6 100644
--- a/tp/t/results/info_tests/paragraphindent_asis_first.pl
+++ b/tp/t/results/info_tests/paragraphindent_asis_first.pl
@@ -62,8 +62,7 @@ $result_trees{'paragraphindent_asis_first'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
diff --git 
a/tp/t/results/info_tests/paragraphindent_in_preamble_and_in_document.pl 
b/tp/t/results/info_tests/paragraphindent_in_preamble_and_in_document.pl
index e3c22f4098..84087035e9 100644
--- a/tp/t/results/info_tests/paragraphindent_in_preamble_and_in_document.pl
+++ b/tp/t/results/info_tests/paragraphindent_in_preamble_and_in_document.pl
@@ -76,15 +76,13 @@ 
$result_trees{'paragraphindent_in_preamble_and_in_document'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -122,8 +120,7 @@ 
$result_trees{'paragraphindent_in_preamble_and_in_document'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -180,8 +177,7 @@ 
$result_trees{'paragraphindent_in_preamble_and_in_document'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -272,8 +268,7 @@ 
$result_trees{'paragraphindent_in_preamble_and_in_document'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           }
         },
         {
@@ -304,8 +299,7 @@ 
$result_trees{'paragraphindent_in_preamble_and_in_document'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
diff --git a/tp/t/results/info_tests/paragraphindent_none_first.pl 
b/tp/t/results/info_tests/paragraphindent_none_first.pl
index 8a182e3c34..d6c0fac939 100644
--- a/tp/t/results/info_tests/paragraphindent_none_first.pl
+++ b/tp/t/results/info_tests/paragraphindent_none_first.pl
@@ -80,8 +80,7 @@ $result_trees{'paragraphindent_none_first'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
diff --git a/tp/t/results/info_tests/paragraphindent_not_in_preamble.pl 
b/tp/t/results/info_tests/paragraphindent_not_in_preamble.pl
index 8fca39822d..39c325aec3 100644
--- a/tp/t/results/info_tests/paragraphindent_not_in_preamble.pl
+++ b/tp/t/results/info_tests/paragraphindent_not_in_preamble.pl
@@ -76,15 +76,13 @@ $result_trees{'paragraphindent_not_in_preamble'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -127,8 +125,7 @@ $result_trees{'paragraphindent_not_in_preamble'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -219,8 +216,7 @@ $result_trees{'paragraphindent_not_in_preamble'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           }
         },
         {
@@ -251,8 +247,7 @@ $result_trees{'paragraphindent_not_in_preamble'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
diff --git a/tp/t/results/info_tests/pxref_test.pl 
b/tp/t/results/info_tests/pxref_test.pl
index 3e75a02aec..0314e40eee 100644
--- a/tp/t/results/info_tests/pxref_test.pl
+++ b/tp/t/results/info_tests/pxref_test.pl
@@ -77,8 +77,7 @@ $result_trees{'pxref_test'} = {
               'cmdname' => 'pxref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -135,8 +134,7 @@ $result_trees{'pxref_test'} = {
               'cmdname' => 'pxref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -181,8 +179,7 @@ $result_trees{'pxref_test'} = {
               'cmdname' => 'pxref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -239,8 +236,7 @@ $result_trees{'pxref_test'} = {
               'cmdname' => 'pxref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -262,8 +258,7 @@ $result_trees{'pxref_test'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
diff --git a/tp/t/results/info_tests/quote_node_names_info.pl 
b/tp/t/results/info_tests/quote_node_names_info.pl
index 0208c2a6aa..f806e2ffb3 100644
--- a/tp/t/results/info_tests/quote_node_names_info.pl
+++ b/tp/t/results/info_tests/quote_node_names_info.pl
@@ -44,8 +44,7 @@ $result_trees{'quote_node_names_info'} = {
       },
       'source_info' => {
         'file_name' => 'nodequote.texi',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -104,8 +103,7 @@ $result_trees{'quote_node_names_info'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -147,8 +145,7 @@ $result_trees{'quote_node_names_info'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -200,8 +197,7 @@ $result_trees{'quote_node_names_info'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -243,8 +239,7 @@ $result_trees{'quote_node_names_info'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -296,8 +291,7 @@ $result_trees{'quote_node_names_info'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -339,8 +333,7 @@ $result_trees{'quote_node_names_info'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -379,8 +372,7 @@ $result_trees{'quote_node_names_info'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -415,8 +407,7 @@ $result_trees{'quote_node_names_info'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => 'nodequote.texi',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     }
                   ],
@@ -434,8 +425,7 @@ $result_trees{'quote_node_names_info'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -477,8 +467,7 @@ $result_trees{'quote_node_names_info'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -538,8 +527,7 @@ $result_trees{'quote_node_names_info'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -599,8 +587,7 @@ $result_trees{'quote_node_names_info'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -675,8 +662,7 @@ $result_trees{'quote_node_names_info'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -751,8 +737,7 @@ $result_trees{'quote_node_names_info'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               }
             },
             {
@@ -832,8 +817,7 @@ $result_trees{'quote_node_names_info'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             },
             {
@@ -913,8 +897,7 @@ $result_trees{'quote_node_names_info'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             },
             {
@@ -994,8 +977,7 @@ $result_trees{'quote_node_names_info'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               }
             },
             {
@@ -1049,8 +1031,7 @@ $result_trees{'quote_node_names_info'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => 'nodequote.texi',
-                        'line_nr' => 34,
-                        'macro' => ''
+                        'line_nr' => 34
                       }
                     },
                     {
@@ -1090,8 +1071,7 @@ $result_trees{'quote_node_names_info'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               },
               'type' => 'menu_entry'
             },
@@ -1132,8 +1112,7 @@ $result_trees{'quote_node_names_info'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => 'nodequote.texi',
-                        'line_nr' => 35,
-                        'macro' => ''
+                        'line_nr' => 35
                       }
                     },
                     {
@@ -1173,8 +1152,7 @@ $result_trees{'quote_node_names_info'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               },
               'type' => 'menu_entry'
             },
@@ -1221,8 +1199,7 @@ $result_trees{'quote_node_names_info'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               },
               'type' => 'menu_entry'
             },
@@ -1251,8 +1228,7 @@ $result_trees{'quote_node_names_info'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => 'nodequote.texi',
-                        'line_nr' => 37,
-                        'macro' => ''
+                        'line_nr' => 37
                       }
                     },
                     {
@@ -1281,8 +1257,7 @@ $result_trees{'quote_node_names_info'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => 'nodequote.texi',
-                        'line_nr' => 37,
-                        'macro' => ''
+                        'line_nr' => 37
                       }
                     }
                   ],
@@ -1317,8 +1292,7 @@ $result_trees{'quote_node_names_info'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 37,
-                'macro' => ''
+                'line_nr' => 37
               },
               'type' => 'menu_entry'
             },
@@ -1368,8 +1342,7 @@ $result_trees{'quote_node_names_info'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               },
               'type' => 'menu_entry'
             },
@@ -1416,15 +1389,13 @@ $result_trees{'quote_node_names_info'} = {
               },
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodequote.texi',
-            'line_nr' => 33,
-            'macro' => ''
+            'line_nr' => 33
           }
         },
         {
@@ -1436,8 +1407,7 @@ $result_trees{'quote_node_names_info'} = {
       'extra' => {},
       'source_info' => {
         'file_name' => 'nodequote.texi',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -1469,8 +1439,7 @@ $result_trees{'quote_node_names_info'} = {
       },
       'source_info' => {
         'file_name' => 'nodequote.texi',
-        'line_nr' => 42,
-        'macro' => ''
+        'line_nr' => 42
       }
     },
     {
@@ -1522,8 +1491,7 @@ $result_trees{'quote_node_names_info'} = {
       },
       'source_info' => {
         'file_name' => 'nodequote.texi',
-        'line_nr' => 43,
-        'macro' => ''
+        'line_nr' => 43
       }
     },
     {
@@ -1555,8 +1523,7 @@ $result_trees{'quote_node_names_info'} = {
       },
       'source_info' => {
         'file_name' => 'nodequote.texi',
-        'line_nr' => 47,
-        'macro' => ''
+        'line_nr' => 47
       }
     },
     {
@@ -1594,8 +1561,7 @@ $result_trees{'quote_node_names_info'} = {
       },
       'source_info' => {
         'file_name' => 'nodequote.texi',
-        'line_nr' => 48,
-        'macro' => ''
+        'line_nr' => 48
       }
     },
     {
@@ -1625,8 +1591,7 @@ $result_trees{'quote_node_names_info'} = {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             },
             {
@@ -1684,8 +1649,7 @@ $result_trees{'quote_node_names_info'} = {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             },
             {
@@ -1766,8 +1730,7 @@ $result_trees{'quote_node_names_info'} = {
       },
       'source_info' => {
         'file_name' => 'nodequote.texi',
-        'line_nr' => 50,
-        'macro' => ''
+        'line_nr' => 50
       }
     },
     {
@@ -1805,8 +1768,7 @@ $result_trees{'quote_node_names_info'} = {
       },
       'source_info' => {
         'file_name' => 'nodequote.texi',
-        'line_nr' => 51,
-        'macro' => ''
+        'line_nr' => 51
       }
     },
     {
@@ -1827,8 +1789,7 @@ $result_trees{'quote_node_names_info'} = {
               'cmdname' => 'asis',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               }
             }
           ],
@@ -1853,8 +1814,7 @@ $result_trees{'quote_node_names_info'} = {
       },
       'source_info' => {
         'file_name' => 'nodequote.texi',
-        'line_nr' => 53,
-        'macro' => ''
+        'line_nr' => 53
       }
     },
     {
@@ -1875,8 +1835,7 @@ $result_trees{'quote_node_names_info'} = {
               'cmdname' => 'asis',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 54,
-                'macro' => ''
+                'line_nr' => 54
               }
             }
           ],
@@ -1907,8 +1866,7 @@ $result_trees{'quote_node_names_info'} = {
       },
       'source_info' => {
         'file_name' => 'nodequote.texi',
-        'line_nr' => 54,
-        'macro' => ''
+        'line_nr' => 54
       }
     },
     {
@@ -1956,8 +1914,7 @@ $result_trees{'quote_node_names_info'} = {
       },
       'source_info' => {
         'file_name' => 'nodequote.texi',
-        'line_nr' => 56,
-        'macro' => ''
+        'line_nr' => 56
       }
     }
   ],
@@ -2425,7 +2382,6 @@ $result_errors{'quote_node_names_info'} = [
 ',
     'file_name' => 'nodequote.texi',
     'line_nr' => 34,
-    'macro' => '',
     'text' => '@menu entry node name `blah@asis{:}blah\' different from node 
name `blah:blah\'',
     'type' => 'warning'
   },
@@ -2434,7 +2390,6 @@ $result_errors{'quote_node_names_info'} = [
 ',
     'file_name' => 'nodequote.texi',
     'line_nr' => 35,
-    'macro' => '',
     'text' => '@menu entry node name `blumpty@asis{.}fump\' different from 
node name `blumpty.fump\'',
     'type' => 'warning'
   },
@@ -2444,7 +2399,6 @@ $result_errors{'quote_node_names_info'} = [
 ',
     'file_name' => 'nodequote.texi',
     'line_nr' => 38,
-    'macro' => '',
     'text' => '@menu reference to nonexistent node `u.al)ext::
 \'',
     'type' => 'error'
@@ -2454,7 +2408,6 @@ $result_errors{'quote_node_names_info'} = [
 ',
     'file_name' => 'nodequote.texi',
     'line_nr' => 56,
-    'macro' => '',
     'text' => 'node `top secret node\' unreferenced',
     'type' => 'warning'
   }
@@ -2470,7 +2423,6 @@ 
$result_converted_errors{'file_info'}->{'quote_node_names_info'} = [
 ',
     'file_name' => 'nodequote.texi',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '`.\' or `,\' must follow @xref',
     'type' => 'warning'
   },
@@ -2479,7 +2431,6 @@ 
$result_converted_errors{'file_info'}->{'quote_node_names_info'} = [
 ',
     'file_name' => 'nodequote.texi',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '`.\' or `,\' must follow @xref',
     'type' => 'warning'
   },
@@ -2488,7 +2439,6 @@ 
$result_converted_errors{'file_info'}->{'quote_node_names_info'} = [
 ',
     'file_name' => 'nodequote.texi',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '`.\' or `,\' must follow @xref',
     'type' => 'warning'
   },
@@ -2497,7 +2447,6 @@ 
$result_converted_errors{'file_info'}->{'quote_node_names_info'} = [
 ',
     'file_name' => 'nodequote.texi',
     'line_nr' => 8,
-    'macro' => '',
     'text' => '`.\' or `,\' must follow @xref',
     'type' => 'warning'
   },
@@ -2506,7 +2455,6 @@ 
$result_converted_errors{'file_info'}->{'quote_node_names_info'} = [
 ',
     'file_name' => 'nodequote.texi',
     'line_nr' => 10,
-    'macro' => '',
     'text' => '`.\' or `,\' must follow @xref',
     'type' => 'warning'
   }
diff --git a/tp/t/results/info_tests/ref_tests.pl 
b/tp/t/results/info_tests/ref_tests.pl
index 786e5bd06a..d09c22136f 100644
--- a/tp/t/results/info_tests/ref_tests.pl
+++ b/tp/t/results/info_tests/ref_tests.pl
@@ -78,8 +78,7 @@ $result_trees{'ref_tests'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -121,8 +120,7 @@ $result_trees{'ref_tests'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -168,8 +166,7 @@ $result_trees{'ref_tests'} = {
                       'cmdname' => 'ref',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     }
                   ],
@@ -179,8 +176,7 @@ $result_trees{'ref_tests'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -250,8 +246,7 @@ $result_trees{'ref_tests'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -306,8 +301,7 @@ $result_trees{'ref_tests'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -366,8 +360,7 @@ $result_trees{'ref_tests'} = {
                       'cmdname' => 'ref',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     }
                   ],
@@ -377,8 +370,7 @@ $result_trees{'ref_tests'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -433,8 +425,7 @@ $result_trees{'ref_tests'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -461,8 +452,7 @@ $result_trees{'ref_tests'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
@@ -568,7 +558,6 @@ $result_converted_errors{'info'}->{'ref_tests'} = [
 ',
     'file_name' => '',
     'line_nr' => 12,
-    'macro' => '',
     'text' => '@ref node name should not contain `.\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/info_tests/space_at_menu_end.pl 
b/tp/t/results/info_tests/space_at_menu_end.pl
index bcf803a456..124b44c149 100644
--- a/tp/t/results/info_tests/space_at_menu_end.pl
+++ b/tp/t/results/info_tests/space_at_menu_end.pl
@@ -96,8 +96,7 @@ $result_trees{'space_at_menu_end'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -144,15 +143,13 @@ $result_trees{'space_at_menu_end'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -181,8 +178,7 @@ $result_trees{'space_at_menu_end'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
diff --git a/tp/t/results/info_tests/space_in_menu.pl 
b/tp/t/results/info_tests/space_in_menu.pl
index b2bad00cf6..c5300852f5 100644
--- a/tp/t/results/info_tests/space_in_menu.pl
+++ b/tp/t/results/info_tests/space_in_menu.pl
@@ -39,8 +39,7 @@ $result_trees{'space_in_menu'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -138,8 +137,7 @@ $result_trees{'space_in_menu'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -171,15 +169,13 @@ $result_trees{'space_in_menu'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -196,8 +192,7 @@ $result_trees{'space_in_menu'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -229,8 +224,7 @@ $result_trees{'space_in_menu'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -277,8 +271,7 @@ $result_trees{'space_in_menu'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     }
   ],
diff --git a/tp/t/results/info_tests/space_in_setfilename.pl 
b/tp/t/results/info_tests/space_in_setfilename.pl
index 700ceac9ee..2d1dbaa554 100644
--- a/tp/t/results/info_tests/space_in_setfilename.pl
+++ b/tp/t/results/info_tests/space_in_setfilename.pl
@@ -34,8 +34,7 @@ $result_trees{'space_in_setfilename'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -59,8 +58,7 @@ $result_trees{'space_in_setfilename'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -100,8 +98,7 @@ $result_trees{'space_in_setfilename'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     }
   ],
@@ -140,7 +137,6 @@ $result_errors{'space_in_setfilename'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@verb should not appear in @setfilename',
     'type' => 'warning'
   },
@@ -149,7 +145,6 @@ $result_errors{'space_in_setfilename'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'bad argument to @setfilename: @ @verb{: name :}@',
     'type' => 'error'
   }
diff --git a/tp/t/results/info_tests/split_no_copying.pl 
b/tp/t/results/info_tests/split_no_copying.pl
index aab7ea0b8a..faeae14b61 100644
--- a/tp/t/results/info_tests/split_no_copying.pl
+++ b/tp/t/results/info_tests/split_no_copying.pl
@@ -46,8 +46,7 @@ $result_trees{'split_no_copying'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -87,8 +86,7 @@ $result_trees{'split_no_copying'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -186,8 +184,7 @@ $result_trees{'split_no_copying'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'menu_entry'
             },
@@ -219,15 +216,13 @@ $result_trees{'split_no_copying'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -244,8 +239,7 @@ $result_trees{'split_no_copying'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -277,8 +271,7 @@ $result_trees{'split_no_copying'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -330,8 +323,7 @@ $result_trees{'split_no_copying'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
diff --git a/tp/t/results/info_tests/split_nocopying.pl 
b/tp/t/results/info_tests/split_nocopying.pl
index 907553f5c6..185e881725 100644
--- a/tp/t/results/info_tests/split_nocopying.pl
+++ b/tp/t/results/info_tests/split_nocopying.pl
@@ -59,8 +59,7 @@ $result_trees{'split_nocopying'} = {
       },
       'source_info' => {
         'file_name' => 'split_nocopying.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -164,8 +163,7 @@ $result_trees{'split_nocopying'} = {
               ],
               'source_info' => {
                 'file_name' => 'split_nocopying.texi',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -197,15 +195,13 @@ $result_trees{'split_nocopying'} = {
               },
               'source_info' => {
                 'file_name' => 'split_nocopying.texi',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
           'source_info' => {
             'file_name' => 'split_nocopying.texi',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -222,8 +218,7 @@ $result_trees{'split_nocopying'} = {
       },
       'source_info' => {
         'file_name' => 'split_nocopying.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -255,8 +250,7 @@ $result_trees{'split_nocopying'} = {
       },
       'source_info' => {
         'file_name' => 'split_nocopying.texi',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -308,8 +302,7 @@ $result_trees{'split_nocopying'} = {
       },
       'source_info' => {
         'file_name' => 'split_nocopying.texi',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
diff --git a/tp/t/results/info_tests/split_nocopying_split.pl 
b/tp/t/results/info_tests/split_nocopying_split.pl
index 5272c2ace5..df07544fd0 100644
--- a/tp/t/results/info_tests/split_nocopying_split.pl
+++ b/tp/t/results/info_tests/split_nocopying_split.pl
@@ -59,8 +59,7 @@ $result_trees{'split_nocopying_split'} = {
       },
       'source_info' => {
         'file_name' => 'split_nocopying.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -164,8 +163,7 @@ $result_trees{'split_nocopying_split'} = {
               ],
               'source_info' => {
                 'file_name' => 'split_nocopying.texi',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -197,15 +195,13 @@ $result_trees{'split_nocopying_split'} = {
               },
               'source_info' => {
                 'file_name' => 'split_nocopying.texi',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
           'source_info' => {
             'file_name' => 'split_nocopying.texi',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -222,8 +218,7 @@ $result_trees{'split_nocopying_split'} = {
       },
       'source_info' => {
         'file_name' => 'split_nocopying.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -255,8 +250,7 @@ $result_trees{'split_nocopying_split'} = {
       },
       'source_info' => {
         'file_name' => 'split_nocopying.texi',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -308,8 +302,7 @@ $result_trees{'split_nocopying_split'} = {
       },
       'source_info' => {
         'file_name' => 'split_nocopying.texi',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
diff --git a/tp/t/results/info_tests/split_test_before_first_node.pl 
b/tp/t/results/info_tests/split_test_before_first_node.pl
index 6f6c73db5a..82ef9e0d6f 100644
--- a/tp/t/results/info_tests/split_test_before_first_node.pl
+++ b/tp/t/results/info_tests/split_test_before_first_node.pl
@@ -39,8 +39,7 @@ $result_trees{'split_test_before_first_node'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -97,8 +96,7 @@ $result_trees{'split_test_before_first_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -196,8 +194,7 @@ $result_trees{'split_test_before_first_node'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -229,15 +226,13 @@ $result_trees{'split_test_before_first_node'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -254,8 +249,7 @@ $result_trees{'split_test_before_first_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -287,8 +281,7 @@ $result_trees{'split_test_before_first_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -340,8 +333,7 @@ $result_trees{'split_test_before_first_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     }
   ],
diff --git 
a/tp/t/results/info_tests/split_test_before_first_node_no_empty_line.pl 
b/tp/t/results/info_tests/split_test_before_first_node_no_empty_line.pl
index cfb81a13df..06b5e0a06a 100644
--- a/tp/t/results/info_tests/split_test_before_first_node_no_empty_line.pl
+++ b/tp/t/results/info_tests/split_test_before_first_node_no_empty_line.pl
@@ -39,8 +39,7 @@ $result_trees{'split_test_before_first_node_no_empty_line'} = 
{
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -92,8 +91,7 @@ $result_trees{'split_test_before_first_node_no_empty_line'} = 
{
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -191,8 +189,7 @@ $result_trees{'split_test_before_first_node_no_empty_line'} 
= {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'menu_entry'
             },
@@ -224,15 +221,13 @@ 
$result_trees{'split_test_before_first_node_no_empty_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -249,8 +244,7 @@ $result_trees{'split_test_before_first_node_no_empty_line'} 
= {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -282,8 +276,7 @@ $result_trees{'split_test_before_first_node_no_empty_line'} 
= {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -335,8 +328,7 @@ $result_trees{'split_test_before_first_node_no_empty_line'} 
= {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     }
   ],
diff --git a/tp/t/results/info_tests/test_index.pl 
b/tp/t/results/info_tests/test_index.pl
index d8e507f833..3eef6bf050 100644
--- a/tp/t/results/info_tests/test_index.pl
+++ b/tp/t/results/info_tests/test_index.pl
@@ -39,8 +39,7 @@ $result_trees{'test_index'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -91,8 +90,7 @@ $result_trees{'test_index'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -146,8 +144,7 @@ $result_trees{'test_index'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'index_entry_command'
             },
@@ -184,8 +181,7 @@ $result_trees{'test_index'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               },
               'type' => 'index_entry_command'
             },
@@ -202,8 +198,7 @@ $result_trees{'test_index'} = {
                       'cmdname' => 'exclamdown',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     }
                   ],
@@ -232,8 +227,7 @@ $result_trees{'test_index'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'index_entry_command'
             },
@@ -270,8 +264,7 @@ $result_trees{'test_index'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'index_entry_command'
             }
@@ -320,8 +313,7 @@ $result_trees{'test_index'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     },
                     {
@@ -372,8 +364,7 @@ $result_trees{'test_index'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               },
               'type' => 'def_line'
             },
@@ -454,8 +445,7 @@ $result_trees{'test_index'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               },
               'type' => 'def_line'
             },
@@ -497,8 +487,7 @@ $result_trees{'test_index'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
@@ -509,8 +498,7 @@ $result_trees{'test_index'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           }
         },
         {
@@ -526,8 +514,7 @@ $result_trees{'test_index'} = {
                   'cmdname' => 'emph',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 17,
-                    'macro' => ''
+                    'line_nr' => 17
                   },
                   'type' => 'command_as_argument'
                 }
@@ -579,8 +566,7 @@ $result_trees{'test_index'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       }
                     }
                   ],
@@ -644,8 +630,7 @@ $result_trees{'test_index'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 21,
-                        'macro' => ''
+                        'line_nr' => 21
                       }
                     },
                     {
@@ -680,8 +665,7 @@ $result_trees{'test_index'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -728,8 +712,7 @@ $result_trees{'test_index'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             }
           ],
@@ -743,8 +726,7 @@ $result_trees{'test_index'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -809,8 +791,7 @@ $result_trees{'test_index'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               },
               'type' => 'menu_entry'
             },
@@ -857,8 +838,7 @@ $result_trees{'test_index'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               },
               'type' => 'menu_entry'
             },
@@ -890,15 +870,13 @@ $result_trees{'test_index'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         },
         {
@@ -915,8 +893,7 @@ $result_trees{'test_index'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -948,8 +925,7 @@ $result_trees{'test_index'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 31,
-        'macro' => ''
+        'line_nr' => 31
       }
     },
     {
@@ -1009,8 +985,7 @@ $result_trees{'test_index'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 34,
-            'macro' => ''
+            'line_nr' => 34
           },
           'type' => 'index_entry_command'
         },
@@ -1047,8 +1022,7 @@ $result_trees{'test_index'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 35,
-            'macro' => ''
+            'line_nr' => 35
           },
           'type' => 'index_entry_command'
         },
@@ -1096,8 +1070,7 @@ $result_trees{'test_index'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               },
               'type' => 'index_entry_command'
             },
@@ -1216,8 +1189,7 @@ $result_trees{'test_index'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 51,
-            'macro' => ''
+            'line_nr' => 51
           },
           'type' => 'index_entry_command'
         },
@@ -2309,8 +2281,7 @@ $result_trees{'test_index'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 203,
-            'macro' => ''
+            'line_nr' => 203
           },
           'type' => 'index_entry_command'
         },
@@ -2330,8 +2301,7 @@ $result_trees{'test_index'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 32,
-        'macro' => ''
+        'line_nr' => 32
       }
     },
     {
@@ -2364,8 +2334,7 @@ $result_trees{'test_index'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 205,
-        'macro' => ''
+        'line_nr' => 205
       }
     },
     {
@@ -2425,8 +2394,7 @@ $result_trees{'test_index'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 208,
-            'macro' => ''
+            'line_nr' => 208
           },
           'type' => 'index_entry_command'
         },
@@ -2483,8 +2451,7 @@ $result_trees{'test_index'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 212,
-            'macro' => ''
+            'line_nr' => 212
           }
         },
         {
@@ -2525,8 +2492,7 @@ $result_trees{'test_index'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 214,
-            'macro' => ''
+            'line_nr' => 214
           },
           'type' => 'index_entry_command'
         },
@@ -2574,8 +2540,7 @@ $result_trees{'test_index'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 217,
-            'macro' => ''
+            'line_nr' => 217
           }
         },
         {
@@ -2594,8 +2559,7 @@ $result_trees{'test_index'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 206,
-        'macro' => ''
+        'line_nr' => 206
       }
     },
     {
@@ -2633,8 +2597,7 @@ $result_trees{'test_index'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 219,
-        'macro' => ''
+        'line_nr' => 219
       }
     },
     {
@@ -2672,8 +2635,7 @@ $result_trees{'test_index'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 221,
-        'macro' => ''
+        'line_nr' => 221
       }
     },
     {
@@ -2725,8 +2687,7 @@ $result_trees{'test_index'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 225,
-            'macro' => ''
+            'line_nr' => 225
           }
         },
         {
@@ -2745,8 +2706,7 @@ $result_trees{'test_index'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 223,
-        'macro' => ''
+        'line_nr' => 223
       }
     },
     {
@@ -2782,8 +2742,7 @@ $result_trees{'test_index'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 227,
-        'macro' => ''
+        'line_nr' => 227
       }
     },
     {
@@ -2843,8 +2802,7 @@ $result_trees{'test_index'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 231,
-            'macro' => ''
+            'line_nr' => 231
           },
           'type' => 'index_entry_command'
         },
@@ -2871,8 +2829,7 @@ $result_trees{'test_index'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 233,
-            'macro' => ''
+            'line_nr' => 233
           }
         },
         {
@@ -2896,8 +2853,7 @@ $result_trees{'test_index'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 229,
-        'macro' => ''
+        'line_nr' => 229
       }
     },
     {
@@ -3642,7 +3598,6 @@ $result_errors{'test_index'} = [
 ',
     'file_name' => '',
     'line_nr' => 227,
-    'macro' => '',
     'text' => '@centerchap is obsolete',
     'type' => 'warning'
   }
diff --git a/tp/t/results/info_tests/text_before_node.pl 
b/tp/t/results/info_tests/text_before_node.pl
index 9a8aa72c68..26669ebc24 100644
--- a/tp/t/results/info_tests/text_before_node.pl
+++ b/tp/t/results/info_tests/text_before_node.pl
@@ -39,8 +39,7 @@ $result_trees{'text_before_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -124,8 +123,7 @@ $result_trees{'text_before_node'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -157,15 +155,13 @@ $result_trees{'text_before_node'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -191,8 +187,7 @@ $result_trees{'text_before_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -224,8 +219,7 @@ $result_trees{'text_before_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -250,8 +244,7 @@ $result_trees{'text_before_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     }
   ],
diff --git a/tp/t/results/info_tests/top_node_normalization.pl 
b/tp/t/results/info_tests/top_node_normalization.pl
index 5f902eb770..c7a551449c 100644
--- a/tp/t/results/info_tests/top_node_normalization.pl
+++ b/tp/t/results/info_tests/top_node_normalization.pl
@@ -58,8 +58,7 @@ $result_trees{'top_node_normalization'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -87,8 +86,7 @@ $result_trees{'top_node_normalization'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -160,8 +158,7 @@ $result_trees{'top_node_normalization'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -193,15 +190,13 @@ $result_trees{'top_node_normalization'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
@@ -216,8 +211,7 @@ $result_trees{'top_node_normalization'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
@@ -279,7 +273,6 @@ $result_errors{'top_node_normalization'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@xref to `TOP\', different from node name `ToP\'',
     'type' => 'warning'
   },
@@ -288,7 +281,6 @@ $result_errors{'top_node_normalization'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@xref to `tOP\', different from node name `ToP\'',
     'type' => 'warning'
   },
@@ -297,7 +289,6 @@ $result_errors{'top_node_normalization'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => '@menu entry node name `tOP\' different from node name `ToP\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/info_tests/two_paragraphindent_in_preamble.pl 
b/tp/t/results/info_tests/two_paragraphindent_in_preamble.pl
index 0f339a4595..b00ad9d04c 100644
--- a/tp/t/results/info_tests/two_paragraphindent_in_preamble.pl
+++ b/tp/t/results/info_tests/two_paragraphindent_in_preamble.pl
@@ -76,15 +76,13 @@ $result_trees{'two_paragraphindent_in_preamble'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -122,8 +120,7 @@ $result_trees{'two_paragraphindent_in_preamble'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -161,8 +158,7 @@ $result_trees{'two_paragraphindent_in_preamble'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -219,8 +215,7 @@ $result_trees{'two_paragraphindent_in_preamble'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -290,8 +285,7 @@ $result_trees{'two_paragraphindent_in_preamble'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
diff --git 
a/tp/t/results/info_tests/two_paragraphindent_in_preamble_and_in_document.pl 
b/tp/t/results/info_tests/two_paragraphindent_in_preamble_and_in_document.pl
index b3f176cb74..fd8d234d6b 100644
--- a/tp/t/results/info_tests/two_paragraphindent_in_preamble_and_in_document.pl
+++ b/tp/t/results/info_tests/two_paragraphindent_in_preamble_and_in_document.pl
@@ -76,15 +76,13 @@ 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -122,8 +120,7 @@ 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -161,8 +158,7 @@ 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -219,8 +215,7 @@ 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -311,8 +306,7 @@ 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
@@ -343,8 +337,7 @@ 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
diff --git a/tp/t/results/info_tests/unknown_encoding.pl 
b/tp/t/results/info_tests/unknown_encoding.pl
index 8a08fc8d27..9d36c487cb 100644
--- a/tp/t/results/info_tests/unknown_encoding.pl
+++ b/tp/t/results/info_tests/unknown_encoding.pl
@@ -42,8 +42,7 @@ $result_trees{'unknown_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -90,8 +89,7 @@ $result_trees{'unknown_encoding'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     }
   ],
@@ -134,7 +132,6 @@ $result_errors{'unknown_encoding'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'encoding `ggg\' is not a canonical texinfo encoding',
     'type' => 'warning'
   },
@@ -143,7 +140,6 @@ $result_errors{'unknown_encoding'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'unhandled encoding name `ggg\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/info_tests/xref_test.pl 
b/tp/t/results/info_tests/xref_test.pl
index 312ac5e22e..f2c3a32f84 100644
--- a/tp/t/results/info_tests/xref_test.pl
+++ b/tp/t/results/info_tests/xref_test.pl
@@ -78,8 +78,7 @@ $result_trees{'xref_test'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -120,8 +119,7 @@ $result_trees{'xref_test'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -167,8 +165,7 @@ $result_trees{'xref_test'} = {
                       'cmdname' => 'xref',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
@@ -178,8 +175,7 @@ $result_trees{'xref_test'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -234,8 +230,7 @@ $result_trees{'xref_test'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -277,8 +272,7 @@ $result_trees{'xref_test'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -300,8 +294,7 @@ $result_trees{'xref_test'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
@@ -387,7 +380,6 @@ $result_converted_errors{'info'}->{'xref_test'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => '@xref node name should not contain `.\'',
     'type' => 'warning'
   },
@@ -396,7 +388,6 @@ $result_converted_errors{'info'}->{'xref_test'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => '`.\' or `,\' must follow @xref, not !',
     'type' => 'warning'
   }
diff --git a/tp/t/results/init_files_tests/customize_special_element.pl 
b/tp/t/results/init_files_tests/customize_special_element.pl
index 0c8eed3401..83a52640c0 100644
--- a/tp/t/results/init_files_tests/customize_special_element.pl
+++ b/tp/t/results/init_files_tests/customize_special_element.pl
@@ -51,8 +51,7 @@ $result_trees{'customize_special_element'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -71,8 +70,7 @@ $result_trees{'customize_special_element'} = {
               'cmdname' => 'contents',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -86,8 +84,7 @@ $result_trees{'customize_special_element'} = {
               'cmdname' => 'shortcontents',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -130,8 +127,7 @@ $result_trees{'customize_special_element'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -167,8 +163,7 @@ $result_trees{'customize_special_element'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -200,8 +195,7 @@ $result_trees{'customize_special_element'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -256,8 +250,7 @@ $result_trees{'customize_special_element'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         }
       ],
@@ -271,8 +264,7 @@ $result_trees{'customize_special_element'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -304,8 +296,7 @@ $result_trees{'customize_special_element'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -356,8 +347,7 @@ $result_trees{'customize_special_element'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -378,8 +368,7 @@ $result_trees{'customize_special_element'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     }
   ],
diff --git a/tp/t/results/init_files_tests/customize_translations.pl 
b/tp/t/results/init_files_tests/customize_translations.pl
index 9e41fd4a37..9b8ee654c0 100644
--- a/tp/t/results/init_files_tests/customize_translations.pl
+++ b/tp/t/results/init_files_tests/customize_translations.pl
@@ -32,8 +32,7 @@ $result_trees{'customize_translations'} = {
               'cmdname' => 'contents',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -76,8 +75,7 @@ $result_trees{'customize_translations'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -113,8 +111,7 @@ $result_trees{'customize_translations'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -146,8 +143,7 @@ $result_trees{'customize_translations'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -185,8 +181,7 @@ $result_trees{'customize_translations'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -229,8 +224,7 @@ $result_trees{'customize_translations'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           }
         }
       ],
@@ -244,8 +238,7 @@ $result_trees{'customize_translations'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -277,8 +270,7 @@ $result_trees{'customize_translations'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -316,8 +308,7 @@ $result_trees{'customize_translations'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -343,8 +334,7 @@ $result_trees{'customize_translations'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -376,8 +366,7 @@ $result_trees{'customize_translations'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -432,8 +421,7 @@ $result_trees{'customize_translations'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 21,
-            'macro' => ''
+            'line_nr' => 21
           }
         }
       ],
@@ -447,8 +435,7 @@ $result_trees{'customize_translations'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 19,
-        'macro' => ''
+        'line_nr' => 19
       }
     },
     {
@@ -480,8 +467,7 @@ $result_trees{'customize_translations'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 22,
-        'macro' => ''
+        'line_nr' => 22
       }
     },
     {
@@ -519,8 +505,7 @@ $result_trees{'customize_translations'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               }
             },
             {
@@ -546,8 +531,7 @@ $result_trees{'customize_translations'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 23,
-        'macro' => ''
+        'line_nr' => 23
       }
     },
     {
@@ -579,8 +563,7 @@ $result_trees{'customize_translations'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 27,
-        'macro' => ''
+        'line_nr' => 27
       }
     },
     {
@@ -618,8 +601,7 @@ $result_trees{'customize_translations'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 28,
-        'macro' => ''
+        'line_nr' => 28
       }
     }
   ],
diff --git a/tp/t/results/init_files_tests/documentation_examples.pl 
b/tp/t/results/init_files_tests/documentation_examples.pl
index 58cdc4f9f9..f72566bde0 100644
--- a/tp/t/results/init_files_tests/documentation_examples.pl
+++ b/tp/t/results/init_files_tests/documentation_examples.pl
@@ -58,8 +58,7 @@ $result_trees{'documentation_examples'} = {
                       'cmdname' => 'email',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -79,8 +78,7 @@ $result_trees{'documentation_examples'} = {
                       'cmdname' => 'sansserif',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -95,8 +93,7 @@ $result_trees{'documentation_examples'} = {
                       'cmdname' => 'error',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -111,8 +108,7 @@ $result_trees{'documentation_examples'} = {
                       'cmdname' => 'equiv',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -133,8 +129,7 @@ $result_trees{'documentation_examples'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -177,8 +172,7 @@ $result_trees{'documentation_examples'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -214,8 +208,7 @@ $result_trees{'documentation_examples'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -247,8 +240,7 @@ $result_trees{'documentation_examples'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -291,8 +283,7 @@ $result_trees{'documentation_examples'} = {
               'cmdname' => 'sansserif',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -313,8 +304,7 @@ $result_trees{'documentation_examples'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -329,8 +319,7 @@ $result_trees{'documentation_examples'} = {
               'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -359,8 +348,7 @@ $result_trees{'documentation_examples'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -382,8 +370,7 @@ $result_trees{'documentation_examples'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -407,8 +394,7 @@ $result_trees{'documentation_examples'} = {
           'cmdname' => 'titlefont',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           }
         },
         {
@@ -450,8 +436,7 @@ $result_trees{'documentation_examples'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -472,8 +457,7 @@ $result_trees{'documentation_examples'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -494,8 +478,7 @@ $result_trees{'documentation_examples'} = {
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -530,8 +513,7 @@ $result_trees{'documentation_examples'} = {
                       'cmdname' => 'sansserif',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -552,8 +534,7 @@ $result_trees{'documentation_examples'} = {
                       'cmdname' => 'error',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -568,8 +549,7 @@ $result_trees{'documentation_examples'} = {
                       'cmdname' => 'equiv',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     }
                   ],
@@ -579,8 +559,7 @@ $result_trees{'documentation_examples'} = {
               'cmdname' => 'math',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -625,8 +604,7 @@ $result_trees{'documentation_examples'} = {
                   'cmdname' => 'sansserif',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 20,
-                    'macro' => ''
+                    'line_nr' => 20
                   }
                 },
                 {
@@ -647,8 +625,7 @@ $result_trees{'documentation_examples'} = {
                   'cmdname' => 'error',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 20,
-                    'macro' => ''
+                    'line_nr' => 20
                   }
                 },
                 {
@@ -663,8 +640,7 @@ $result_trees{'documentation_examples'} = {
                   'cmdname' => 'equiv',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 20,
-                    'macro' => ''
+                    'line_nr' => 20
                   }
                 },
                 {
@@ -702,15 +678,13 @@ $result_trees{'documentation_examples'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         },
         {
@@ -746,8 +720,7 @@ $result_trees{'documentation_examples'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           }
         },
         {
@@ -766,8 +739,7 @@ $result_trees{'documentation_examples'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               }
             },
             {
@@ -793,8 +765,7 @@ $result_trees{'documentation_examples'} = {
               'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             },
             {
@@ -820,8 +791,7 @@ $result_trees{'documentation_examples'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -876,8 +846,7 @@ $result_trees{'documentation_examples'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 31,
-            'macro' => ''
+            'line_nr' => 31
           }
         },
         {
@@ -896,8 +865,7 @@ $result_trees{'documentation_examples'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               }
             },
             {
@@ -923,8 +891,7 @@ $result_trees{'documentation_examples'} = {
               'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             },
             {
@@ -956,8 +923,7 @@ $result_trees{'documentation_examples'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 29,
-        'macro' => ''
+        'line_nr' => 29
       }
     }
   ],
diff --git 
a/tp/t/results/init_files_tests/macro_defined_txiinternalvalue_in_translation.pl
 
b/tp/t/results/init_files_tests/macro_defined_txiinternalvalue_in_translation.pl
index 8a984fe89a..1ca4fd8679 100644
--- 
a/tp/t/results/init_files_tests/macro_defined_txiinternalvalue_in_translation.pl
+++ 
b/tp/t/results/init_files_tests/macro_defined_txiinternalvalue_in_translation.pl
@@ -39,8 +39,7 @@ 
$result_trees{'macro_defined_txiinternalvalue_in_translation'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -78,8 +77,7 @@ 
$result_trees{'macro_defined_txiinternalvalue_in_translation'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
diff --git a/tp/t/results/init_files_tests/modified_translation.pl 
b/tp/t/results/init_files_tests/modified_translation.pl
index 3d819410dc..40dc533dfa 100644
--- a/tp/t/results/init_files_tests/modified_translation.pl
+++ b/tp/t/results/init_files_tests/modified_translation.pl
@@ -20,8 +20,7 @@ $result_trees{'modified_translation'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -64,8 +63,7 @@ $result_trees{'modified_translation'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -87,8 +85,7 @@ $result_trees{'modified_translation'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -131,8 +128,7 @@ $result_trees{'modified_translation'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -154,8 +150,7 @@ $result_trees{'modified_translation'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
diff --git a/tp/t/results/init_files_tests/redefined_need.pl 
b/tp/t/results/init_files_tests/redefined_need.pl
index f2609656db..1ab6d675e3 100644
--- a/tp/t/results/init_files_tests/redefined_need.pl
+++ b/tp/t/results/init_files_tests/redefined_need.pl
@@ -39,8 +39,7 @@ $result_trees{'redefined_need'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -101,7 +100,6 @@ $result_converted_errors{'html'}->{'redefined_need'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'need has the right arg: 0.1',
     'type' => 'warning'
   }
diff --git a/tp/t/results/init_files_tests/sc_formatting_with_css.pl 
b/tp/t/results/init_files_tests/sc_formatting_with_css.pl
index 31db2c69fa..2795b68ebb 100644
--- a/tp/t/results/init_files_tests/sc_formatting_with_css.pl
+++ b/tp/t/results/init_files_tests/sc_formatting_with_css.pl
@@ -32,8 +32,7 @@ $result_trees{'sc_formatting_with_css'} = {
                       'cmdname' => 'sc',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     },
                     {
@@ -52,8 +51,7 @@ $result_trees{'sc_formatting_with_css'} = {
               'cmdname' => 'settitle',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -80,8 +78,7 @@ $result_trees{'sc_formatting_with_css'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -126,8 +123,7 @@ $result_trees{'sc_formatting_with_css'} = {
                   'cmdname' => 'sc',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   }
                 },
                 {
@@ -165,15 +161,13 @@ $result_trees{'sc_formatting_with_css'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -212,7 +206,6 @@ $result_errors{'sc_formatting_with_css'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
   },
@@ -221,7 +214,6 @@ $result_errors{'sc_formatting_with_css'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git 
a/tp/t/results/init_files_tests/translation_in_parser_in_translation.pl 
b/tp/t/results/init_files_tests/translation_in_parser_in_translation.pl
index 30182bb22b..58a84abcbc 100644
--- a/tp/t/results/init_files_tests/translation_in_parser_in_translation.pl
+++ b/tp/t/results/init_files_tests/translation_in_parser_in_translation.pl
@@ -39,8 +39,7 @@ $result_trees{'translation_in_parser_in_translation'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -83,8 +82,7 @@ $result_trees{'translation_in_parser_in_translation'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -120,8 +118,7 @@ $result_trees{'translation_in_parser_in_translation'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -153,8 +150,7 @@ $result_trees{'translation_in_parser_in_translation'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -306,8 +302,7 @@ $result_trees{'translation_in_parser_in_translation'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'def_line'
             },
@@ -353,8 +348,7 @@ $result_trees{'translation_in_parser_in_translation'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
@@ -365,8 +359,7 @@ $result_trees{'translation_in_parser_in_translation'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -385,8 +378,7 @@ $result_trees{'translation_in_parser_in_translation'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     }
   ],
diff --git a/tp/t/results/init_files_tests/undefined_node_filename.pl 
b/tp/t/results/init_files_tests/undefined_node_filename.pl
index 89d3aa2cb5..3dd48d3943 100644
--- a/tp/t/results/init_files_tests/undefined_node_filename.pl
+++ b/tp/t/results/init_files_tests/undefined_node_filename.pl
@@ -51,8 +51,7 @@ $result_trees{'undefined_node_filename'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -84,8 +83,7 @@ $result_trees{'undefined_node_filename'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     }
   ],
diff --git a/tp/t/results/invalid_nestings/accents.pl 
b/tp/t/results/invalid_nestings/accents.pl
index 7d3d9023a7..d89fb10d08 100644
--- a/tp/t/results/invalid_nestings/accents.pl
+++ b/tp/t/results/invalid_nestings/accents.pl
@@ -28,8 +28,7 @@ $result_trees{'accents'} = {
                       'cmdname' => 'TeX',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -39,8 +38,7 @@ $result_trees{'accents'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -60,8 +58,7 @@ $result_trees{'accents'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -100,8 +97,7 @@ $result_trees{'accents'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
@@ -111,8 +107,7 @@ $result_trees{'accents'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -140,8 +135,7 @@ $result_trees{'accents'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
@@ -151,8 +145,7 @@ $result_trees{'accents'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -190,7 +183,6 @@ $result_errors{'accents'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@code should not appear in @~',
     'type' => 'warning'
   },
@@ -199,7 +191,6 @@ $result_errors{'accents'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@anchor should not appear in @^',
     'type' => 'warning'
   }
diff --git a/tp/t/results/invalid_nestings/bad_style_nesting.pl 
b/tp/t/results/invalid_nestings/bad_style_nesting.pl
index 79acc38b73..3045239d10 100644
--- a/tp/t/results/invalid_nestings/bad_style_nesting.pl
+++ b/tp/t/results/invalid_nestings/bad_style_nesting.pl
@@ -26,8 +26,7 @@ $result_trees{'bad_style_nesting'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -84,15 +83,13 @@ $result_trees{'bad_style_nesting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
@@ -119,7 +116,6 @@ $result_errors{'bad_style_nesting'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@code missing closing brace',
     'type' => 'error'
   },
@@ -128,7 +124,6 @@ $result_errors{'bad_style_nesting'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/bad_tab_nesting.pl 
b/tp/t/results/invalid_nestings/bad_tab_nesting.pl
index 1ada6c7035..b6bdd8ae93 100644
--- a/tp/t/results/invalid_nestings/bad_tab_nesting.pl
+++ b/tp/t/results/invalid_nestings/bad_tab_nesting.pl
@@ -21,8 +21,7 @@ $result_trees{'bad_tab_nesting'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'bracketed_arg'
                 },
@@ -37,8 +36,7 @@ $result_trees{'bad_tab_nesting'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'bracketed_arg'
                 }
@@ -80,8 +78,7 @@ $result_trees{'bad_tab_nesting'} = {
                               'cmdname' => 'code',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 3,
-                                'macro' => ''
+                                'line_nr' => 3
                               }
                             }
                           ],
@@ -93,8 +90,7 @@ $result_trees{'bad_tab_nesting'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -119,8 +115,7 @@ $result_trees{'bad_tab_nesting'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -160,8 +155,7 @@ $result_trees{'bad_tab_nesting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -175,8 +169,7 @@ $result_trees{'bad_tab_nesting'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -203,7 +196,6 @@ $result_errors{'bad_tab_nesting'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@code missing closing brace',
     'type' => 'error'
   },
@@ -212,7 +204,6 @@ $result_errors{'bad_tab_nesting'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/block_not_matching.pl 
b/tp/t/results/invalid_nestings/block_not_matching.pl
index 64b6ce85e4..155ff22ae0 100644
--- a/tp/t/results/invalid_nestings/block_not_matching.pl
+++ b/tp/t/results/invalid_nestings/block_not_matching.pl
@@ -35,8 +35,7 @@ $result_trees{'block_not_matching'} = {
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -62,8 +61,7 @@ $result_trees{'block_not_matching'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -114,8 +112,7 @@ $result_trees{'block_not_matching'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'def_line'
             },
@@ -141,8 +138,7 @@ $result_trees{'block_not_matching'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -158,8 +154,7 @@ $result_trees{'block_not_matching'} = {
                   'cmdname' => 'asis',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   },
                   'type' => 'command_as_argument'
                 }
@@ -204,8 +199,7 @@ $result_trees{'block_not_matching'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     }
                   ],
@@ -239,8 +233,7 @@ $result_trees{'block_not_matching'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -256,8 +249,7 @@ $result_trees{'block_not_matching'} = {
                   'cmdname' => 'emph',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 14,
-                    'macro' => ''
+                    'line_nr' => 14
                   },
                   'type' => 'command_as_argument'
                 }
@@ -302,8 +294,7 @@ $result_trees{'block_not_matching'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     }
                   ],
@@ -337,8 +328,7 @@ $result_trees{'block_not_matching'} = {
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     }
                   ],
@@ -358,8 +348,7 @@ $result_trees{'block_not_matching'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           }
         },
         {
@@ -393,8 +382,7 @@ $result_trees{'block_not_matching'} = {
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 21,
-            'macro' => ''
+            'line_nr' => 21
           }
         },
         {
@@ -428,8 +416,7 @@ $result_trees{'block_not_matching'} = {
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           }
         },
         {
@@ -463,8 +450,7 @@ $result_trees{'block_not_matching'} = {
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 29,
-            'macro' => ''
+            'line_nr' => 29
           }
         },
         {
@@ -498,8 +484,7 @@ $result_trees{'block_not_matching'} = {
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 33,
-            'macro' => ''
+            'line_nr' => 33
           }
         }
       ],
@@ -567,7 +552,6 @@ $result_errors{'block_not_matching'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '`@end\' expected `quotation\', but saw `cartouche\'',
     'type' => 'error'
   },
@@ -576,7 +560,6 @@ $result_errors{'block_not_matching'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'unmatched `@end cartouche\'',
     'type' => 'error'
   },
@@ -585,7 +568,6 @@ $result_errors{'block_not_matching'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -594,7 +576,6 @@ $result_errors{'block_not_matching'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '`@end\' expected `deffn\', but saw `deftypefun\'',
     'type' => 'error'
   },
@@ -603,7 +584,6 @@ $result_errors{'block_not_matching'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'unmatched `@end deftypefun\'',
     'type' => 'error'
   },
@@ -612,7 +592,6 @@ $result_errors{'block_not_matching'} = [
 ',
     'file_name' => '',
     'line_nr' => 12,
-    'macro' => '',
     'text' => '`@end\' expected `table\', but saw `vtable\'',
     'type' => 'error'
   },
@@ -621,7 +600,6 @@ $result_errors{'block_not_matching'} = [
 ',
     'file_name' => '',
     'line_nr' => 12,
-    'macro' => '',
     'text' => 'unmatched `@end vtable\'',
     'type' => 'error'
   },
@@ -630,7 +608,6 @@ $result_errors{'block_not_matching'} = [
 ',
     'file_name' => '',
     'line_nr' => 18,
-    'macro' => '',
     'text' => '`@end\' expected `example\', but saw `display\'',
     'type' => 'error'
   },
@@ -639,7 +616,6 @@ $result_errors{'block_not_matching'} = [
 ',
     'file_name' => '',
     'line_nr' => 18,
-    'macro' => '',
     'text' => '`@end\' expected `table\', but saw `display\'',
     'type' => 'error'
   },
@@ -648,7 +624,6 @@ $result_errors{'block_not_matching'} = [
 ',
     'file_name' => '',
     'line_nr' => 18,
-    'macro' => '',
     'text' => 'unmatched `@end display\'',
     'type' => 'error'
   },
@@ -657,7 +632,6 @@ $result_errors{'block_not_matching'} = [
 ',
     'file_name' => '',
     'line_nr' => 19,
-    'macro' => '',
     'text' => 'unmatched `@end table\'',
     'type' => 'error'
   },
@@ -666,7 +640,6 @@ $result_errors{'block_not_matching'} = [
 ',
     'file_name' => '',
     'line_nr' => 23,
-    'macro' => '',
     'text' => '`@end\' expected `group\', but saw `table\'',
     'type' => 'error'
   },
@@ -675,7 +648,6 @@ $result_errors{'block_not_matching'} = [
 ',
     'file_name' => '',
     'line_nr' => 23,
-    'macro' => '',
     'text' => 'unmatched `@end table\'',
     'type' => 'error'
   },
@@ -684,7 +656,6 @@ $result_errors{'block_not_matching'} = [
 ',
     'file_name' => '',
     'line_nr' => 27,
-    'macro' => '',
     'text' => '`@end\' expected `group\', but saw `cartouche\'',
     'type' => 'error'
   },
@@ -693,7 +664,6 @@ $result_errors{'block_not_matching'} = [
 ',
     'file_name' => '',
     'line_nr' => 27,
-    'macro' => '',
     'text' => 'unmatched `@end cartouche\'',
     'type' => 'error'
   },
@@ -702,7 +672,6 @@ $result_errors{'block_not_matching'} = [
 ',
     'file_name' => '',
     'line_nr' => 31,
-    'macro' => '',
     'text' => '`@end\' expected `cartouche\', but saw `group\'',
     'type' => 'error'
   },
@@ -711,7 +680,6 @@ $result_errors{'block_not_matching'} = [
 ',
     'file_name' => '',
     'line_nr' => 31,
-    'macro' => '',
     'text' => 'unmatched `@end group\'',
     'type' => 'error'
   },
@@ -720,7 +688,6 @@ $result_errors{'block_not_matching'} = [
 ',
     'file_name' => '',
     'line_nr' => 35,
-    'macro' => '',
     'text' => '`@end\' expected `cartouche\', but saw `float\'',
     'type' => 'error'
   },
@@ -729,7 +696,6 @@ $result_errors{'block_not_matching'} = [
 ',
     'file_name' => '',
     'line_nr' => 35,
-    'macro' => '',
     'text' => 'unmatched `@end float\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/cartouche_in_style_command.pl 
b/tp/t/results/invalid_nestings/cartouche_in_style_command.pl
index d4327bad4f..adc279c6f8 100644
--- a/tp/t/results/invalid_nestings/cartouche_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/cartouche_in_style_command.pl
@@ -26,8 +26,7 @@ $result_trees{'cartouche_in_style_command'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -84,15 +83,13 @@ $result_trees{'cartouche_in_style_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -126,7 +123,6 @@ $result_errors{'cartouche_in_style_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@code missing closing brace',
     'type' => 'error'
   },
@@ -135,7 +131,6 @@ $result_errors{'cartouche_in_style_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/center.pl 
b/tp/t/results/invalid_nestings/center.pl
index 718b73520d..5554743d45 100644
--- a/tp/t/results/invalid_nestings/center.pl
+++ b/tp/t/results/invalid_nestings/center.pl
@@ -17,8 +17,7 @@ $result_trees{'center'} = {
                   'cmdname' => 'indent',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -39,8 +38,7 @@ $result_trees{'center'} = {
                   'cmdname' => 'titlefont',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -64,8 +62,7 @@ $result_trees{'center'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -87,8 +84,7 @@ $result_trees{'center'} = {
                   'cmdname' => 'footnote',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 }
               ],
@@ -109,8 +105,7 @@ $result_trees{'center'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -157,8 +152,7 @@ $result_trees{'center'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   },
                   'type' => 'index_entry_command'
                 }
@@ -174,8 +168,7 @@ $result_trees{'center'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -202,8 +195,7 @@ $result_trees{'center'} = {
                   'cmdname' => 'quotation',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 }
               ],
@@ -218,8 +210,7 @@ $result_trees{'center'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -268,8 +259,7 @@ $result_trees{'center'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 }
               ],
@@ -284,8 +274,7 @@ $result_trees{'center'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -312,8 +301,7 @@ $result_trees{'center'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 }
               ],
@@ -328,8 +316,7 @@ $result_trees{'center'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -365,8 +352,7 @@ $result_trees{'center'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 15,
-                    'macro' => ''
+                    'line_nr' => 15
                   }
                 },
                 {
@@ -394,8 +380,7 @@ $result_trees{'center'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 15,
-                    'macro' => ''
+                    'line_nr' => 15
                   }
                 }
               ],
@@ -410,8 +395,7 @@ $result_trees{'center'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         },
         {
@@ -440,8 +424,7 @@ $result_trees{'center'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             }
           ],
@@ -472,8 +455,7 @@ $result_trees{'center'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         },
         {
@@ -489,8 +471,7 @@ $result_trees{'center'} = {
                   'cmdname' => 'asis',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 21,
-                    'macro' => ''
+                    'line_nr' => 21
                   },
                   'type' => 'command_as_argument'
                 }
@@ -540,8 +521,7 @@ $result_trees{'center'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 22,
-                    'macro' => ''
+                    'line_nr' => 22
                   }
                 }
               ],
@@ -575,8 +555,7 @@ $result_trees{'center'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             }
           ],
@@ -590,8 +569,7 @@ $result_trees{'center'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 21,
-            'macro' => ''
+            'line_nr' => 21
           }
         },
         {
@@ -607,8 +585,7 @@ $result_trees{'center'} = {
                   'cmdname' => 'emph',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 25,
-                    'macro' => ''
+                    'line_nr' => 25
                   },
                   'type' => 'command_as_argument'
                 }
@@ -653,8 +630,7 @@ $result_trees{'center'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 26,
-                        'macro' => ''
+                        'line_nr' => 26
                       }
                     }
                   ],
@@ -694,8 +670,7 @@ $result_trees{'center'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 27,
-                        'macro' => ''
+                        'line_nr' => 27
                       }
                     }
                   ],
@@ -732,8 +707,7 @@ $result_trees{'center'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             }
           ],
@@ -747,8 +721,7 @@ $result_trees{'center'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           }
         },
         {
@@ -784,8 +757,7 @@ $result_trees{'center'} = {
                   'cmdname' => 'center',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 31,
-                    'macro' => ''
+                    'line_nr' => 31
                   }
                 }
               ],
@@ -800,8 +772,7 @@ $result_trees{'center'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 31,
-            'macro' => ''
+            'line_nr' => 31
           }
         },
         {
@@ -827,8 +798,7 @@ $result_trees{'center'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 33,
-                    'macro' => ''
+                    'line_nr' => 33
                   }
                 },
                 {
@@ -856,8 +826,7 @@ $result_trees{'center'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 33,
-                    'macro' => ''
+                    'line_nr' => 33
                   }
                 }
               ],
@@ -872,8 +841,7 @@ $result_trees{'center'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 33,
-            'macro' => ''
+            'line_nr' => 33
           }
         },
         {
@@ -897,8 +865,7 @@ $result_trees{'center'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 35,
-                    'macro' => ''
+                    'line_nr' => 35
                   }
                 },
                 {
@@ -926,8 +893,7 @@ $result_trees{'center'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 35,
-                    'macro' => ''
+                    'line_nr' => 35
                   }
                 }
               ],
@@ -942,8 +908,7 @@ $result_trees{'center'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 35,
-            'macro' => ''
+            'line_nr' => 35
           }
         },
         {
@@ -977,8 +942,7 @@ $result_trees{'center'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 39,
-                    'macro' => ''
+                    'line_nr' => 39
                   },
                   'type' => 'bracketed_arg'
                 },
@@ -993,8 +957,7 @@ $result_trees{'center'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 39,
-                    'macro' => ''
+                    'line_nr' => 39
                   },
                   'type' => 'bracketed_arg'
                 }
@@ -1035,8 +998,7 @@ $result_trees{'center'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 40,
-                        'macro' => ''
+                        'line_nr' => 40
                       }
                     },
                     {
@@ -1091,8 +1053,7 @@ $result_trees{'center'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 41,
-                            'macro' => ''
+                            'line_nr' => 41
                           }
                         },
                         {
@@ -1124,8 +1085,7 @@ $result_trees{'center'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 42,
-                            'macro' => ''
+                            'line_nr' => 42
                           }
                         }
                       ],
@@ -1134,8 +1094,7 @@ $result_trees{'center'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 40,
-                        'macro' => ''
+                        'line_nr' => 40
                       }
                     }
                   ],
@@ -1175,8 +1134,7 @@ $result_trees{'center'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               }
             }
           ],
@@ -1190,8 +1148,7 @@ $result_trees{'center'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 39,
-            'macro' => ''
+            'line_nr' => 39
           }
         },
         {
@@ -1214,8 +1171,7 @@ $result_trees{'center'} = {
                           'cmdname' => 'asis',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 45,
-                            'macro' => ''
+                            'line_nr' => 45
                           },
                           'type' => 'command_as_argument'
                         }
@@ -1240,8 +1196,7 @@ $result_trees{'center'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 45,
-                    'macro' => ''
+                    'line_nr' => 45
                   }
                 }
               ],
@@ -1256,8 +1211,7 @@ $result_trees{'center'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 45,
-            'macro' => ''
+            'line_nr' => 45
           }
         },
         {
@@ -1406,7 +1360,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@indent should not appear in @center',
     'type' => 'warning'
   },
@@ -1415,7 +1368,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@cindex should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1424,7 +1376,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@cindex should not appear in @center',
     'type' => 'warning'
   },
@@ -1433,7 +1384,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -1442,7 +1392,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@quotation should not appear in @center',
     'type' => 'warning'
   },
@@ -1451,7 +1400,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'no matching `@end quotation\'',
     'type' => 'error'
   },
@@ -1460,7 +1408,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'unmatched `@end quotation\'',
     'type' => 'error'
   },
@@ -1469,7 +1416,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@center should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1478,7 +1424,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@center should not appear in @center',
     'type' => 'warning'
   },
@@ -1487,7 +1432,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => '@code missing closing brace',
     'type' => 'error'
   },
@@ -1496,7 +1440,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   },
@@ -1505,7 +1448,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 15,
-    'macro' => '',
     'text' => '@center should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1514,7 +1456,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 15,
-    'macro' => '',
     'text' => '@code missing closing brace',
     'type' => 'error'
   },
@@ -1523,7 +1464,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 15,
-    'macro' => '',
     'text' => '@center should not appear in @center',
     'type' => 'warning'
   },
@@ -1532,7 +1472,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 17,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   },
@@ -1541,7 +1480,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 19,
-    'macro' => '',
     'text' => '@center should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1550,7 +1488,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 19,
-    'macro' => '',
     'text' => '@code missing closing brace',
     'type' => 'error'
   },
@@ -1559,7 +1496,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 19,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   },
@@ -1568,7 +1504,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 22,
-    'macro' => '',
     'text' => '@item should not appear in @center',
     'type' => 'warning'
   },
@@ -1577,7 +1512,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 22,
-    'macro' => '',
     'text' => '@item outside of table or list',
     'type' => 'error'
   },
@@ -1586,7 +1520,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 21,
-    'macro' => '',
     'text' => '@table has text but no @item',
     'type' => 'warning'
   },
@@ -1595,7 +1528,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 27,
-    'macro' => '',
     'text' => '@item should not appear in @center',
     'type' => 'warning'
   },
@@ -1604,7 +1536,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 27,
-    'macro' => '',
     'text' => '@item outside of table or list',
     'type' => 'error'
   },
@@ -1613,7 +1544,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 31,
-    'macro' => '',
     'text' => '@center should not appear in @center',
     'type' => 'warning'
   },
@@ -1622,7 +1552,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 31,
-    'macro' => '',
     'text' => '@center missing argument',
     'type' => 'warning'
   },
@@ -1631,7 +1560,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 33,
-    'macro' => '',
     'text' => '@center should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1640,7 +1568,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 33,
-    'macro' => '',
     'text' => '@samp missing closing brace',
     'type' => 'error'
   },
@@ -1649,7 +1576,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 33,
-    'macro' => '',
     'text' => '@center should not appear in @center',
     'type' => 'warning'
   },
@@ -1658,7 +1584,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 33,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   },
@@ -1667,7 +1592,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 35,
-    'macro' => '',
     'text' => '@center should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1676,7 +1600,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 35,
-    'macro' => '',
     'text' => '@samp missing closing brace',
     'type' => 'error'
   },
@@ -1685,7 +1608,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 35,
-    'macro' => '',
     'text' => '@center should not appear in @center',
     'type' => 'warning'
   },
@@ -1694,7 +1616,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 37,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   },
@@ -1703,7 +1624,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 41,
-    'macro' => '',
     'text' => '@item should not appear in @center',
     'type' => 'warning'
   },
@@ -1712,7 +1632,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 41,
-    'macro' => '',
     'text' => '@item outside of table or list',
     'type' => 'error'
   },
@@ -1721,7 +1640,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 41,
-    'macro' => '',
     'text' => '@tab should not appear in @center',
     'type' => 'warning'
   },
@@ -1730,7 +1648,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 41,
-    'macro' => '',
     'text' => 'ignoring @tab outside of multitable',
     'type' => 'error'
   },
@@ -1739,7 +1656,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 42,
-    'macro' => '',
     'text' => '@item should not appear in @center',
     'type' => 'warning'
   },
@@ -1748,7 +1664,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 42,
-    'macro' => '',
     'text' => '@item outside of table or list',
     'type' => 'error'
   },
@@ -1757,7 +1672,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 45,
-    'macro' => '',
     'text' => '@table should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1766,7 +1680,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 45,
-    'macro' => '',
     'text' => '@table should not appear in @center',
     'type' => 'warning'
   },
@@ -1775,7 +1688,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 45,
-    'macro' => '',
     'text' => 'no matching `@end table\'',
     'type' => 'error'
   },
@@ -1784,7 +1696,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 46,
-    'macro' => '',
     'text' => '@item outside of table or list',
     'type' => 'error'
   },
@@ -1793,7 +1704,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 48,
-    'macro' => '',
     'text' => '@item outside of table or list',
     'type' => 'error'
   },
@@ -1802,7 +1712,6 @@ $result_errors{'center'} = [
 ',
     'file_name' => '',
     'line_nr' => 49,
-    'macro' => '',
     'text' => 'unmatched `@end table\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/def_in_style_command.pl 
b/tp/t/results/invalid_nestings/def_in_style_command.pl
index a85ab8a3bc..bc6c3d1b8c 100644
--- a/tp/t/results/invalid_nestings/def_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/def_in_style_command.pl
@@ -26,8 +26,7 @@ $result_trees{'def_in_style_command'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -98,8 +97,7 @@ $result_trees{'def_in_style_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               },
               'type' => 'def_line'
             },
@@ -145,8 +143,7 @@ $result_trees{'def_in_style_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -157,8 +154,7 @@ $result_trees{'def_in_style_command'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
@@ -187,7 +183,6 @@ $result_errors{'def_in_style_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@code missing closing brace',
     'type' => 'error'
   },
@@ -196,7 +191,6 @@ $result_errors{'def_in_style_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -205,7 +199,6 @@ $result_errors{'def_in_style_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git 
a/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl 
b/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl
index de81aaf128..576780ee24 100644
--- a/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl
+++ b/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl
@@ -124,8 +124,7 @@ $result_trees{'def_not_closed_in_menu_description'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 2,
-                            'macro' => ''
+                            'line_nr' => 2
                           },
                           'type' => 'def_line'
                         },
@@ -156,8 +155,7 @@ $result_trees{'def_not_closed_in_menu_description'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -166,8 +164,7 @@ $result_trees{'def_not_closed_in_menu_description'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               },
               'type' => 'menu_entry'
             },
@@ -199,15 +196,13 @@ $result_trees{'def_not_closed_in_menu_description'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -238,7 +233,6 @@ $result_errors{'def_not_closed_in_menu_description'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@deffn should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -247,7 +241,6 @@ $result_errors{'def_not_closed_in_menu_description'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -256,7 +249,6 @@ $result_errors{'def_not_closed_in_menu_description'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '`@end\' expected `deffn\', but saw `menu\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/enumerate_in_style_command.pl 
b/tp/t/results/invalid_nestings/enumerate_in_style_command.pl
index a20e709b26..3b7a8d5526 100644
--- a/tp/t/results/invalid_nestings/enumerate_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/enumerate_in_style_command.pl
@@ -26,8 +26,7 @@ $result_trees{'enumerate_in_style_command'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -74,8 +73,7 @@ $result_trees{'enumerate_in_style_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -106,8 +104,7 @@ $result_trees{'enumerate_in_style_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -121,8 +118,7 @@ $result_trees{'enumerate_in_style_command'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
@@ -149,7 +145,6 @@ $result_errors{'enumerate_in_style_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@code missing closing brace',
     'type' => 'error'
   },
@@ -158,7 +153,6 @@ $result_errors{'enumerate_in_style_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/example_in_style_command.pl 
b/tp/t/results/invalid_nestings/example_in_style_command.pl
index 8eada95bc2..d909971a78 100644
--- a/tp/t/results/invalid_nestings/example_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/example_in_style_command.pl
@@ -26,8 +26,7 @@ $result_trees{'example_in_style_command'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -84,15 +83,13 @@ $result_trees{'example_in_style_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
@@ -119,7 +116,6 @@ $result_errors{'example_in_style_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@code missing closing brace',
     'type' => 'error'
   },
@@ -128,7 +124,6 @@ $result_errors{'example_in_style_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/float_in_style_command.pl 
b/tp/t/results/invalid_nestings/float_in_style_command.pl
index e792be0f39..6c5aec3b44 100644
--- a/tp/t/results/invalid_nestings/float_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/float_in_style_command.pl
@@ -26,8 +26,7 @@ $result_trees{'float_in_style_command'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -94,8 +93,7 @@ $result_trees{'float_in_style_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -131,8 +129,7 @@ $result_trees{'float_in_style_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -149,8 +146,7 @@ $result_trees{'float_in_style_command'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
@@ -181,7 +177,6 @@ $result_errors{'float_in_style_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@code missing closing brace',
     'type' => 'error'
   },
@@ -190,7 +185,6 @@ $result_errors{'float_in_style_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/flushright_in_style_command.pl 
b/tp/t/results/invalid_nestings/flushright_in_style_command.pl
index 8a939f237f..d1f0e204de 100644
--- a/tp/t/results/invalid_nestings/flushright_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/flushright_in_style_command.pl
@@ -26,8 +26,7 @@ $result_trees{'flushright_in_style_command'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -84,15 +83,13 @@ $result_trees{'flushright_in_style_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
@@ -119,7 +116,6 @@ $result_errors{'flushright_in_style_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@code missing closing brace',
     'type' => 'error'
   },
@@ -128,7 +124,6 @@ $result_errors{'flushright_in_style_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/footnote_in_ref.pl 
b/tp/t/results/invalid_nestings/footnote_in_ref.pl
index 5601ed484b..ccfbf757e5 100644
--- a/tp/t/results/invalid_nestings/footnote_in_ref.pl
+++ b/tp/t/results/invalid_nestings/footnote_in_ref.pl
@@ -84,8 +84,7 @@ $result_trees{'footnote_in_ref'} = {
                       'cmdname' => 'footnote',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     },
                     {
@@ -103,8 +102,7 @@ $result_trees{'footnote_in_ref'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -122,8 +120,7 @@ $result_trees{'footnote_in_ref'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
@@ -163,7 +160,6 @@ $result_errors{'footnote_in_ref'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@footnote should not appear anywhere inside @xref',
     'type' => 'warning'
   },
@@ -172,7 +168,6 @@ $result_errors{'footnote_in_ref'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@xref missing closing brace',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl 
b/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl
index e593a5027c..fab56a113c 100644
--- a/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl
+++ b/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl
@@ -41,8 +41,7 @@ $result_trees{'formats_not_closed_in_example'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       },
                       'type' => 'command_as_argument'
                     }
@@ -87,8 +86,7 @@ $result_trees{'formats_not_closed_in_example'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 4,
-                            'macro' => ''
+                            'line_nr' => 4
                           }
                         }
                       ],
@@ -165,8 +163,7 @@ $result_trees{'formats_not_closed_in_example'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 10,
-                                'macro' => ''
+                                'line_nr' => 10
                               }
                             },
                             {
@@ -196,8 +193,7 @@ $result_trees{'formats_not_closed_in_example'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 11,
-                                'macro' => ''
+                                'line_nr' => 11
                               }
                             }
                           ],
@@ -206,8 +202,7 @@ $result_trees{'formats_not_closed_in_example'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 8,
-                            'macro' => ''
+                            'line_nr' => 8
                           }
                         }
                       ],
@@ -227,8 +222,7 @@ $result_trees{'formats_not_closed_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -259,15 +253,13 @@ $result_trees{'formats_not_closed_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -311,7 +303,6 @@ $result_errors{'formats_not_closed_in_example'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => '`@end\' expected `enumerate\', but saw `example\'',
     'type' => 'error'
   },
@@ -320,7 +311,6 @@ $result_errors{'formats_not_closed_in_example'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => '`@end\' expected `table\', but saw `example\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/ignore_in_xref.pl 
b/tp/t/results/invalid_nestings/ignore_in_xref.pl
index 8ccc3e3a85..2667d1addd 100644
--- a/tp/t/results/invalid_nestings/ignore_in_xref.pl
+++ b/tp/t/results/invalid_nestings/ignore_in_xref.pl
@@ -103,15 +103,13 @@ $result_trees{'ignore_in_xref'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 6,
-                            'macro' => ''
+                            'line_nr' => 6
                           }
                         }
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     }
                   ],
@@ -127,8 +125,7 @@ $result_trees{'ignore_in_xref'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -150,8 +147,7 @@ $result_trees{'ignore_in_xref'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
@@ -196,7 +192,6 @@ $result_errors{'ignore_in_xref'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '@ignore should not appear anywhere inside @xref',
     'type' => 'warning'
   }
diff --git a/tp/t/results/invalid_nestings/ignored_text.pl 
b/tp/t/results/invalid_nestings/ignored_text.pl
index 0dbb782c4a..318089b88e 100644
--- a/tp/t/results/invalid_nestings/ignored_text.pl
+++ b/tp/t/results/invalid_nestings/ignored_text.pl
@@ -38,8 +38,7 @@ $result_trees{'ignored_text'} = {
                     'cmdname' => 'ifinfo',
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 1,
-                      'macro' => ''
+                      'line_nr' => 1
                     }
                   },
                   'position' => 1,
@@ -75,8 +74,7 @@ $result_trees{'ignored_text'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
@@ -113,7 +111,6 @@ $result_errors{'ignored_text'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@ifinfo should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -122,7 +119,6 @@ $result_errors{'ignored_text'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'no matching `@end ifinfo\'',
     'type' => 'error'
   },
@@ -131,7 +127,6 @@ $result_errors{'ignored_text'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'bad argument to @end: ifinfo on the node line',
     'type' => 'error'
   },
@@ -140,7 +135,6 @@ $result_errors{'ignored_text'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'unmatched `@end ifinfo\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/in_errormsg.pl 
b/tp/t/results/invalid_nestings/in_errormsg.pl
index 952cc53bc5..4d6be642b1 100644
--- a/tp/t/results/invalid_nestings/in_errormsg.pl
+++ b/tp/t/results/invalid_nestings/in_errormsg.pl
@@ -32,8 +32,7 @@ $result_trees{'in_errormsg'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -68,8 +67,7 @@ $result_trees{'in_errormsg'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     },
                     {
@@ -98,8 +96,7 @@ $result_trees{'in_errormsg'} = {
                       'cmdname' => 'ref',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -109,8 +106,7 @@ $result_trees{'in_errormsg'} = {
               'cmdname' => 'errormsg',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -140,8 +136,7 @@ $result_trees{'in_errormsg'} = {
           'cmdname' => 'errormsg',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -152,8 +147,7 @@ $result_trees{'in_errormsg'} = {
                   'cmdname' => 'asis',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   },
                   'type' => 'command_as_argument'
                 }
@@ -198,8 +192,7 @@ $result_trees{'in_errormsg'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     }
                   ],
@@ -236,8 +229,7 @@ $result_trees{'in_errormsg'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
@@ -251,8 +243,7 @@ $result_trees{'in_errormsg'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         }
       ],
@@ -287,7 +278,6 @@ $result_errors{'in_errormsg'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@anchor should not appear anywhere inside @errormsg',
     'type' => 'warning'
   },
@@ -296,7 +286,6 @@ $result_errors{'in_errormsg'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@ref should not appear anywhere inside @errormsg',
     'type' => 'warning'
   },
@@ -305,7 +294,6 @@ $result_errors{'in_errormsg'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@errormsg missing closing brace',
     'type' => 'error'
   },
@@ -314,7 +302,6 @@ $result_errors{'in_errormsg'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/in_table.pl 
b/tp/t/results/invalid_nestings/in_table.pl
index 77cc02e618..a082bf5257 100644
--- a/tp/t/results/invalid_nestings/in_table.pl
+++ b/tp/t/results/invalid_nestings/in_table.pl
@@ -46,8 +46,7 @@ $result_trees{'in_table'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -82,8 +81,7 @@ $result_trees{'in_table'} = {
                   'cmdname' => 'xref',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   },
                   'type' => 'command_as_argument'
                 }
@@ -127,8 +125,7 @@ $result_trees{'in_table'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -142,8 +139,7 @@ $result_trees{'in_table'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -159,8 +155,7 @@ $result_trees{'in_table'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 8,
-                    'macro' => ''
+                    'line_nr' => 8
                   },
                   'type' => 'command_as_argument'
                 }
@@ -188,8 +183,7 @@ $result_trees{'in_table'} = {
                               'cmdname' => 'indent',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 9,
-                                'macro' => ''
+                                'line_nr' => 9
                               }
                             },
                             {
@@ -210,8 +204,7 @@ $result_trees{'in_table'} = {
                               'cmdname' => 'titlefont',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 9,
-                                'macro' => ''
+                                'line_nr' => 9
                               }
                             },
                             {
@@ -235,8 +228,7 @@ $result_trees{'in_table'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 9,
-                                'macro' => ''
+                                'line_nr' => 9
                               }
                             },
                             {
@@ -258,8 +250,7 @@ $result_trees{'in_table'} = {
                               'cmdname' => 'footnote',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 9,
-                                'macro' => ''
+                                'line_nr' => 9
                               }
                             },
                             {
@@ -290,8 +281,7 @@ $result_trees{'in_table'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 9,
-                                'macro' => ''
+                                'line_nr' => 9
                               }
                             }
                           ],
@@ -306,8 +296,7 @@ $result_trees{'in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     }
                   ],
@@ -339,8 +328,7 @@ $result_trees{'in_table'} = {
                           'cmdname' => 'footnote',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 10,
-                            'macro' => ''
+                            'line_nr' => 10
                           }
                         },
                         {
@@ -395,8 +383,7 @@ $result_trees{'in_table'} = {
                               'cmdname' => 'ref',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 11,
-                                'macro' => ''
+                                'line_nr' => 11
                               }
                             }
                           ],
@@ -411,8 +398,7 @@ $result_trees{'in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     }
                   ],
@@ -468,8 +454,7 @@ $result_trees{'in_table'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 13,
-                                'macro' => ''
+                                'line_nr' => 13
                               }
                             }
                           ],
@@ -484,8 +469,7 @@ $result_trees{'in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     }
                   ],
@@ -535,8 +519,7 @@ $result_trees{'in_table'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 14,
-                                'macro' => ''
+                                'line_nr' => 14
                               },
                               'type' => 'index_entry_command'
                             }
@@ -552,8 +535,7 @@ $result_trees{'in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     }
                   ],
@@ -590,8 +572,7 @@ $result_trees{'in_table'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
@@ -605,8 +586,7 @@ $result_trees{'in_table'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -622,8 +602,7 @@ $result_trees{'in_table'} = {
                   'cmdname' => 'asis',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 17,
-                    'macro' => ''
+                    'line_nr' => 17
                   },
                   'type' => 'command_as_argument'
                 }
@@ -680,8 +659,7 @@ $result_trees{'in_table'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 18,
-                                'macro' => ''
+                                'line_nr' => 18
                               },
                               'type' => 'index_entry_command'
                             }
@@ -704,8 +682,7 @@ $result_trees{'in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       }
                     }
                   ],
@@ -729,8 +706,7 @@ $result_trees{'in_table'} = {
                           'cmdname' => 'option',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 19,
-                            'macro' => ''
+                            'line_nr' => 19
                           }
                         },
                         {
@@ -791,8 +767,7 @@ $result_trees{'in_table'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 21,
-                                'macro' => ''
+                                'line_nr' => 21
                               },
                               'type' => 'index_entry_command'
                             }
@@ -815,8 +790,7 @@ $result_trees{'in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 21,
-                        'macro' => ''
+                        'line_nr' => 21
                       }
                     }
                   ],
@@ -840,8 +814,7 @@ $result_trees{'in_table'} = {
                           'cmdname' => 'option',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 22,
-                            'macro' => ''
+                            'line_nr' => 22
                           }
                         },
                         {
@@ -889,8 +862,7 @@ $result_trees{'in_table'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             }
           ],
@@ -904,8 +876,7 @@ $result_trees{'in_table'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -943,8 +914,7 @@ $result_trees{'in_table'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         },
         {
@@ -982,8 +952,7 @@ $result_trees{'in_table'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 28,
-            'macro' => ''
+            'line_nr' => 28
           }
         }
       ],
@@ -999,8 +968,7 @@ $result_trees{'in_table'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     }
   ],
@@ -1109,7 +1077,6 @@ $result_errors{'in_table'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@xref should not appear on @table line',
     'type' => 'warning'
   },
@@ -1118,7 +1085,6 @@ $result_errors{'in_table'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@indent should not appear in @item',
     'type' => 'warning'
   },
@@ -1127,7 +1093,6 @@ $result_errors{'in_table'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@exdent should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1136,7 +1101,6 @@ $result_errors{'in_table'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@exdent should not appear in @item',
     'type' => 'warning'
   },
@@ -1145,7 +1109,6 @@ $result_errors{'in_table'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => '@ref missing closing brace',
     'type' => 'error'
   },
@@ -1154,7 +1117,6 @@ $result_errors{'in_table'} = [
 ',
     'file_name' => '',
     'line_nr' => 12,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   },
@@ -1163,7 +1125,6 @@ $result_errors{'in_table'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => '@center should not appear in @item',
     'type' => 'warning'
   },
@@ -1172,7 +1133,6 @@ $result_errors{'in_table'} = [
 ',
     'file_name' => '',
     'line_nr' => 14,
-    'macro' => '',
     'text' => '@cindex should not appear in @item',
     'type' => 'warning'
   },
@@ -1181,7 +1141,6 @@ $result_errors{'in_table'} = [
 ',
     'file_name' => '',
     'line_nr' => 18,
-    'macro' => '',
     'text' => '@cindex should not appear in @item',
     'type' => 'warning'
   },
@@ -1190,7 +1149,6 @@ $result_errors{'in_table'} = [
 ',
     'file_name' => '',
     'line_nr' => 21,
-    'macro' => '',
     'text' => '@cindex should not appear in @item',
     'type' => 'warning'
   },
@@ -1199,7 +1157,6 @@ $result_errors{'in_table'} = [
 ',
     'file_name' => '',
     'line_nr' => 18,
-    'macro' => '',
     'text' => 'empty index key in @item',
     'type' => 'warning'
   },
@@ -1208,7 +1165,6 @@ $result_errors{'in_table'} = [
 ',
     'file_name' => '',
     'line_nr' => 21,
-    'macro' => '',
     'text' => 'empty index key in @item',
     'type' => 'warning'
   }
diff --git a/tp/t/results/invalid_nestings/item_in_ref.pl 
b/tp/t/results/invalid_nestings/item_in_ref.pl
index bed16c5568..75287a4a12 100644
--- a/tp/t/results/invalid_nestings/item_in_ref.pl
+++ b/tp/t/results/invalid_nestings/item_in_ref.pl
@@ -17,8 +17,7 @@ $result_trees{'item_in_ref'} = {
                   'cmdname' => 'asis',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'command_as_argument'
                 }
@@ -63,8 +62,7 @@ $result_trees{'item_in_ref'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -119,8 +117,7 @@ $result_trees{'item_in_ref'} = {
                           'cmdname' => 'ref',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 5,
-                            'macro' => ''
+                            'line_nr' => 5
                           }
                         }
                       ],
@@ -161,8 +158,7 @@ $result_trees{'item_in_ref'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     }
                   ],
@@ -199,8 +195,7 @@ $result_trees{'item_in_ref'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -214,8 +209,7 @@ $result_trees{'item_in_ref'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -248,7 +242,6 @@ $result_errors{'item_in_ref'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@ref missing closing brace',
     'type' => 'error'
   },
@@ -257,7 +250,6 @@ $result_errors{'item_in_ref'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/item_tab_outside_of_table_lists.pl 
b/tp/t/results/invalid_nestings/item_tab_outside_of_table_lists.pl
index 439afee27e..13f14564fa 100644
--- a/tp/t/results/invalid_nestings/item_tab_outside_of_table_lists.pl
+++ b/tp/t/results/invalid_nestings/item_tab_outside_of_table_lists.pl
@@ -34,8 +34,7 @@ $result_trees{'item_tab_outside_of_table_lists'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -94,7 +93,6 @@ $result_errors{'item_tab_outside_of_table_lists'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@itemx outside of table or list',
     'type' => 'error'
   },
@@ -103,7 +101,6 @@ $result_errors{'item_tab_outside_of_table_lists'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@headitem outside of table or list',
     'type' => 'error'
   },
@@ -112,7 +109,6 @@ $result_errors{'item_tab_outside_of_table_lists'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'unknown command `someitem\'',
     'type' => 'error'
   },
@@ -121,7 +117,6 @@ $result_errors{'item_tab_outside_of_table_lists'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'ignoring @tab outside of multitable',
     'type' => 'error'
   }
diff --git 
a/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl 
b/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
index 020c37a56b..eb859133ec 100644
--- a/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
+++ b/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
@@ -17,8 +17,7 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
                   'cmdname' => 'strong',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'command_as_argument'
                 }
@@ -63,8 +62,7 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -133,8 +131,7 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 6,
-                                'macro' => ''
+                                'line_nr' => 6
                               }
                             }
                           ],
@@ -168,8 +165,7 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 7,
-                            'macro' => ''
+                            'line_nr' => 7
                           }
                         }
                       ],
@@ -178,8 +174,7 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -228,8 +223,7 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 10,
-                                'macro' => ''
+                                'line_nr' => 10
                               }
                             }
                           ],
@@ -263,8 +257,7 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 11,
-                            'macro' => ''
+                            'line_nr' => 11
                           }
                         }
                       ],
@@ -273,8 +266,7 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -316,8 +308,7 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             }
           ],
@@ -331,8 +322,7 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -375,7 +365,6 @@ $result_errors{'itemx_in_itemize_enumerate_in_table'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => '@itemx outside of table or list',
     'type' => 'error'
   },
@@ -384,7 +373,6 @@ $result_errors{'itemx_in_itemize_enumerate_in_table'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@itemize has text but no @item',
     'type' => 'warning'
   },
@@ -393,7 +381,6 @@ $result_errors{'itemx_in_itemize_enumerate_in_table'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => '@itemx outside of table or list',
     'type' => 'error'
   },
@@ -402,7 +389,6 @@ $result_errors{'itemx_in_itemize_enumerate_in_table'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@enumerate has text but no @item',
     'type' => 'warning'
   }
diff --git a/tp/t/results/invalid_nestings/menu_in_style_command.pl 
b/tp/t/results/invalid_nestings/menu_in_style_command.pl
index 888cd28a19..48b2fd07f7 100644
--- a/tp/t/results/invalid_nestings/menu_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/menu_in_style_command.pl
@@ -51,8 +51,7 @@ $result_trees{'menu_in_style_command'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -120,8 +119,7 @@ $result_trees{'menu_in_style_command'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -153,15 +151,13 @@ $result_trees{'menu_in_style_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         }
       ],
@@ -176,8 +172,7 @@ $result_trees{'menu_in_style_command'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
@@ -225,7 +220,6 @@ $result_errors{'menu_in_style_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@code missing closing brace',
     'type' => 'error'
   },
@@ -234,7 +228,6 @@ $result_errors{'menu_in_style_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/multitable_in_style_command.pl 
b/tp/t/results/invalid_nestings/multitable_in_style_command.pl
index a63565cc6f..dfd4360529 100644
--- a/tp/t/results/invalid_nestings/multitable_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/multitable_in_style_command.pl
@@ -30,8 +30,7 @@ $result_trees{'multitable_in_style_command'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -49,8 +48,7 @@ $result_trees{'multitable_in_style_command'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   },
                   'type' => 'bracketed_arg'
                 },
@@ -65,8 +63,7 @@ $result_trees{'multitable_in_style_command'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   },
                   'type' => 'bracketed_arg'
                 }
@@ -107,8 +104,7 @@ $result_trees{'multitable_in_style_command'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     },
                     {
@@ -133,8 +129,7 @@ $result_trees{'multitable_in_style_command'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     }
                   ],
@@ -174,8 +169,7 @@ $result_trees{'multitable_in_style_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -189,8 +183,7 @@ $result_trees{'multitable_in_style_command'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         }
       ],
@@ -219,7 +212,6 @@ $result_errors{'multitable_in_style_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@code missing closing brace',
     'type' => 'error'
   },
@@ -228,7 +220,6 @@ $result_errors{'multitable_in_style_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/multitable_item_in_index.pl 
b/tp/t/results/invalid_nestings/multitable_item_in_index.pl
index 65674f4732..34c4df7131 100644
--- a/tp/t/results/invalid_nestings/multitable_item_in_index.pl
+++ b/tp/t/results/invalid_nestings/multitable_item_in_index.pl
@@ -21,8 +21,7 @@ $result_trees{'multitable_item_in_index'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'bracketed_arg'
                 },
@@ -37,8 +36,7 @@ $result_trees{'multitable_item_in_index'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'bracketed_arg'
                 }
@@ -92,8 +90,7 @@ $result_trees{'multitable_item_in_index'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   },
                   'type' => 'index_entry_command'
                 }
@@ -128,8 +125,7 @@ $result_trees{'multitable_item_in_index'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -143,8 +139,7 @@ $result_trees{'multitable_item_in_index'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -168,7 +163,6 @@ $result_errors{'multitable_item_in_index'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@item should not appear on @vindex line',
     'type' => 'warning'
   },
@@ -177,7 +171,6 @@ $result_errors{'multitable_item_in_index'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@item outside of table or list',
     'type' => 'error'
   },
@@ -186,7 +179,6 @@ $result_errors{'multitable_item_in_index'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'entry for index `vr\' outside of any node',
     'type' => 'warning'
   },
@@ -195,7 +187,6 @@ $result_errors{'multitable_item_in_index'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@multitable has text but no @item',
     'type' => 'warning'
   }
diff --git a/tp/t/results/invalid_nestings/node_in_copying.pl 
b/tp/t/results/invalid_nestings/node_in_copying.pl
index dc9b623795..95ee361024 100644
--- a/tp/t/results/invalid_nestings/node_in_copying.pl
+++ b/tp/t/results/invalid_nestings/node_in_copying.pl
@@ -24,8 +24,7 @@ $result_trees{'node_in_copying'} = {
           'cmdname' => 'copying',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -67,8 +66,7 @@ $result_trees{'node_in_copying'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
@@ -107,7 +105,6 @@ $result_errors{'node_in_copying'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@node seen before @end copying',
     'type' => 'error'
   },
@@ -116,7 +113,6 @@ $result_errors{'node_in_copying'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'unmatched `@end copying\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl 
b/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl
index 680fcf9906..c0d9542662 100644
--- a/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl
+++ b/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl
@@ -50,8 +50,7 @@ $result_trees{'node_in_copying_not_closed'} = {
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -86,8 +85,7 @@ $result_trees{'node_in_copying_not_closed'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -125,8 +123,7 @@ $result_trees{'node_in_copying_not_closed'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         }
       ],
@@ -138,8 +135,7 @@ $result_trees{'node_in_copying_not_closed'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     }
   ],
@@ -212,7 +208,6 @@ $result_errors{'node_in_copying_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => '@node seen before @end copying',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/node_on_index_entry_line.pl 
b/tp/t/results/invalid_nestings/node_on_index_entry_line.pl
index 42ba7f1b12..6edf6ac545 100644
--- a/tp/t/results/invalid_nestings/node_on_index_entry_line.pl
+++ b/tp/t/results/invalid_nestings/node_on_index_entry_line.pl
@@ -45,8 +45,7 @@ $result_trees{'node_on_index_entry_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           },
           'type' => 'index_entry_command'
         }
@@ -201,8 +200,7 @@ $result_trees{'node_on_index_entry_line'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
@@ -273,7 +271,6 @@ $result_errors{'node_on_index_entry_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@node should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -282,7 +279,6 @@ $result_errors{'node_on_index_entry_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@node should not appear on @cindex line',
     'type' => 'warning'
   },
@@ -291,7 +287,6 @@ $result_errors{'node_on_index_entry_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/invalid_nestings/on_block_command_line.pl 
b/tp/t/results/invalid_nestings/on_block_command_line.pl
index f514ee44b5..73b46e8b3a 100644
--- a/tp/t/results/invalid_nestings/on_block_command_line.pl
+++ b/tp/t/results/invalid_nestings/on_block_command_line.pl
@@ -33,15 +33,13 @@ $result_trees{'on_block_command_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     }
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'bracketed_arg'
                 },
@@ -62,8 +60,7 @@ $result_trees{'on_block_command_line'} = {
                   'cmdname' => 'titlefont',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 }
               ],
@@ -103,8 +100,7 @@ $result_trees{'on_block_command_line'} = {
                           'cmdname' => 'titlefont',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 2,
-                            'macro' => ''
+                            'line_nr' => 2
                           }
                         },
                         {
@@ -117,8 +113,7 @@ $result_trees{'on_block_command_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -158,8 +153,7 @@ $result_trees{'on_block_command_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -173,8 +167,7 @@ $result_trees{'on_block_command_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -190,8 +183,7 @@ $result_trees{'on_block_command_line'} = {
                   'cmdname' => 'indent',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 },
                 {
@@ -212,8 +204,7 @@ $result_trees{'on_block_command_line'} = {
                   'cmdname' => 'titlefont',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 },
                 {
@@ -237,8 +228,7 @@ $result_trees{'on_block_command_line'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 },
                 {
@@ -260,8 +250,7 @@ $result_trees{'on_block_command_line'} = {
                   'cmdname' => 'footnote',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 },
                 {
@@ -292,8 +281,7 @@ $result_trees{'on_block_command_line'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 }
               ],
@@ -330,8 +318,7 @@ $result_trees{'on_block_command_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -342,8 +329,7 @@ $result_trees{'on_block_command_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
@@ -373,7 +359,6 @@ $result_errors{'on_block_command_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@anchor should not appear on @multitable line',
     'type' => 'warning'
   },
@@ -382,7 +367,6 @@ $result_errors{'on_block_command_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@titlefont should not appear on @multitable line',
     'type' => 'warning'
   },
@@ -391,7 +375,6 @@ $result_errors{'on_block_command_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'unexpected argument on @multitable line: @titlefont{in 
titlefont}',
     'type' => 'warning'
   },
@@ -400,7 +383,6 @@ $result_errors{'on_block_command_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@indent should not appear on @quotation line',
     'type' => 'warning'
   },
@@ -409,7 +391,6 @@ $result_errors{'on_block_command_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@titlefont should not appear on @quotation line',
     'type' => 'warning'
   },
@@ -418,7 +399,6 @@ $result_errors{'on_block_command_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@anchor should not appear on @quotation line',
     'type' => 'warning'
   },
@@ -427,7 +407,6 @@ $result_errors{'on_block_command_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@footnote should not appear on @quotation line',
     'type' => 'warning'
   },
@@ -436,7 +415,6 @@ $result_errors{'on_block_command_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@exdent should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -445,7 +423,6 @@ $result_errors{'on_block_command_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@exdent should not appear on @quotation line',
     'type' => 'warning'
   }
diff --git a/tp/t/results/invalid_nestings/on_def_line.pl 
b/tp/t/results/invalid_nestings/on_def_line.pl
index 429a4f9746..f48f2405de 100644
--- a/tp/t/results/invalid_nestings/on_def_line.pl
+++ b/tp/t/results/invalid_nestings/on_def_line.pl
@@ -36,8 +36,7 @@ $result_trees{'on_def_line'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 1,
-                            'macro' => ''
+                            'line_nr' => 1
                           }
                         }
                       ],
@@ -46,8 +45,7 @@ $result_trees{'on_def_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -75,8 +73,7 @@ $result_trees{'on_def_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     },
                     {
@@ -108,8 +105,7 @@ $result_trees{'on_def_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     },
                     {
@@ -147,8 +143,7 @@ $result_trees{'on_def_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     }
                   ],
@@ -166,8 +161,7 @@ $result_trees{'on_def_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               },
               'type' => 'def_line'
             },
@@ -195,8 +189,7 @@ $result_trees{'on_def_line'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 2,
-                            'macro' => ''
+                            'line_nr' => 2
                           }
                         }
                       ],
@@ -205,8 +198,7 @@ $result_trees{'on_def_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -234,8 +226,7 @@ $result_trees{'on_def_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -267,8 +258,7 @@ $result_trees{'on_def_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -306,8 +296,7 @@ $result_trees{'on_def_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -331,8 +320,7 @@ $result_trees{'on_def_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               },
               'type' => 'def_line'
             },
@@ -364,8 +352,7 @@ $result_trees{'on_def_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -376,8 +363,7 @@ $result_trees{'on_def_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -407,7 +393,6 @@ $result_errors{'on_def_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@anchor should not appear on @deffn line',
     'type' => 'warning'
   },
@@ -416,7 +401,6 @@ $result_errors{'on_def_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@titlefont should not appear on @deffn line',
     'type' => 'warning'
   },
@@ -425,7 +409,6 @@ $result_errors{'on_def_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@footnote should not appear on @deffn line',
     'type' => 'warning'
   },
@@ -434,7 +417,6 @@ $result_errors{'on_def_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@exdent should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -443,7 +425,6 @@ $result_errors{'on_def_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@exdent should not appear on @deffn line',
     'type' => 'warning'
   },
@@ -452,7 +433,6 @@ $result_errors{'on_def_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -461,7 +441,6 @@ $result_errors{'on_def_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@anchor should not appear on @deffnx line',
     'type' => 'warning'
   },
@@ -470,7 +449,6 @@ $result_errors{'on_def_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@titlefont should not appear on @deffnx line',
     'type' => 'warning'
   },
@@ -479,7 +457,6 @@ $result_errors{'on_def_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@footnote should not appear on @deffnx line',
     'type' => 'warning'
   },
@@ -488,7 +465,6 @@ $result_errors{'on_def_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@exdent should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -497,7 +473,6 @@ $result_errors{'on_def_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@exdent should not appear on @deffnx line',
     'type' => 'warning'
   },
@@ -506,7 +481,6 @@ $result_errors{'on_def_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/invalid_nestings/on_index_entry_line.pl 
b/tp/t/results/invalid_nestings/on_index_entry_line.pl
index 5de7ccfac5..90e162013d 100644
--- a/tp/t/results/invalid_nestings/on_index_entry_line.pl
+++ b/tp/t/results/invalid_nestings/on_index_entry_line.pl
@@ -17,8 +17,7 @@ $result_trees{'on_index_entry_line'} = {
                   'cmdname' => 'indent',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -39,8 +38,7 @@ $result_trees{'on_index_entry_line'} = {
                   'cmdname' => 'titlefont',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -64,8 +62,7 @@ $result_trees{'on_index_entry_line'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -87,8 +84,7 @@ $result_trees{'on_index_entry_line'} = {
                   'cmdname' => 'footnote',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -119,8 +115,7 @@ $result_trees{'on_index_entry_line'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 }
               ],
@@ -142,8 +137,7 @@ $result_trees{'on_index_entry_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           },
           'type' => 'index_entry_command'
         }
@@ -166,7 +160,6 @@ $result_errors{'on_index_entry_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@indent should not appear on @cindex line',
     'type' => 'warning'
   },
@@ -175,7 +168,6 @@ $result_errors{'on_index_entry_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@titlefont should not appear on @cindex line',
     'type' => 'warning'
   },
@@ -184,7 +176,6 @@ $result_errors{'on_index_entry_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@anchor should not appear on @cindex line',
     'type' => 'warning'
   },
@@ -193,7 +184,6 @@ $result_errors{'on_index_entry_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@footnote should not appear on @cindex line',
     'type' => 'warning'
   },
@@ -202,7 +192,6 @@ $result_errors{'on_index_entry_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@exdent should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -211,7 +200,6 @@ $result_errors{'on_index_entry_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@exdent should not appear on @cindex line',
     'type' => 'warning'
   },
@@ -220,7 +208,6 @@ $result_errors{'on_index_entry_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/invalid_nestings/on_itemize_line.pl 
b/tp/t/results/invalid_nestings/on_itemize_line.pl
index 3c84909c80..f2cdf81ebe 100644
--- a/tp/t/results/invalid_nestings/on_itemize_line.pl
+++ b/tp/t/results/invalid_nestings/on_itemize_line.pl
@@ -17,8 +17,7 @@ $result_trees{'on_itemize_line'} = {
                   'cmdname' => 'indent',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -39,8 +38,7 @@ $result_trees{'on_itemize_line'} = {
                   'cmdname' => 'titlefont',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -64,8 +62,7 @@ $result_trees{'on_itemize_line'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -87,8 +84,7 @@ $result_trees{'on_itemize_line'} = {
                   'cmdname' => 'footnote',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -119,8 +115,7 @@ $result_trees{'on_itemize_line'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 }
               ],
@@ -151,8 +146,7 @@ $result_trees{'on_itemize_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -183,8 +177,7 @@ $result_trees{'on_itemize_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -195,8 +188,7 @@ $result_trees{'on_itemize_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -258,8 +250,7 @@ $result_trees{'on_itemize_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -270,8 +261,7 @@ $result_trees{'on_itemize_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
@@ -300,7 +290,6 @@ $result_errors{'on_itemize_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@indent should not appear on @itemize line',
     'type' => 'warning'
   },
@@ -309,7 +298,6 @@ $result_errors{'on_itemize_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@titlefont should not appear on @itemize line',
     'type' => 'warning'
   },
@@ -318,7 +306,6 @@ $result_errors{'on_itemize_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@anchor should not appear on @itemize line',
     'type' => 'warning'
   },
@@ -327,7 +314,6 @@ $result_errors{'on_itemize_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@footnote should not appear on @itemize line',
     'type' => 'warning'
   },
@@ -336,7 +322,6 @@ $result_errors{'on_itemize_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@exdent should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -345,7 +330,6 @@ $result_errors{'on_itemize_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@exdent should not appear on @itemize line',
     'type' => 'warning'
   },
@@ -354,7 +338,6 @@ $result_errors{'on_itemize_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@item should not appear on @itemize line',
     'type' => 'warning'
   },
@@ -363,7 +346,6 @@ $result_errors{'on_itemize_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@item outside of table or list',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/on_node_line.pl 
b/tp/t/results/invalid_nestings/on_node_line.pl
index b0779358ab..cad8a0e15f 100644
--- a/tp/t/results/invalid_nestings/on_node_line.pl
+++ b/tp/t/results/invalid_nestings/on_node_line.pl
@@ -74,8 +74,7 @@ $result_trees{'on_node_line'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -121,8 +120,7 @@ $result_trees{'on_node_line'} = {
               'cmdname' => 'pxref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -149,8 +147,7 @@ $result_trees{'on_node_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -172,8 +169,7 @@ $result_trees{'on_node_line'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -204,8 +200,7 @@ $result_trees{'on_node_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -245,8 +240,7 @@ $result_trees{'on_node_line'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
@@ -299,7 +293,6 @@ $result_errors{'on_node_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@ref should not appear on @node line',
     'type' => 'warning'
   },
@@ -308,7 +301,6 @@ $result_errors{'on_node_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@pxref should not appear on @node line',
     'type' => 'warning'
   },
@@ -317,7 +309,6 @@ $result_errors{'on_node_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@anchor should not appear on @node line',
     'type' => 'warning'
   },
@@ -326,7 +317,6 @@ $result_errors{'on_node_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@footnote should not appear on @node line',
     'type' => 'warning'
   },
@@ -335,7 +325,6 @@ $result_errors{'on_node_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@exdent should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -344,7 +333,6 @@ $result_errors{'on_node_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@exdent should not appear on @node line',
     'type' => 'warning'
   }
diff --git a/tp/t/results/invalid_nestings/on_section_line.pl 
b/tp/t/results/invalid_nestings/on_section_line.pl
index 7a37de6c29..66189e4762 100644
--- a/tp/t/results/invalid_nestings/on_section_line.pl
+++ b/tp/t/results/invalid_nestings/on_section_line.pl
@@ -18,8 +18,7 @@ $result_trees{'on_section_line'} = {
               'cmdname' => 'noindent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -43,8 +42,7 @@ $result_trees{'on_section_line'} = {
               'cmdname' => 'titlefont',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -68,8 +66,7 @@ $result_trees{'on_section_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -91,8 +88,7 @@ $result_trees{'on_section_line'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -123,8 +119,7 @@ $result_trees{'on_section_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -142,8 +137,7 @@ $result_trees{'on_section_line'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
@@ -181,7 +175,6 @@ $result_errors{'on_section_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@noindent should not appear on @section line',
     'type' => 'warning'
   },
@@ -190,7 +183,6 @@ $result_errors{'on_section_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@titlefont should not appear on @section line',
     'type' => 'warning'
   },
@@ -199,7 +191,6 @@ $result_errors{'on_section_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@anchor should not appear on @section line',
     'type' => 'warning'
   },
@@ -208,7 +199,6 @@ $result_errors{'on_section_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@footnote should not appear on @section line',
     'type' => 'warning'
   },
@@ -217,7 +207,6 @@ $result_errors{'on_section_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@exdent should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -226,7 +215,6 @@ $result_errors{'on_section_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@exdent should not appear on @section line',
     'type' => 'warning'
   }
diff --git a/tp/t/results/invalid_nestings/on_subheading_line.pl 
b/tp/t/results/invalid_nestings/on_subheading_line.pl
index 212589cdd4..2a17a05d78 100644
--- a/tp/t/results/invalid_nestings/on_subheading_line.pl
+++ b/tp/t/results/invalid_nestings/on_subheading_line.pl
@@ -17,8 +17,7 @@ $result_trees{'on_subheading_line'} = {
                   'cmdname' => 'noindent',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -42,8 +41,7 @@ $result_trees{'on_subheading_line'} = {
                   'cmdname' => 'titlefont',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -67,8 +65,7 @@ $result_trees{'on_subheading_line'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -90,8 +87,7 @@ $result_trees{'on_subheading_line'} = {
                   'cmdname' => 'footnote',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -122,8 +118,7 @@ $result_trees{'on_subheading_line'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 }
               ],
@@ -138,8 +133,7 @@ $result_trees{'on_subheading_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -163,7 +157,6 @@ $result_errors{'on_subheading_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@noindent should not appear on @subheading line',
     'type' => 'warning'
   },
@@ -172,7 +165,6 @@ $result_errors{'on_subheading_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@titlefont should not appear on @subheading line',
     'type' => 'warning'
   },
@@ -181,7 +173,6 @@ $result_errors{'on_subheading_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@anchor should not appear on @subheading line',
     'type' => 'warning'
   },
@@ -190,7 +181,6 @@ $result_errors{'on_subheading_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@footnote should not appear on @subheading line',
     'type' => 'warning'
   },
@@ -199,7 +189,6 @@ $result_errors{'on_subheading_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@exdent should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -208,7 +197,6 @@ $result_errors{'on_subheading_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@exdent should not appear on @subheading line',
     'type' => 'warning'
   }
diff --git a/tp/t/results/invalid_nestings/quotation_in_ref.pl 
b/tp/t/results/invalid_nestings/quotation_in_ref.pl
index 1f8fe096c3..bcf305503a 100644
--- a/tp/t/results/invalid_nestings/quotation_in_ref.pl
+++ b/tp/t/results/invalid_nestings/quotation_in_ref.pl
@@ -59,8 +59,7 @@ $result_trees{'quotation_in_ref'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -117,15 +116,13 @@ $result_trees{'quotation_in_ref'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -149,8 +146,7 @@ $result_trees{'quotation_in_ref'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
@@ -195,7 +191,6 @@ $result_errors{'quotation_in_ref'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@xref missing closing brace',
     'type' => 'error'
   },
@@ -204,7 +199,6 @@ $result_errors{'quotation_in_ref'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/quotation_in_style_command.pl 
b/tp/t/results/invalid_nestings/quotation_in_style_command.pl
index 160327304a..e1afe5060f 100644
--- a/tp/t/results/invalid_nestings/quotation_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/quotation_in_style_command.pl
@@ -26,8 +26,7 @@ $result_trees{'quotation_in_style_command'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -84,15 +83,13 @@ $result_trees{'quotation_in_style_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
@@ -119,7 +116,6 @@ $result_errors{'quotation_in_style_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@code missing closing brace',
     'type' => 'error'
   },
@@ -128,7 +124,6 @@ $result_errors{'quotation_in_style_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/raw_block_on_line.pl 
b/tp/t/results/invalid_nestings/raw_block_on_line.pl
index 3c4cb329a5..0c95013a91 100644
--- a/tp/t/results/invalid_nestings/raw_block_on_line.pl
+++ b/tp/t/results/invalid_nestings/raw_block_on_line.pl
@@ -28,8 +28,7 @@ $result_trees{'raw_block_on_line'} = {
                   'cmdname' => 'tex',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 }
               ],
@@ -51,8 +50,7 @@ $result_trees{'raw_block_on_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           },
           'type' => 'index_entry_command'
         }
@@ -75,7 +73,6 @@ $result_errors{'raw_block_on_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'no matching `@end tex\'',
     'type' => 'error'
   },
@@ -84,7 +81,6 @@ $result_errors{'raw_block_on_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -93,7 +89,6 @@ $result_errors{'raw_block_on_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'empty index key in @cindex',
     'type' => 'warning'
   }
diff --git a/tp/t/results/invalid_nestings/recursive_copying.pl 
b/tp/t/results/invalid_nestings/recursive_copying.pl
index 91621069b0..fb204d0a8d 100644
--- a/tp/t/results/invalid_nestings/recursive_copying.pl
+++ b/tp/t/results/invalid_nestings/recursive_copying.pl
@@ -70,15 +70,13 @@ $result_trees{'recursive_copying'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -97,8 +95,7 @@ $result_trees{'recursive_copying'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         }
       ],
@@ -127,7 +124,6 @@ $result_errors{'recursive_copying'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@insertcopying not allowed inside `@copying\' block',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/ref_in_ref.pl 
b/tp/t/results/invalid_nestings/ref_in_ref.pl
index 982677855d..22c1cd39f1 100644
--- a/tp/t/results/invalid_nestings/ref_in_ref.pl
+++ b/tp/t/results/invalid_nestings/ref_in_ref.pl
@@ -57,8 +57,7 @@ $result_trees{'ref_in_ref'} = {
                       'cmdname' => 'ref',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -76,8 +75,7 @@ $result_trees{'ref_in_ref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -95,8 +93,7 @@ $result_trees{'ref_in_ref'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
@@ -134,7 +131,6 @@ $result_errors{'ref_in_ref'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@ref should not appear anywhere inside @ref',
     'type' => 'warning'
   },
@@ -143,7 +139,6 @@ $result_errors{'ref_in_ref'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@ref to `@ref{first}\', different from node name `first\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/invalid_nestings/ref_to_top_in_anchor.pl 
b/tp/t/results/invalid_nestings/ref_to_top_in_anchor.pl
index c66fd6fe5d..68cbc9816f 100644
--- a/tp/t/results/invalid_nestings/ref_to_top_in_anchor.pl
+++ b/tp/t/results/invalid_nestings/ref_to_top_in_anchor.pl
@@ -58,8 +58,7 @@ $result_trees{'ref_to_top_in_anchor'} = {
                   'cmdname' => 'ref',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   }
                 }
               ],
@@ -73,8 +72,7 @@ $result_trees{'ref_to_top_in_anchor'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
@@ -89,8 +87,7 @@ $result_trees{'ref_to_top_in_anchor'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
@@ -127,7 +124,6 @@ $result_errors{'ref_to_top_in_anchor'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@ref should not appear anywhere inside @anchor',
     'type' => 'warning'
   }
diff --git a/tp/t/results/invalid_nestings/section_in_copying.pl 
b/tp/t/results/invalid_nestings/section_in_copying.pl
index 3a43918837..30b5674611 100644
--- a/tp/t/results/invalid_nestings/section_in_copying.pl
+++ b/tp/t/results/invalid_nestings/section_in_copying.pl
@@ -45,8 +45,7 @@ $result_trees{'section_in_copying'} = {
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -80,8 +79,7 @@ $result_trees{'section_in_copying'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
@@ -123,7 +121,6 @@ $result_errors{'section_in_copying'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@section seen before @end copying',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/section_in_flushright.pl 
b/tp/t/results/invalid_nestings/section_in_flushright.pl
index c8cee7a4d2..521dbccc3e 100644
--- a/tp/t/results/invalid_nestings/section_in_flushright.pl
+++ b/tp/t/results/invalid_nestings/section_in_flushright.pl
@@ -45,8 +45,7 @@ $result_trees{'section_in_flushright'} = {
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -80,8 +79,7 @@ $result_trees{'section_in_flushright'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
@@ -126,7 +124,6 @@ $result_errors{'section_in_flushright'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@section seen before @end flushright',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/section_in_footnote.pl 
b/tp/t/results/invalid_nestings/section_in_footnote.pl
index 719027c762..447852fb02 100644
--- a/tp/t/results/invalid_nestings/section_in_footnote.pl
+++ b/tp/t/results/invalid_nestings/section_in_footnote.pl
@@ -41,8 +41,7 @@ $result_trees{'section_in_footnote'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -79,8 +78,7 @@ $result_trees{'section_in_footnote'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     }
   ],
@@ -122,7 +120,6 @@ $result_errors{'section_in_footnote'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@section seen before @footnote closing brace',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/section_in_math.pl 
b/tp/t/results/invalid_nestings/section_in_math.pl
index 81b6c0fba1..4b8703aef6 100644
--- a/tp/t/results/invalid_nestings/section_in_math.pl
+++ b/tp/t/results/invalid_nestings/section_in_math.pl
@@ -43,8 +43,7 @@ $result_trees{'section_in_math'} = {
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       },
                       'type' => 'balanced_braces'
                     }
@@ -55,8 +54,7 @@ $result_trees{'section_in_math'} = {
               'cmdname' => 'math',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -119,8 +117,7 @@ $result_trees{'section_in_math'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -137,8 +134,7 @@ $result_trees{'section_in_math'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -169,8 +165,7 @@ $result_trees{'section_in_math'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     }
   ],
@@ -240,7 +235,6 @@ $result_errors{'section_in_math'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '@section should not appear anywhere inside @math',
     'type' => 'warning'
   },
@@ -249,7 +243,6 @@ $result_errors{'section_in_math'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
   },
@@ -258,7 +251,6 @@ $result_errors{'section_in_math'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@section seen before @math closing brace',
     'type' => 'error'
   },
@@ -267,7 +259,6 @@ $result_errors{'section_in_math'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => '@section should not appear anywhere inside @math',
     'type' => 'warning'
   },
@@ -276,7 +267,6 @@ $result_errors{'section_in_math'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => '@section seen before @math closing brace',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl 
b/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl
index aea23ed183..ca3e1ddf2e 100644
--- a/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl
+++ b/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl
@@ -17,8 +17,7 @@ $result_trees{'section_in_nested_block_commands'} = {
                   'cmdname' => 'strong',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'command_as_argument'
                 }
@@ -63,8 +62,7 @@ $result_trees{'section_in_nested_block_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -122,8 +120,7 @@ $result_trees{'section_in_nested_block_commands'} = {
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
@@ -143,8 +140,7 @@ $result_trees{'section_in_nested_block_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -178,8 +174,7 @@ $result_trees{'section_in_nested_block_commands'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     }
   ],
@@ -232,7 +227,6 @@ $result_errors{'section_in_nested_block_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@section seen before @end quotation',
     'type' => 'error'
   },
@@ -241,7 +235,6 @@ $result_errors{'section_in_nested_block_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@section seen before @end table',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/section_in_table.pl 
b/tp/t/results/invalid_nestings/section_in_table.pl
index 4b48ddd026..b85afc7e1a 100644
--- a/tp/t/results/invalid_nestings/section_in_table.pl
+++ b/tp/t/results/invalid_nestings/section_in_table.pl
@@ -17,8 +17,7 @@ $result_trees{'section_in_table'} = {
                   'cmdname' => 'asis',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'command_as_argument'
                 }
@@ -63,8 +62,7 @@ $result_trees{'section_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -94,8 +92,7 @@ $result_trees{'section_in_table'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -154,8 +151,7 @@ $result_trees{'section_in_table'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     }
   ],
@@ -205,7 +201,6 @@ $result_errors{'section_in_table'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '@section seen before @end table',
     'type' => 'error'
   },
@@ -214,7 +209,6 @@ $result_errors{'section_in_table'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => '@item outside of table or list',
     'type' => 'error'
   },
@@ -223,7 +217,6 @@ $result_errors{'section_in_table'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => 'unmatched `@end table\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/section_on_cartouche_line.pl 
b/tp/t/results/invalid_nestings/section_on_cartouche_line.pl
index e1b04d04b6..1c7bab4e8b 100644
--- a/tp/t/results/invalid_nestings/section_on_cartouche_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_cartouche_line.pl
@@ -18,8 +18,7 @@ $result_trees{'section_on_cartouche_line'} = {
           'cmdname' => 'cartouche',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -63,8 +62,7 @@ $result_trees{'section_on_cartouche_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         }
       ],
@@ -78,8 +76,7 @@ $result_trees{'section_on_cartouche_line'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -110,8 +107,7 @@ $result_trees{'section_on_cartouche_line'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     }
   ],
@@ -171,7 +167,6 @@ $result_errors{'section_on_cartouche_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@section seen before @end cartouche',
     'type' => 'error'
   },
@@ -180,7 +175,6 @@ $result_errors{'section_on_cartouche_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@section seen before @end cartouche',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/section_on_def_line.pl 
b/tp/t/results/invalid_nestings/section_on_def_line.pl
index 776783a775..16f24109cd 100644
--- a/tp/t/results/invalid_nestings/section_on_def_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_def_line.pl
@@ -55,8 +55,7 @@ $result_trees{'section_on_def_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               },
               'type' => 'def_line'
             }
@@ -68,8 +67,7 @@ $result_trees{'section_on_def_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -124,8 +122,7 @@ $result_trees{'section_on_def_line'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
@@ -171,7 +168,6 @@ $result_errors{'section_on_def_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@section should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -180,7 +176,6 @@ $result_errors{'section_on_def_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@section should not appear on @deffn line',
     'type' => 'warning'
   },
@@ -189,7 +184,6 @@ $result_errors{'section_on_def_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -198,7 +192,6 @@ $result_errors{'section_on_def_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@section seen before @end deffn',
     'type' => 'error'
   },
@@ -207,7 +200,6 @@ $result_errors{'section_on_def_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'unmatched `@end deffn\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/section_on_defx_line.pl 
b/tp/t/results/invalid_nestings/section_on_defx_line.pl
index 166c98d779..d71eeddafd 100644
--- a/tp/t/results/invalid_nestings/section_on_defx_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_defx_line.pl
@@ -82,8 +82,7 @@ $result_trees{'section_on_defx_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               },
               'type' => 'def_line'
             },
@@ -136,8 +135,7 @@ $result_trees{'section_on_defx_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               },
               'type' => 'def_line'
             }
@@ -149,8 +147,7 @@ $result_trees{'section_on_defx_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -205,8 +202,7 @@ $result_trees{'section_on_defx_line'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
@@ -255,7 +251,6 @@ $result_errors{'section_on_defx_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -264,7 +259,6 @@ $result_errors{'section_on_defx_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@section should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -273,7 +267,6 @@ $result_errors{'section_on_defx_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@section should not appear on @deffnx line',
     'type' => 'warning'
   },
@@ -282,7 +275,6 @@ $result_errors{'section_on_defx_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -291,7 +283,6 @@ $result_errors{'section_on_defx_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@section seen before @end deffn',
     'type' => 'error'
   },
@@ -300,7 +291,6 @@ $result_errors{'section_on_defx_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'unmatched `@end deffn\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/section_on_enumerate_line.pl 
b/tp/t/results/invalid_nestings/section_on_enumerate_line.pl
index 7f57da65c8..8e8cc0fce0 100644
--- a/tp/t/results/invalid_nestings/section_on_enumerate_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_enumerate_line.pl
@@ -36,8 +36,7 @@ $result_trees{'section_on_enumerate_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -94,8 +93,7 @@ $result_trees{'section_on_enumerate_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         }
       ],
@@ -109,8 +107,7 @@ $result_trees{'section_on_enumerate_line'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -141,8 +138,7 @@ $result_trees{'section_on_enumerate_line'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     }
   ],
@@ -202,7 +198,6 @@ $result_errors{'section_on_enumerate_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@section should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -211,7 +206,6 @@ $result_errors{'section_on_enumerate_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@section should not appear on @enumerate line',
     'type' => 'warning'
   },
@@ -220,7 +214,6 @@ $result_errors{'section_on_enumerate_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'bad argument to @enumerate',
     'type' => 'error'
   },
@@ -229,7 +222,6 @@ $result_errors{'section_on_enumerate_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@section seen before @end enumerate',
     'type' => 'error'
   },
@@ -238,7 +230,6 @@ $result_errors{'section_on_enumerate_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@section should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -247,7 +238,6 @@ $result_errors{'section_on_enumerate_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@section should not appear on @enumerate line',
     'type' => 'warning'
   },
@@ -256,7 +246,6 @@ $result_errors{'section_on_enumerate_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@section seen before @end enumerate',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/section_on_float_line.pl 
b/tp/t/results/invalid_nestings/section_on_float_line.pl
index 0babac21ac..5a8c5ef9f4 100644
--- a/tp/t/results/invalid_nestings/section_on_float_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_float_line.pl
@@ -49,8 +49,7 @@ $result_trees{'section_on_float_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -84,8 +83,7 @@ $result_trees{'section_on_float_line'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
@@ -124,7 +122,6 @@ $result_errors{'section_on_float_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@section should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -133,7 +130,6 @@ $result_errors{'section_on_float_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@section should not appear on @float line',
     'type' => 'warning'
   },
@@ -142,7 +138,6 @@ $result_errors{'section_on_float_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@section seen before @end float',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/section_on_index_entry_line.pl 
b/tp/t/results/invalid_nestings/section_on_index_entry_line.pl
index 3d3db275c2..0df7a33632 100644
--- a/tp/t/results/invalid_nestings/section_on_index_entry_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_index_entry_line.pl
@@ -40,8 +40,7 @@ $result_trees{'section_on_index_entry_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           },
           'type' => 'index_entry_command'
         }
@@ -92,8 +91,7 @@ $result_trees{'section_on_index_entry_line'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
@@ -135,7 +133,6 @@ $result_errors{'section_on_index_entry_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@section should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -144,7 +141,6 @@ $result_errors{'section_on_index_entry_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@section should not appear on @cindex line',
     'type' => 'warning'
   },
@@ -153,7 +149,6 @@ $result_errors{'section_on_index_entry_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/invalid_nestings/section_on_itemize_line.pl 
b/tp/t/results/invalid_nestings/section_on_itemize_line.pl
index b7e6729653..2a587a0f26 100644
--- a/tp/t/results/invalid_nestings/section_on_itemize_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_itemize_line.pl
@@ -22,8 +22,7 @@ $result_trees{'section_on_itemize_line'} = {
                   'cmdname' => 'minus',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'command_as_argument'
                 }
@@ -47,8 +46,7 @@ $result_trees{'section_on_itemize_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -91,8 +89,7 @@ $result_trees{'section_on_itemize_line'} = {
                   'cmdname' => 'minus',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 },
                 {
@@ -115,8 +112,7 @@ $result_trees{'section_on_itemize_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         }
       ],
@@ -130,8 +126,7 @@ $result_trees{'section_on_itemize_line'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -181,8 +176,7 @@ $result_trees{'section_on_itemize_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
@@ -196,8 +190,7 @@ $result_trees{'section_on_itemize_line'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -237,8 +230,7 @@ $result_trees{'section_on_itemize_line'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
@@ -253,8 +245,7 @@ $result_trees{'section_on_itemize_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         }
       ],
@@ -268,8 +259,7 @@ $result_trees{'section_on_itemize_line'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -300,8 +290,7 @@ $result_trees{'section_on_itemize_line'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     }
   ],
@@ -403,7 +392,6 @@ $result_errors{'section_on_itemize_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@section should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -412,7 +400,6 @@ $result_errors{'section_on_itemize_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@section should not appear on @itemize line',
     'type' => 'warning'
   },
@@ -421,7 +408,6 @@ $result_errors{'section_on_itemize_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@section seen before @end itemize',
     'type' => 'error'
   },
@@ -430,7 +416,6 @@ $result_errors{'section_on_itemize_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@section should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -439,7 +424,6 @@ $result_errors{'section_on_itemize_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@section should not appear on @itemize line',
     'type' => 'warning'
   },
@@ -448,7 +432,6 @@ $result_errors{'section_on_itemize_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@section seen before @end itemize',
     'type' => 'error'
   },
@@ -457,7 +440,6 @@ $result_errors{'section_on_itemize_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@section should not appear on @itemize line',
     'type' => 'warning'
   },
@@ -466,7 +448,6 @@ $result_errors{'section_on_itemize_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@section seen before @end itemize',
     'type' => 'error'
   },
@@ -475,7 +456,6 @@ $result_errors{'section_on_itemize_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '@ringaccent expected braces',
     'type' => 'error'
   },
@@ -484,7 +464,6 @@ $result_errors{'section_on_itemize_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '@section should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -493,7 +472,6 @@ $result_errors{'section_on_itemize_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '@section should not appear on @itemize line',
     'type' => 'warning'
   },
@@ -502,7 +480,6 @@ $result_errors{'section_on_itemize_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '@section seen before @end itemize',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/section_on_multitable_line.pl 
b/tp/t/results/invalid_nestings/section_on_multitable_line.pl
index caac57619d..54ce64ee80 100644
--- a/tp/t/results/invalid_nestings/section_on_multitable_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_multitable_line.pl
@@ -26,8 +26,7 @@ $result_trees{'section_on_multitable_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -75,8 +74,7 @@ $result_trees{'section_on_multitable_line'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 }
               ],
@@ -99,8 +97,7 @@ $result_trees{'section_on_multitable_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         }
       ],
@@ -114,8 +111,7 @@ $result_trees{'section_on_multitable_line'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -154,8 +150,7 @@ $result_trees{'section_on_multitable_line'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   },
                   'type' => 'bracketed_arg'
                 },
@@ -170,8 +165,7 @@ $result_trees{'section_on_multitable_line'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   },
                   'type' => 'bracketed_arg'
                 }
@@ -195,8 +189,7 @@ $result_trees{'section_on_multitable_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
@@ -210,8 +203,7 @@ $result_trees{'section_on_multitable_line'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -242,8 +234,7 @@ $result_trees{'section_on_multitable_line'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
@@ -323,7 +314,6 @@ $result_errors{'section_on_multitable_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@section should not appear on @multitable line',
     'type' => 'warning'
   },
@@ -332,7 +322,6 @@ $result_errors{'section_on_multitable_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'empty multitable',
     'type' => 'warning'
   },
@@ -341,7 +330,6 @@ $result_errors{'section_on_multitable_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@section seen before @end multitable',
     'type' => 'error'
   },
@@ -350,7 +338,6 @@ $result_errors{'section_on_multitable_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@section should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -359,7 +346,6 @@ $result_errors{'section_on_multitable_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@section should not appear on @multitable line',
     'type' => 'warning'
   },
@@ -368,7 +354,6 @@ $result_errors{'section_on_multitable_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'unexpected argument on @multitable line: @code{this}',
     'type' => 'warning'
   },
@@ -377,7 +362,6 @@ $result_errors{'section_on_multitable_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'empty multitable',
     'type' => 'warning'
   },
@@ -386,7 +370,6 @@ $result_errors{'section_on_multitable_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@section seen before @end multitable',
     'type' => 'error'
   },
@@ -395,7 +378,6 @@ $result_errors{'section_on_multitable_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@section should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -404,7 +386,6 @@ $result_errors{'section_on_multitable_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@section should not appear on @multitable line',
     'type' => 'warning'
   },
@@ -413,7 +394,6 @@ $result_errors{'section_on_multitable_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@section seen before @end multitable',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/section_on_xtable_line.pl 
b/tp/t/results/invalid_nestings/section_on_xtable_line.pl
index 447fb9a408..a1a7fabd13 100644
--- a/tp/t/results/invalid_nestings/section_on_xtable_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_xtable_line.pl
@@ -30,8 +30,7 @@ $result_trees{'section_on_xtable_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -73,8 +72,7 @@ $result_trees{'section_on_xtable_line'} = {
                   'cmdname' => 'TeX',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   },
                   'type' => 'command_as_argument'
                 }
@@ -98,8 +96,7 @@ $result_trees{'section_on_xtable_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         }
       ],
@@ -113,8 +110,7 @@ $result_trees{'section_on_xtable_line'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -149,8 +145,7 @@ $result_trees{'section_on_xtable_line'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   },
                   'type' => 'command_as_argument'
                 }
@@ -174,8 +169,7 @@ $result_trees{'section_on_xtable_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
@@ -189,8 +183,7 @@ $result_trees{'section_on_xtable_line'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -234,8 +227,7 @@ $result_trees{'section_on_xtable_line'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
@@ -253,8 +245,7 @@ $result_trees{'section_on_xtable_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         }
       ],
@@ -268,8 +259,7 @@ $result_trees{'section_on_xtable_line'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -300,8 +290,7 @@ $result_trees{'section_on_xtable_line'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     }
   ],
@@ -405,7 +394,6 @@ $result_errors{'section_on_xtable_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@section should not appear on @vtable line',
     'type' => 'warning'
   },
@@ -414,7 +402,6 @@ $result_errors{'section_on_xtable_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'missing @vtable argument',
     'type' => 'error'
   },
@@ -423,7 +410,6 @@ $result_errors{'section_on_xtable_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@section seen before @end vtable',
     'type' => 'error'
   },
@@ -432,7 +418,6 @@ $result_errors{'section_on_xtable_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@section should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -441,7 +426,6 @@ $result_errors{'section_on_xtable_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@section should not appear on @table line',
     'type' => 'warning'
   },
@@ -450,7 +434,6 @@ $result_errors{'section_on_xtable_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'command @TeX not accepting argument in brace should not be on 
@table line',
     'type' => 'error'
   },
@@ -459,7 +442,6 @@ $result_errors{'section_on_xtable_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@section seen before @end table',
     'type' => 'error'
   },
@@ -468,7 +450,6 @@ $result_errors{'section_on_xtable_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@section should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -477,7 +458,6 @@ $result_errors{'section_on_xtable_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@section should not appear on @table line',
     'type' => 'warning'
   },
@@ -486,7 +466,6 @@ $result_errors{'section_on_xtable_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@section seen before @end table',
     'type' => 'error'
   },
@@ -495,7 +474,6 @@ $result_errors{'section_on_xtable_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '@ringaccent expected braces',
     'type' => 'error'
   },
@@ -504,7 +482,6 @@ $result_errors{'section_on_xtable_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '@section should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -513,7 +490,6 @@ $result_errors{'section_on_xtable_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '@section should not appear on @ftable line',
     'type' => 'warning'
   },
@@ -522,7 +498,6 @@ $result_errors{'section_on_xtable_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'bad argument to @ftable: @ringaccent ',
     'type' => 'error'
   },
@@ -531,7 +506,6 @@ $result_errors{'section_on_xtable_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '@section seen before @end ftable',
     'type' => 'error'
   }
diff --git 
a/tp/t/results/invalid_nestings/style_not_closed_before_first_node.pl 
b/tp/t/results/invalid_nestings/style_not_closed_before_first_node.pl
index 85b0a5ef4b..60d71a8fda 100644
--- a/tp/t/results/invalid_nestings/style_not_closed_before_first_node.pl
+++ b/tp/t/results/invalid_nestings/style_not_closed_before_first_node.pl
@@ -31,8 +31,7 @@ $result_trees{'style_not_closed_before_first_node'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -81,8 +80,7 @@ $result_trees{'style_not_closed_before_first_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     }
   ],
@@ -124,7 +122,6 @@ $result_errors{'style_not_closed_before_first_node'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@code missing closing brace',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/style_not_closed_in_block_command.pl 
b/tp/t/results/invalid_nestings/style_not_closed_in_block_command.pl
index 8d387e0b2a..9bf368c57f 100644
--- a/tp/t/results/invalid_nestings/style_not_closed_in_block_command.pl
+++ b/tp/t/results/invalid_nestings/style_not_closed_in_block_command.pl
@@ -43,8 +43,7 @@ $result_trees{'style_not_closed_in_block_command'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   }
                 }
               ],
@@ -78,15 +77,13 @@ $result_trees{'style_not_closed_in_block_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -111,7 +108,6 @@ $result_errors{'style_not_closed_in_block_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@end cartouche seen before @code closing brace',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl 
b/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl
index 3577798beb..623f5a1bd0 100644
--- a/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl
+++ b/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl
@@ -17,8 +17,7 @@ $result_trees{'style_not_closed_in_table_line'} = {
                   'cmdname' => 'asis',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'command_as_argument'
                 }
@@ -63,8 +62,7 @@ $result_trees{'style_not_closed_in_table_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -95,8 +93,7 @@ $result_trees{'style_not_closed_in_table_line'} = {
                           'cmdname' => 'code',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 4,
-                            'macro' => ''
+                            'line_nr' => 4
                           }
                         }
                       ],
@@ -137,8 +134,7 @@ $result_trees{'style_not_closed_in_table_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     }
                   ],
@@ -175,8 +171,7 @@ $result_trees{'style_not_closed_in_table_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -190,8 +185,7 @@ $result_trees{'style_not_closed_in_table_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -221,7 +215,6 @@ $result_errors{'style_not_closed_in_table_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '@code missing closing brace',
     'type' => 'error'
   }
diff --git 
a/tp/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl 
b/tp/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl
index 5a80145f90..5a64cdaf29 100644
--- a/tp/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl
+++ b/tp/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl
@@ -39,8 +39,7 @@ $result_trees{'style_not_closed_no_newline_root_commands'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -124,8 +123,7 @@ $result_trees{'style_not_closed_no_newline_root_commands'} 
= {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -157,15 +155,13 @@ 
$result_trees{'style_not_closed_no_newline_root_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -190,8 +186,7 @@ $result_trees{'style_not_closed_no_newline_root_commands'} 
= {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
@@ -206,8 +201,7 @@ $result_trees{'style_not_closed_no_newline_root_commands'} 
= {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -239,8 +233,7 @@ $result_trees{'style_not_closed_no_newline_root_commands'} 
= {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -284,8 +277,7 @@ $result_trees{'style_not_closed_no_newline_root_commands'} 
= {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
@@ -302,8 +294,7 @@ $result_trees{'style_not_closed_no_newline_root_commands'} 
= {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -458,7 +449,6 @@ $result_errors{'style_not_closed_no_newline_root_commands'} 
= [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@node should not appear in @code',
     'type' => 'warning'
   },
@@ -467,7 +457,6 @@ $result_errors{'style_not_closed_no_newline_root_commands'} 
= [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => '@node seen before @code closing brace',
     'type' => 'error'
   },
@@ -476,7 +465,6 @@ $result_errors{'style_not_closed_no_newline_root_commands'} 
= [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => '@bye should not appear in @code',
     'type' => 'warning'
   },
@@ -485,7 +473,6 @@ $result_errors{'style_not_closed_no_newline_root_commands'} 
= [
 ',
     'file_name' => '',
     'line_nr' => 12,
-    'macro' => '',
     'text' => '@bye seen before @code closing brace',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/style_not_closed_root_commands.pl 
b/tp/t/results/invalid_nestings/style_not_closed_root_commands.pl
index 8efd1db82e..70b9ae485f 100644
--- a/tp/t/results/invalid_nestings/style_not_closed_root_commands.pl
+++ b/tp/t/results/invalid_nestings/style_not_closed_root_commands.pl
@@ -39,8 +39,7 @@ $result_trees{'style_not_closed_root_commands'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -124,8 +123,7 @@ $result_trees{'style_not_closed_root_commands'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -157,15 +155,13 @@ $result_trees{'style_not_closed_root_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -195,8 +191,7 @@ $result_trees{'style_not_closed_root_commands'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
@@ -211,8 +206,7 @@ $result_trees{'style_not_closed_root_commands'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -244,8 +238,7 @@ $result_trees{'style_not_closed_root_commands'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -294,8 +287,7 @@ $result_trees{'style_not_closed_root_commands'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             }
           ],
@@ -312,8 +304,7 @@ $result_trees{'style_not_closed_root_commands'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -472,7 +463,6 @@ $result_errors{'style_not_closed_root_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => '@code missing closing brace',
     'type' => 'error'
   },
@@ -481,7 +471,6 @@ $result_errors{'style_not_closed_root_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => '@code missing closing brace',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/tab_in_index.pl 
b/tp/t/results/invalid_nestings/tab_in_index.pl
index 4222a77973..a6742d6b8a 100644
--- a/tp/t/results/invalid_nestings/tab_in_index.pl
+++ b/tp/t/results/invalid_nestings/tab_in_index.pl
@@ -21,8 +21,7 @@ $result_trees{'tab_in_index'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'bracketed_arg'
                 },
@@ -37,8 +36,7 @@ $result_trees{'tab_in_index'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'bracketed_arg'
                 }
@@ -79,8 +77,7 @@ $result_trees{'tab_in_index'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -135,8 +132,7 @@ $result_trees{'tab_in_index'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 3,
-                                'macro' => ''
+                                'line_nr' => 3
                               },
                               'type' => 'index_entry_command'
                             }
@@ -149,8 +145,7 @@ $result_trees{'tab_in_index'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -190,8 +185,7 @@ $result_trees{'tab_in_index'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -205,8 +199,7 @@ $result_trees{'tab_in_index'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -232,7 +225,6 @@ $result_errors{'tab_in_index'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@tab should not appear on @vindex line',
     'type' => 'warning'
   },
@@ -241,7 +233,6 @@ $result_errors{'tab_in_index'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'ignoring @tab outside of multitable',
     'type' => 'error'
   },
@@ -250,7 +241,6 @@ $result_errors{'tab_in_index'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'entry for index `vr\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/invalid_nestings/table_in_code.pl 
b/tp/t/results/invalid_nestings/table_in_code.pl
index 77d4fde9e4..6b72a51d85 100644
--- a/tp/t/results/invalid_nestings/table_in_code.pl
+++ b/tp/t/results/invalid_nestings/table_in_code.pl
@@ -30,8 +30,7 @@ $result_trees{'table_in_code'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -45,8 +44,7 @@ $result_trees{'table_in_code'} = {
                   'cmdname' => 'emph',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   },
                   'type' => 'command_as_argument'
                 }
@@ -91,8 +89,7 @@ $result_trees{'table_in_code'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     }
                   ],
@@ -143,8 +140,7 @@ $result_trees{'table_in_code'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -158,8 +154,7 @@ $result_trees{'table_in_code'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -198,7 +193,6 @@ $result_errors{'table_in_code'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@code missing closing brace',
     'type' => 'error'
   },
@@ -207,7 +201,6 @@ $result_errors{'table_in_code'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl 
b/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl
index 87bf390527..3b2647263a 100644
--- a/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl
+++ b/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl
@@ -71,8 +71,7 @@ $result_trees{'table_not_closed_in_menu_comment'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               },
               'type' => 'menu_entry'
             },
@@ -96,8 +95,7 @@ $result_trees{'table_not_closed_in_menu_comment'} = {
                           'cmdname' => 'asis',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 4,
-                            'macro' => ''
+                            'line_nr' => 4
                           },
                           'type' => 'command_as_argument'
                         }
@@ -142,8 +140,7 @@ $result_trees{'table_not_closed_in_menu_comment'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 5,
-                                'macro' => ''
+                                'line_nr' => 5
                               }
                             }
                           ],
@@ -181,8 +178,7 @@ $result_trees{'table_not_closed_in_menu_comment'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 }
               ],
@@ -216,15 +212,13 @@ $result_trees{'table_not_closed_in_menu_comment'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -260,7 +254,6 @@ $result_errors{'table_not_closed_in_menu_comment'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => '`@end\' expected `table\', but saw `menu\'',
     'type' => 'error'
   }
diff --git 
a/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl 
b/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl
index 0b104b95cb..6e85768fee 100644
--- a/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl
+++ b/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl
@@ -72,8 +72,7 @@ $result_trees{'table_not_closed_in_menu_description'} = {
                               'cmdname' => 'asis',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 2,
-                                'macro' => ''
+                                'line_nr' => 2
                               },
                               'type' => 'command_as_argument'
                             }
@@ -118,8 +117,7 @@ $result_trees{'table_not_closed_in_menu_description'} = {
                                   },
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 3,
-                                    'macro' => ''
+                                    'line_nr' => 3
                                   }
                                 }
                               ],
@@ -153,8 +151,7 @@ $result_trees{'table_not_closed_in_menu_description'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -163,8 +160,7 @@ $result_trees{'table_not_closed_in_menu_description'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               },
               'type' => 'menu_entry'
             },
@@ -196,15 +192,13 @@ $result_trees{'table_not_closed_in_menu_description'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -234,7 +228,6 @@ $result_errors{'table_not_closed_in_menu_description'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@table should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -243,7 +236,6 @@ $result_errors{'table_not_closed_in_menu_description'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '`@end\' expected `table\', but saw `menu\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/table_on_item_line.pl 
b/tp/t/results/invalid_nestings/table_on_item_line.pl
index 51ba523fd7..68476d9b6e 100644
--- a/tp/t/results/invalid_nestings/table_on_item_line.pl
+++ b/tp/t/results/invalid_nestings/table_on_item_line.pl
@@ -17,8 +17,7 @@ $result_trees{'table_on_item_line'} = {
                   'cmdname' => 'asis',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'command_as_argument'
                 }
@@ -53,8 +52,7 @@ $result_trees{'table_on_item_line'} = {
                                       'cmdname' => 'asis',
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 2,
-                                        'macro' => ''
+                                        'line_nr' => 2
                                       },
                                       'type' => 'command_as_argument'
                                     }
@@ -79,8 +77,7 @@ $result_trees{'table_on_item_line'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 2,
-                                'macro' => ''
+                                'line_nr' => 2
                               }
                             }
                           ],
@@ -95,8 +92,7 @@ $result_trees{'table_on_item_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -143,8 +139,7 @@ $result_trees{'table_on_item_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -202,8 +197,7 @@ $result_trees{'table_on_item_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -217,8 +211,7 @@ $result_trees{'table_on_item_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -260,7 +253,6 @@ $result_errors{'table_on_item_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@table should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -269,7 +261,6 @@ $result_errors{'table_on_item_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@table should not appear in @item',
     'type' => 'warning'
   },
@@ -278,7 +269,6 @@ $result_errors{'table_on_item_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'no matching `@end table\'',
     'type' => 'error'
   },
@@ -287,7 +277,6 @@ $result_errors{'table_on_item_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'unmatched `@end table\'',
     'type' => 'error'
   }
diff --git 
a/tp/t/results/invalid_nestings/unclosed_verb_end_of_line_on_misc_line.pl 
b/tp/t/results/invalid_nestings/unclosed_verb_end_of_line_on_misc_line.pl
index 96d7cb0be0..9a35fd87b4 100644
--- a/tp/t/results/invalid_nestings/unclosed_verb_end_of_line_on_misc_line.pl
+++ b/tp/t/results/invalid_nestings/unclosed_verb_end_of_line_on_misc_line.pl
@@ -35,8 +35,7 @@ $result_trees{'unclosed_verb_end_of_line_on_misc_line'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 }
               ],
@@ -54,8 +53,7 @@ $result_trees{'unclosed_verb_end_of_line_on_misc_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -77,7 +75,6 @@ $result_errors{'unclosed_verb_end_of_line_on_misc_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@verb should not appear in @setfilename',
     'type' => 'warning'
   },
@@ -86,7 +83,6 @@ $result_errors{'unclosed_verb_end_of_line_on_misc_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@verb without associated character',
     'type' => 'error'
   },
@@ -95,7 +91,6 @@ $result_errors{'unclosed_verb_end_of_line_on_misc_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@verb missing closing brace',
     'type' => 'error'
   },
@@ -105,7 +100,6 @@ $result_errors{'unclosed_verb_end_of_line_on_misc_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'bad argument to @setfilename: name @verb{
 }',
     'type' => 'error'
diff --git a/tp/t/results/invalid_nestings/unclosed_verb_on_misc_line.pl 
b/tp/t/results/invalid_nestings/unclosed_verb_on_misc_line.pl
index eb013085dc..0d2a65bec6 100644
--- a/tp/t/results/invalid_nestings/unclosed_verb_on_misc_line.pl
+++ b/tp/t/results/invalid_nestings/unclosed_verb_on_misc_line.pl
@@ -34,8 +34,7 @@ $result_trees{'unclosed_verb_on_misc_line'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 }
               ],
@@ -53,8 +52,7 @@ $result_trees{'unclosed_verb_on_misc_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -75,7 +73,6 @@ $result_errors{'unclosed_verb_on_misc_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@verb should not appear in @setfilename',
     'type' => 'warning'
   },
@@ -84,7 +81,6 @@ $result_errors{'unclosed_verb_on_misc_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@verb missing closing delimiter sequence: f}',
     'type' => 'error'
   },
@@ -93,7 +89,6 @@ $result_errors{'unclosed_verb_on_misc_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'bad argument to @setfilename: name @verb{file.texif}',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/unclosed_verb_on_section_line.pl 
b/tp/t/results/invalid_nestings/unclosed_verb_on_section_line.pl
index cd409fa127..ec0da61a8b 100644
--- a/tp/t/results/invalid_nestings/unclosed_verb_on_section_line.pl
+++ b/tp/t/results/invalid_nestings/unclosed_verb_on_section_line.pl
@@ -46,8 +46,7 @@ $result_trees{'unclosed_verb_on_section_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -65,8 +64,7 @@ $result_trees{'unclosed_verb_on_section_line'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
@@ -108,7 +106,6 @@ $result_errors{'unclosed_verb_on_section_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@verb should not appear on @section line',
     'type' => 'warning'
   },
@@ -117,7 +114,6 @@ $result_errors{'unclosed_verb_on_section_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@verb missing closing delimiter sequence: T}',
     'type' => 'error'
   }
diff --git a/tp/t/results/invalid_nestings/verbatim_in_ref.pl 
b/tp/t/results/invalid_nestings/verbatim_in_ref.pl
index 3a07e9f542..ca5a1aba05 100644
--- a/tp/t/results/invalid_nestings/verbatim_in_ref.pl
+++ b/tp/t/results/invalid_nestings/verbatim_in_ref.pl
@@ -59,8 +59,7 @@ $result_trees{'verbatim_in_ref'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -113,15 +112,13 @@ $result_trees{'verbatim_in_ref'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -149,8 +146,7 @@ $result_trees{'verbatim_in_ref'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
@@ -195,7 +191,6 @@ $result_errors{'verbatim_in_ref'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@xref missing closing brace',
     'type' => 'error'
   },
@@ -204,7 +199,6 @@ $result_errors{'verbatim_in_ref'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/itemize/accent_argument.pl 
b/tp/t/results/itemize/accent_argument.pl
index 6e061f0efa..a7bc6a8ae3 100644
--- a/tp/t/results/itemize/accent_argument.pl
+++ b/tp/t/results/itemize/accent_argument.pl
@@ -27,8 +27,7 @@ $result_trees{'accent_argument'} = {
                   'cmdname' => '~',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 }
               ],
@@ -65,8 +64,7 @@ $result_trees{'accent_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -97,8 +95,7 @@ $result_trees{'accent_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -109,8 +106,7 @@ $result_trees{'accent_argument'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -136,8 +132,7 @@ $result_trees{'accent_argument'} = {
                   'cmdname' => '~',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 }
               ],
@@ -174,8 +169,7 @@ $result_trees{'accent_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -206,8 +200,7 @@ $result_trees{'accent_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -218,8 +211,7 @@ $result_trees{'accent_argument'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -250,8 +242,7 @@ $result_trees{'accent_argument'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 }
               ],
@@ -288,8 +279,7 @@ $result_trees{'accent_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -320,8 +310,7 @@ $result_trees{'accent_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
@@ -332,8 +321,7 @@ $result_trees{'accent_argument'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         }
       ],
diff --git a/tp/t/results/itemize/asis_as_itemize_argument.pl 
b/tp/t/results/itemize/asis_as_itemize_argument.pl
index a3d6ebe1bf..cd9ebf70ea 100644
--- a/tp/t/results/itemize/asis_as_itemize_argument.pl
+++ b/tp/t/results/itemize/asis_as_itemize_argument.pl
@@ -17,8 +17,7 @@ $result_trees{'asis_as_itemize_argument'} = {
                   'cmdname' => 'asis',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'command_as_argument'
                 }
@@ -56,8 +55,7 @@ $result_trees{'asis_as_itemize_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -88,8 +86,7 @@ $result_trees{'asis_as_itemize_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -103,8 +100,7 @@ $result_trees{'asis_as_itemize_argument'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/itemize/bad_enumerate_arguments.pl 
b/tp/t/results/itemize/bad_enumerate_arguments.pl
index 80b9df8134..65df2531a5 100644
--- a/tp/t/results/itemize/bad_enumerate_arguments.pl
+++ b/tp/t/results/itemize/bad_enumerate_arguments.pl
@@ -56,8 +56,7 @@ $result_trees{'bad_enumerate_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -71,8 +70,7 @@ $result_trees{'bad_enumerate_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -127,8 +125,7 @@ $result_trees{'bad_enumerate_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -142,8 +139,7 @@ $result_trees{'bad_enumerate_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -169,8 +165,7 @@ $result_trees{'bad_enumerate_arguments'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
@@ -213,8 +208,7 @@ $result_trees{'bad_enumerate_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
@@ -228,8 +222,7 @@ $result_trees{'bad_enumerate_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -287,8 +280,7 @@ $result_trees{'bad_enumerate_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
@@ -302,8 +294,7 @@ $result_trees{'bad_enumerate_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -358,8 +349,7 @@ $result_trees{'bad_enumerate_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
@@ -373,8 +363,7 @@ $result_trees{'bad_enumerate_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         }
       ],
@@ -413,7 +402,6 @@ $result_errors{'bad_enumerate_arguments'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'bad argument to @enumerate',
     'type' => 'error'
   },
@@ -422,7 +410,6 @@ $result_errors{'bad_enumerate_arguments'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'bad argument to @enumerate',
     'type' => 'error'
   },
@@ -431,7 +418,6 @@ $result_errors{'bad_enumerate_arguments'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'bad argument to @enumerate',
     'type' => 'error'
   },
@@ -440,7 +426,6 @@ $result_errors{'bad_enumerate_arguments'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => 'superfluous argument to @enumerate',
     'type' => 'error'
   },
@@ -449,7 +434,6 @@ $result_errors{'bad_enumerate_arguments'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => 'bad argument to @enumerate',
     'type' => 'error'
   }
diff --git a/tp/t/results/itemize/comment_first_on_enumerate_line.pl 
b/tp/t/results/itemize/comment_first_on_enumerate_line.pl
index c2dc5f6b90..a212d35fc4 100644
--- a/tp/t/results/itemize/comment_first_on_enumerate_line.pl
+++ b/tp/t/results/itemize/comment_first_on_enumerate_line.pl
@@ -51,8 +51,7 @@ $result_trees{'comment_first_on_enumerate_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -83,8 +82,7 @@ $result_trees{'comment_first_on_enumerate_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -98,8 +96,7 @@ $result_trees{'comment_first_on_enumerate_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/itemize/comment_first_on_itemize_line.pl 
b/tp/t/results/itemize/comment_first_on_itemize_line.pl
index 3e1f7a11a6..4c1a887a74 100644
--- a/tp/t/results/itemize/comment_first_on_itemize_line.pl
+++ b/tp/t/results/itemize/comment_first_on_itemize_line.pl
@@ -57,8 +57,7 @@ $result_trees{'comment_first_on_itemize_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -89,8 +88,7 @@ $result_trees{'comment_first_on_itemize_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -104,8 +102,7 @@ $result_trees{'comment_first_on_itemize_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/itemize/empty_accent_argument.pl 
b/tp/t/results/itemize/empty_accent_argument.pl
index beb1fcb8a1..e96c128054 100644
--- a/tp/t/results/itemize/empty_accent_argument.pl
+++ b/tp/t/results/itemize/empty_accent_argument.pl
@@ -17,8 +17,7 @@ $result_trees{'empty_accent_argument'} = {
                   'cmdname' => '~',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 }
               ],
@@ -61,8 +60,7 @@ $result_trees{'empty_accent_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -93,8 +91,7 @@ $result_trees{'empty_accent_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -105,8 +102,7 @@ $result_trees{'empty_accent_argument'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -122,8 +118,7 @@ $result_trees{'empty_accent_argument'} = {
                   'cmdname' => '~',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 }
               ],
@@ -160,8 +155,7 @@ $result_trees{'empty_accent_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -192,8 +186,7 @@ $result_trees{'empty_accent_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -204,8 +197,7 @@ $result_trees{'empty_accent_argument'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -226,8 +218,7 @@ $result_trees{'empty_accent_argument'} = {
                   'cmdname' => '~',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   },
                   'type' => 'command_as_argument'
                 }
@@ -265,8 +256,7 @@ $result_trees{'empty_accent_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -297,8 +287,7 @@ $result_trees{'empty_accent_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
@@ -309,8 +298,7 @@ $result_trees{'empty_accent_argument'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -326,8 +314,7 @@ $result_trees{'empty_accent_argument'} = {
                   'cmdname' => '~',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 13,
-                    'macro' => ''
+                    'line_nr' => 13
                   }
                 }
               ],
@@ -364,8 +351,7 @@ $result_trees{'empty_accent_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -396,8 +382,7 @@ $result_trees{'empty_accent_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
@@ -408,8 +393,7 @@ $result_trees{'empty_accent_argument'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         }
       ],
@@ -452,7 +436,6 @@ $result_errors{'empty_accent_argument'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@~ expected braces',
     'type' => 'error'
   },
@@ -461,7 +444,6 @@ $result_errors{'empty_accent_argument'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'command `@~\' must not be followed by new line',
     'type' => 'warning'
   },
@@ -470,7 +452,6 @@ $result_errors{'empty_accent_argument'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'accent command `@~\' not allowed as @itemize argument',
     'type' => 'warning'
   },
@@ -479,7 +460,6 @@ $result_errors{'empty_accent_argument'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => 'command `@~\' must not be followed by new line',
     'type' => 'warning'
   }
diff --git a/tp/t/results/itemize/enumerate_and_empty_lines.pl 
b/tp/t/results/itemize/enumerate_and_empty_lines.pl
index a4ddc25c13..927943ebe6 100644
--- a/tp/t/results/itemize/enumerate_and_empty_lines.pl
+++ b/tp/t/results/itemize/enumerate_and_empty_lines.pl
@@ -45,8 +45,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -117,15 +116,13 @@ $result_trees{'enumerate_and_empty_lines'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     }
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 }
               ],
@@ -134,8 +131,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -166,8 +162,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -234,15 +229,13 @@ $result_trees{'enumerate_and_empty_lines'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     }
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 14,
-                    'macro' => ''
+                    'line_nr' => 14
                   }
                 }
               ],
@@ -251,8 +244,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -314,15 +306,13 @@ $result_trees{'enumerate_and_empty_lines'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     }
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 18,
-                    'macro' => ''
+                    'line_nr' => 18
                   }
                 },
                 {
@@ -336,8 +326,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -404,15 +393,13 @@ $result_trees{'enumerate_and_empty_lines'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 26,
-                        'macro' => ''
+                        'line_nr' => 26
                       }
                     }
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 24,
-                    'macro' => ''
+                    'line_nr' => 24
                   }
                 }
               ],
@@ -421,8 +408,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -453,8 +439,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             }
           ],
@@ -463,8 +448,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -508,8 +492,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -540,8 +523,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               }
             }
           ],
@@ -550,8 +532,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 29,
-            'macro' => ''
+            'line_nr' => 29
           }
         }
       ],
diff --git a/tp/t/results/itemize/enumerate_argument.pl 
b/tp/t/results/itemize/enumerate_argument.pl
index 7538c12f44..65caac3313 100644
--- a/tp/t/results/itemize/enumerate_argument.pl
+++ b/tp/t/results/itemize/enumerate_argument.pl
@@ -56,8 +56,7 @@ $result_trees{'enumerate_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -71,8 +70,7 @@ $result_trees{'enumerate_argument'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -133,8 +131,7 @@ $result_trees{'enumerate_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -148,8 +145,7 @@ $result_trees{'enumerate_argument'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -213,8 +209,7 @@ $result_trees{'enumerate_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
@@ -228,8 +223,7 @@ $result_trees{'enumerate_argument'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         }
       ],
diff --git a/tp/t/results/itemize/enumerate_argument_item.pl 
b/tp/t/results/itemize/enumerate_argument_item.pl
index 2e8b1a0b5e..e71d79d70c 100644
--- a/tp/t/results/itemize/enumerate_argument_item.pl
+++ b/tp/t/results/itemize/enumerate_argument_item.pl
@@ -50,8 +50,7 @@ $result_trees{'enumerate_argument_item'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -76,8 +75,7 @@ $result_trees{'enumerate_argument_item'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -108,8 +106,7 @@ $result_trees{'enumerate_argument_item'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -123,8 +120,7 @@ $result_trees{'enumerate_argument_item'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -179,8 +175,7 @@ $result_trees{'enumerate_argument_item'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -205,8 +200,7 @@ $result_trees{'enumerate_argument_item'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -237,8 +231,7 @@ $result_trees{'enumerate_argument_item'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
@@ -252,8 +245,7 @@ $result_trees{'enumerate_argument_item'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -311,8 +303,7 @@ $result_trees{'enumerate_argument_item'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -337,8 +328,7 @@ $result_trees{'enumerate_argument_item'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -369,8 +359,7 @@ $result_trees{'enumerate_argument_item'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
@@ -384,8 +373,7 @@ $result_trees{'enumerate_argument_item'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         }
       ],
diff --git a/tp/t/results/itemize/enumerate_in_example.pl 
b/tp/t/results/itemize/enumerate_in_example.pl
index dc5920a702..0ec0d4f848 100644
--- a/tp/t/results/itemize/enumerate_in_example.pl
+++ b/tp/t/results/itemize/enumerate_in_example.pl
@@ -64,8 +64,7 @@ $result_trees{'enumerate_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 },
                 {
@@ -99,8 +98,7 @@ $result_trees{'enumerate_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 },
                 {
@@ -131,8 +129,7 @@ $result_trees{'enumerate_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 8,
-                    'macro' => ''
+                    'line_nr' => 8
                   }
                 }
               ],
@@ -141,8 +138,7 @@ $result_trees{'enumerate_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -173,15 +169,13 @@ $result_trees{'enumerate_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
diff --git a/tp/t/results/itemize/enumerate_letters.pl 
b/tp/t/results/itemize/enumerate_letters.pl
index e41496e622..8b514fc7c9 100644
--- a/tp/t/results/itemize/enumerate_letters.pl
+++ b/tp/t/results/itemize/enumerate_letters.pl
@@ -50,8 +50,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -76,8 +75,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -102,8 +100,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -128,8 +125,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -154,8 +150,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -180,8 +175,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -206,8 +200,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -232,8 +225,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -258,8 +250,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -284,8 +275,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -310,8 +300,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -336,8 +325,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -362,8 +350,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -388,8 +375,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -414,8 +400,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -440,8 +425,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -466,8 +450,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -492,8 +475,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -518,8 +500,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -544,8 +525,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -570,8 +550,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -596,8 +575,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -622,8 +600,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -648,8 +625,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               }
             },
             {
@@ -674,8 +650,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             },
             {
@@ -700,8 +675,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             },
             {
@@ -726,8 +700,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             },
             {
@@ -752,8 +725,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             },
             {
@@ -778,8 +750,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -804,8 +775,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               }
             },
             {
@@ -830,8 +800,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               }
             },
             {
@@ -856,8 +825,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               }
             },
             {
@@ -882,8 +850,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             },
             {
@@ -908,8 +875,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             },
             {
@@ -934,8 +900,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               }
             },
             {
@@ -960,8 +925,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 37,
-                'macro' => ''
+                'line_nr' => 37
               }
             },
             {
@@ -986,8 +950,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               }
             },
             {
@@ -1012,8 +975,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 39,
-                'macro' => ''
+                'line_nr' => 39
               }
             },
             {
@@ -1038,8 +1000,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               }
             },
             {
@@ -1064,8 +1025,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 41,
-                'macro' => ''
+                'line_nr' => 41
               }
             },
             {
@@ -1090,8 +1050,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               }
             },
             {
@@ -1116,8 +1075,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               }
             },
             {
@@ -1142,8 +1100,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             },
             {
@@ -1168,8 +1125,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 45,
-                'macro' => ''
+                'line_nr' => 45
               }
             },
             {
@@ -1194,8 +1150,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -1220,8 +1175,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               }
             },
             {
@@ -1246,8 +1200,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               }
             },
             {
@@ -1272,8 +1225,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             },
             {
@@ -1298,8 +1250,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             },
             {
@@ -1324,8 +1275,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 51,
-                'macro' => ''
+                'line_nr' => 51
               }
             },
             {
@@ -1350,8 +1300,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               }
             },
             {
@@ -1376,8 +1325,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               }
             },
             {
@@ -1402,8 +1350,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 54,
-                'macro' => ''
+                'line_nr' => 54
               }
             },
             {
@@ -1428,8 +1375,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 55,
-                'macro' => ''
+                'line_nr' => 55
               }
             },
             {
@@ -1454,8 +1400,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -1480,8 +1425,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 57,
-                'macro' => ''
+                'line_nr' => 57
               }
             },
             {
@@ -1506,8 +1450,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             },
             {
@@ -1532,8 +1475,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             },
             {
@@ -1558,8 +1500,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 60,
-                'macro' => ''
+                'line_nr' => 60
               }
             },
             {
@@ -1584,8 +1525,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -1610,8 +1550,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -1636,8 +1575,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 63,
-                'macro' => ''
+                'line_nr' => 63
               }
             },
             {
@@ -1662,8 +1600,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             },
             {
@@ -1688,8 +1625,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             },
             {
@@ -1714,8 +1650,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 66,
-                'macro' => ''
+                'line_nr' => 66
               }
             },
             {
@@ -1740,8 +1675,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 67,
-                'macro' => ''
+                'line_nr' => 67
               }
             },
             {
@@ -1766,8 +1700,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 68,
-                'macro' => ''
+                'line_nr' => 68
               }
             },
             {
@@ -1792,8 +1725,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 69,
-                'macro' => ''
+                'line_nr' => 69
               }
             },
             {
@@ -1818,8 +1750,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 70,
-                'macro' => ''
+                'line_nr' => 70
               }
             },
             {
@@ -1844,8 +1775,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             },
             {
@@ -1870,8 +1800,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 72,
-                'macro' => ''
+                'line_nr' => 72
               }
             },
             {
@@ -1896,8 +1825,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 73,
-                'macro' => ''
+                'line_nr' => 73
               }
             },
             {
@@ -1922,8 +1850,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 74,
-                'macro' => ''
+                'line_nr' => 74
               }
             },
             {
@@ -1948,8 +1875,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 75,
-                'macro' => ''
+                'line_nr' => 75
               }
             },
             {
@@ -1974,8 +1900,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 76,
-                'macro' => ''
+                'line_nr' => 76
               }
             },
             {
@@ -2000,8 +1925,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 77,
-                'macro' => ''
+                'line_nr' => 77
               }
             },
             {
@@ -2026,8 +1950,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 78,
-                'macro' => ''
+                'line_nr' => 78
               }
             },
             {
@@ -2052,8 +1975,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 79,
-                'macro' => ''
+                'line_nr' => 79
               }
             },
             {
@@ -2078,8 +2000,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 80,
-                'macro' => ''
+                'line_nr' => 80
               }
             },
             {
@@ -2104,8 +2025,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 81,
-                'macro' => ''
+                'line_nr' => 81
               }
             },
             {
@@ -2130,8 +2050,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 82,
-                'macro' => ''
+                'line_nr' => 82
               }
             },
             {
@@ -2156,8 +2075,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 83,
-                'macro' => ''
+                'line_nr' => 83
               }
             },
             {
@@ -2182,8 +2100,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 84,
-                'macro' => ''
+                'line_nr' => 84
               }
             },
             {
@@ -2208,8 +2125,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 85,
-                'macro' => ''
+                'line_nr' => 85
               }
             },
             {
@@ -2234,8 +2150,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 86,
-                'macro' => ''
+                'line_nr' => 86
               }
             },
             {
@@ -2260,8 +2175,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 87,
-                'macro' => ''
+                'line_nr' => 87
               }
             },
             {
@@ -2286,8 +2200,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 88,
-                'macro' => ''
+                'line_nr' => 88
               }
             },
             {
@@ -2312,8 +2225,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 89,
-                'macro' => ''
+                'line_nr' => 89
               }
             },
             {
@@ -2338,8 +2250,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 90,
-                'macro' => ''
+                'line_nr' => 90
               }
             },
             {
@@ -2364,8 +2275,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 91,
-                'macro' => ''
+                'line_nr' => 91
               }
             },
             {
@@ -2390,8 +2300,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 92,
-                'macro' => ''
+                'line_nr' => 92
               }
             },
             {
@@ -2416,8 +2325,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 93,
-                'macro' => ''
+                'line_nr' => 93
               }
             },
             {
@@ -2442,8 +2350,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 94,
-                'macro' => ''
+                'line_nr' => 94
               }
             },
             {
@@ -2468,8 +2375,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 95,
-                'macro' => ''
+                'line_nr' => 95
               }
             },
             {
@@ -2494,8 +2400,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 96,
-                'macro' => ''
+                'line_nr' => 96
               }
             },
             {
@@ -2520,8 +2425,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 97,
-                'macro' => ''
+                'line_nr' => 97
               }
             },
             {
@@ -2546,8 +2450,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 98,
-                'macro' => ''
+                'line_nr' => 98
               }
             },
             {
@@ -2572,8 +2475,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 99,
-                'macro' => ''
+                'line_nr' => 99
               }
             },
             {
@@ -2598,8 +2500,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 100,
-                'macro' => ''
+                'line_nr' => 100
               }
             },
             {
@@ -2624,8 +2525,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 101,
-                'macro' => ''
+                'line_nr' => 101
               }
             },
             {
@@ -2650,8 +2550,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 102,
-                'macro' => ''
+                'line_nr' => 102
               }
             },
             {
@@ -2676,8 +2575,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 103,
-                'macro' => ''
+                'line_nr' => 103
               }
             },
             {
@@ -2702,8 +2600,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 104,
-                'macro' => ''
+                'line_nr' => 104
               }
             },
             {
@@ -2728,8 +2625,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 105,
-                'macro' => ''
+                'line_nr' => 105
               }
             },
             {
@@ -2754,8 +2650,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 106,
-                'macro' => ''
+                'line_nr' => 106
               }
             },
             {
@@ -2780,8 +2675,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 107,
-                'macro' => ''
+                'line_nr' => 107
               }
             },
             {
@@ -2806,8 +2700,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 108,
-                'macro' => ''
+                'line_nr' => 108
               }
             },
             {
@@ -2832,8 +2725,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 109,
-                'macro' => ''
+                'line_nr' => 109
               }
             },
             {
@@ -2858,8 +2750,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 110,
-                'macro' => ''
+                'line_nr' => 110
               }
             },
             {
@@ -2884,8 +2775,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 111,
-                'macro' => ''
+                'line_nr' => 111
               }
             },
             {
@@ -2910,8 +2800,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 112,
-                'macro' => ''
+                'line_nr' => 112
               }
             },
             {
@@ -2936,8 +2825,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 113,
-                'macro' => ''
+                'line_nr' => 113
               }
             },
             {
@@ -2962,8 +2850,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 114,
-                'macro' => ''
+                'line_nr' => 114
               }
             },
             {
@@ -2988,8 +2875,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 115,
-                'macro' => ''
+                'line_nr' => 115
               }
             },
             {
@@ -3014,8 +2900,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 116,
-                'macro' => ''
+                'line_nr' => 116
               }
             },
             {
@@ -3040,8 +2925,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 117,
-                'macro' => ''
+                'line_nr' => 117
               }
             },
             {
@@ -3066,8 +2950,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 118,
-                'macro' => ''
+                'line_nr' => 118
               }
             },
             {
@@ -3092,8 +2975,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 119,
-                'macro' => ''
+                'line_nr' => 119
               }
             },
             {
@@ -3118,8 +3000,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 120,
-                'macro' => ''
+                'line_nr' => 120
               }
             },
             {
@@ -3144,8 +3025,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 121,
-                'macro' => ''
+                'line_nr' => 121
               }
             },
             {
@@ -3170,8 +3050,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 122,
-                'macro' => ''
+                'line_nr' => 122
               }
             },
             {
@@ -3196,8 +3075,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 123,
-                'macro' => ''
+                'line_nr' => 123
               }
             },
             {
@@ -3222,8 +3100,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 124,
-                'macro' => ''
+                'line_nr' => 124
               }
             },
             {
@@ -3248,8 +3125,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 125,
-                'macro' => ''
+                'line_nr' => 125
               }
             },
             {
@@ -3274,8 +3150,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 126,
-                'macro' => ''
+                'line_nr' => 126
               }
             },
             {
@@ -3300,8 +3175,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 127,
-                'macro' => ''
+                'line_nr' => 127
               }
             },
             {
@@ -3326,8 +3200,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 128,
-                'macro' => ''
+                'line_nr' => 128
               }
             },
             {
@@ -3352,8 +3225,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 129,
-                'macro' => ''
+                'line_nr' => 129
               }
             },
             {
@@ -3378,8 +3250,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 130,
-                'macro' => ''
+                'line_nr' => 130
               }
             },
             {
@@ -3404,8 +3275,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 131,
-                'macro' => ''
+                'line_nr' => 131
               }
             },
             {
@@ -3430,8 +3300,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 132,
-                'macro' => ''
+                'line_nr' => 132
               }
             },
             {
@@ -3456,8 +3325,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 133,
-                'macro' => ''
+                'line_nr' => 133
               }
             },
             {
@@ -3482,8 +3350,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 134,
-                'macro' => ''
+                'line_nr' => 134
               }
             },
             {
@@ -3508,8 +3375,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 135,
-                'macro' => ''
+                'line_nr' => 135
               }
             },
             {
@@ -3534,8 +3400,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 136,
-                'macro' => ''
+                'line_nr' => 136
               }
             },
             {
@@ -3560,8 +3425,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 137,
-                'macro' => ''
+                'line_nr' => 137
               }
             },
             {
@@ -3586,8 +3450,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 138,
-                'macro' => ''
+                'line_nr' => 138
               }
             },
             {
@@ -3612,8 +3475,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 139,
-                'macro' => ''
+                'line_nr' => 139
               }
             },
             {
@@ -3638,8 +3500,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 140,
-                'macro' => ''
+                'line_nr' => 140
               }
             },
             {
@@ -3664,8 +3525,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 141,
-                'macro' => ''
+                'line_nr' => 141
               }
             },
             {
@@ -3690,8 +3550,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 142,
-                'macro' => ''
+                'line_nr' => 142
               }
             },
             {
@@ -3716,8 +3575,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 143,
-                'macro' => ''
+                'line_nr' => 143
               }
             },
             {
@@ -3742,8 +3600,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 144,
-                'macro' => ''
+                'line_nr' => 144
               }
             },
             {
@@ -3768,8 +3625,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 145,
-                'macro' => ''
+                'line_nr' => 145
               }
             },
             {
@@ -3794,8 +3650,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 146,
-                'macro' => ''
+                'line_nr' => 146
               }
             },
             {
@@ -3820,8 +3675,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 147,
-                'macro' => ''
+                'line_nr' => 147
               }
             },
             {
@@ -3846,8 +3700,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 148,
-                'macro' => ''
+                'line_nr' => 148
               }
             },
             {
@@ -3872,8 +3725,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 149,
-                'macro' => ''
+                'line_nr' => 149
               }
             },
             {
@@ -3898,8 +3750,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 150,
-                'macro' => ''
+                'line_nr' => 150
               }
             },
             {
@@ -3924,8 +3775,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 151,
-                'macro' => ''
+                'line_nr' => 151
               }
             },
             {
@@ -3950,8 +3800,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 152,
-                'macro' => ''
+                'line_nr' => 152
               }
             },
             {
@@ -3976,8 +3825,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 153,
-                'macro' => ''
+                'line_nr' => 153
               }
             },
             {
@@ -4002,8 +3850,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 154,
-                'macro' => ''
+                'line_nr' => 154
               }
             },
             {
@@ -4028,8 +3875,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 155,
-                'macro' => ''
+                'line_nr' => 155
               }
             },
             {
@@ -4054,8 +3900,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 156,
-                'macro' => ''
+                'line_nr' => 156
               }
             },
             {
@@ -4080,8 +3925,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 157,
-                'macro' => ''
+                'line_nr' => 157
               }
             },
             {
@@ -4106,8 +3950,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 158,
-                'macro' => ''
+                'line_nr' => 158
               }
             },
             {
@@ -4132,8 +3975,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 159,
-                'macro' => ''
+                'line_nr' => 159
               }
             },
             {
@@ -4158,8 +4000,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 160,
-                'macro' => ''
+                'line_nr' => 160
               }
             },
             {
@@ -4184,8 +4025,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 161,
-                'macro' => ''
+                'line_nr' => 161
               }
             },
             {
@@ -4210,8 +4050,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 162,
-                'macro' => ''
+                'line_nr' => 162
               }
             },
             {
@@ -4236,8 +4075,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 163,
-                'macro' => ''
+                'line_nr' => 163
               }
             },
             {
@@ -4262,8 +4100,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 164,
-                'macro' => ''
+                'line_nr' => 164
               }
             },
             {
@@ -4288,8 +4125,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 165,
-                'macro' => ''
+                'line_nr' => 165
               }
             },
             {
@@ -4314,8 +4150,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 166,
-                'macro' => ''
+                'line_nr' => 166
               }
             },
             {
@@ -4340,8 +4175,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 167,
-                'macro' => ''
+                'line_nr' => 167
               }
             },
             {
@@ -4366,8 +4200,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 168,
-                'macro' => ''
+                'line_nr' => 168
               }
             },
             {
@@ -4392,8 +4225,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 169,
-                'macro' => ''
+                'line_nr' => 169
               }
             },
             {
@@ -4418,8 +4250,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 170,
-                'macro' => ''
+                'line_nr' => 170
               }
             },
             {
@@ -4444,8 +4275,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 171,
-                'macro' => ''
+                'line_nr' => 171
               }
             },
             {
@@ -4470,8 +4300,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 172,
-                'macro' => ''
+                'line_nr' => 172
               }
             },
             {
@@ -4496,8 +4325,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 173,
-                'macro' => ''
+                'line_nr' => 173
               }
             },
             {
@@ -4522,8 +4350,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 174,
-                'macro' => ''
+                'line_nr' => 174
               }
             },
             {
@@ -4548,8 +4375,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 175,
-                'macro' => ''
+                'line_nr' => 175
               }
             },
             {
@@ -4574,8 +4400,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 176,
-                'macro' => ''
+                'line_nr' => 176
               }
             },
             {
@@ -4600,8 +4425,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 177,
-                'macro' => ''
+                'line_nr' => 177
               }
             },
             {
@@ -4626,8 +4450,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 178,
-                'macro' => ''
+                'line_nr' => 178
               }
             },
             {
@@ -4652,8 +4475,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 179,
-                'macro' => ''
+                'line_nr' => 179
               }
             },
             {
@@ -4678,8 +4500,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 180,
-                'macro' => ''
+                'line_nr' => 180
               }
             },
             {
@@ -4704,8 +4525,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 181,
-                'macro' => ''
+                'line_nr' => 181
               }
             },
             {
@@ -4730,8 +4550,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 182,
-                'macro' => ''
+                'line_nr' => 182
               }
             },
             {
@@ -4756,8 +4575,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 183,
-                'macro' => ''
+                'line_nr' => 183
               }
             },
             {
@@ -4782,8 +4600,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 184,
-                'macro' => ''
+                'line_nr' => 184
               }
             },
             {
@@ -4808,8 +4625,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 185,
-                'macro' => ''
+                'line_nr' => 185
               }
             },
             {
@@ -4834,8 +4650,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 186,
-                'macro' => ''
+                'line_nr' => 186
               }
             },
             {
@@ -4860,8 +4675,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 187,
-                'macro' => ''
+                'line_nr' => 187
               }
             },
             {
@@ -4886,8 +4700,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 188,
-                'macro' => ''
+                'line_nr' => 188
               }
             },
             {
@@ -4912,8 +4725,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 189,
-                'macro' => ''
+                'line_nr' => 189
               }
             },
             {
@@ -4938,8 +4750,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 190,
-                'macro' => ''
+                'line_nr' => 190
               }
             },
             {
@@ -4964,8 +4775,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 191,
-                'macro' => ''
+                'line_nr' => 191
               }
             },
             {
@@ -4990,8 +4800,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 192,
-                'macro' => ''
+                'line_nr' => 192
               }
             },
             {
@@ -5016,8 +4825,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 193,
-                'macro' => ''
+                'line_nr' => 193
               }
             },
             {
@@ -5042,8 +4850,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 194,
-                'macro' => ''
+                'line_nr' => 194
               }
             },
             {
@@ -5068,8 +4875,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 195,
-                'macro' => ''
+                'line_nr' => 195
               }
             },
             {
@@ -5094,8 +4900,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 196,
-                'macro' => ''
+                'line_nr' => 196
               }
             },
             {
@@ -5120,8 +4925,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 197,
-                'macro' => ''
+                'line_nr' => 197
               }
             },
             {
@@ -5146,8 +4950,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 198,
-                'macro' => ''
+                'line_nr' => 198
               }
             },
             {
@@ -5172,8 +4975,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 199,
-                'macro' => ''
+                'line_nr' => 199
               }
             },
             {
@@ -5198,8 +5000,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 200,
-                'macro' => ''
+                'line_nr' => 200
               }
             },
             {
@@ -5224,8 +5025,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 201,
-                'macro' => ''
+                'line_nr' => 201
               }
             },
             {
@@ -5250,8 +5050,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 202,
-                'macro' => ''
+                'line_nr' => 202
               }
             },
             {
@@ -5276,8 +5075,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 203,
-                'macro' => ''
+                'line_nr' => 203
               }
             },
             {
@@ -5302,8 +5100,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 204,
-                'macro' => ''
+                'line_nr' => 204
               }
             },
             {
@@ -5328,8 +5125,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 205,
-                'macro' => ''
+                'line_nr' => 205
               }
             },
             {
@@ -5354,8 +5150,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 206,
-                'macro' => ''
+                'line_nr' => 206
               }
             },
             {
@@ -5380,8 +5175,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 207,
-                'macro' => ''
+                'line_nr' => 207
               }
             },
             {
@@ -5412,8 +5206,7 @@ $result_trees{'enumerate_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 208,
-                'macro' => ''
+                'line_nr' => 208
               }
             }
           ],
@@ -5427,8 +5220,7 @@ $result_trees{'enumerate_letters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/itemize/enumerate_more_letters.pl 
b/tp/t/results/itemize/enumerate_more_letters.pl
index b0dfddc1ab..2c65c4c4fe 100644
--- a/tp/t/results/itemize/enumerate_more_letters.pl
+++ b/tp/t/results/itemize/enumerate_more_letters.pl
@@ -50,8 +50,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -76,8 +75,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -102,8 +100,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -128,8 +125,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -154,8 +150,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -180,8 +175,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -206,8 +200,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -232,8 +225,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -258,8 +250,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -284,8 +275,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -310,8 +300,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -336,8 +325,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -362,8 +350,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -388,8 +375,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -414,8 +400,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -440,8 +425,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -466,8 +450,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -492,8 +475,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -518,8 +500,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -544,8 +525,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -570,8 +550,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -596,8 +575,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -622,8 +600,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -648,8 +625,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               }
             },
             {
@@ -674,8 +650,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             },
             {
@@ -700,8 +675,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             },
             {
@@ -726,8 +700,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             },
             {
@@ -752,8 +725,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             },
             {
@@ -778,8 +750,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -804,8 +775,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               }
             },
             {
@@ -830,8 +800,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               }
             },
             {
@@ -856,8 +825,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               }
             },
             {
@@ -882,8 +850,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             },
             {
@@ -908,8 +875,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             },
             {
@@ -934,8 +900,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               }
             },
             {
@@ -960,8 +925,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 37,
-                'macro' => ''
+                'line_nr' => 37
               }
             },
             {
@@ -986,8 +950,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               }
             },
             {
@@ -1012,8 +975,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 39,
-                'macro' => ''
+                'line_nr' => 39
               }
             },
             {
@@ -1038,8 +1000,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               }
             },
             {
@@ -1064,8 +1025,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 41,
-                'macro' => ''
+                'line_nr' => 41
               }
             },
             {
@@ -1090,8 +1050,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               }
             },
             {
@@ -1116,8 +1075,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               }
             },
             {
@@ -1142,8 +1100,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             },
             {
@@ -1168,8 +1125,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 45,
-                'macro' => ''
+                'line_nr' => 45
               }
             },
             {
@@ -1194,8 +1150,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             },
             {
@@ -1220,8 +1175,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               }
             },
             {
@@ -1246,8 +1200,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               }
             },
             {
@@ -1272,8 +1225,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             },
             {
@@ -1298,8 +1250,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             },
             {
@@ -1324,8 +1275,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 51,
-                'macro' => ''
+                'line_nr' => 51
               }
             },
             {
@@ -1350,8 +1300,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               }
             },
             {
@@ -1376,8 +1325,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               }
             },
             {
@@ -1402,8 +1350,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 54,
-                'macro' => ''
+                'line_nr' => 54
               }
             },
             {
@@ -1428,8 +1375,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 55,
-                'macro' => ''
+                'line_nr' => 55
               }
             },
             {
@@ -1454,8 +1400,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -1480,8 +1425,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 57,
-                'macro' => ''
+                'line_nr' => 57
               }
             },
             {
@@ -1506,8 +1450,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             },
             {
@@ -1532,8 +1475,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             },
             {
@@ -1558,8 +1500,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 60,
-                'macro' => ''
+                'line_nr' => 60
               }
             },
             {
@@ -1584,8 +1525,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -1610,8 +1550,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -1636,8 +1575,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 63,
-                'macro' => ''
+                'line_nr' => 63
               }
             },
             {
@@ -1662,8 +1600,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             },
             {
@@ -1688,8 +1625,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             },
             {
@@ -1714,8 +1650,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 66,
-                'macro' => ''
+                'line_nr' => 66
               }
             },
             {
@@ -1740,8 +1675,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 67,
-                'macro' => ''
+                'line_nr' => 67
               }
             },
             {
@@ -1766,8 +1700,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 68,
-                'macro' => ''
+                'line_nr' => 68
               }
             },
             {
@@ -1792,8 +1725,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 69,
-                'macro' => ''
+                'line_nr' => 69
               }
             },
             {
@@ -1818,8 +1750,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 70,
-                'macro' => ''
+                'line_nr' => 70
               }
             },
             {
@@ -1844,8 +1775,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             },
             {
@@ -1870,8 +1800,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 72,
-                'macro' => ''
+                'line_nr' => 72
               }
             },
             {
@@ -1896,8 +1825,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 73,
-                'macro' => ''
+                'line_nr' => 73
               }
             },
             {
@@ -1922,8 +1850,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 74,
-                'macro' => ''
+                'line_nr' => 74
               }
             },
             {
@@ -1948,8 +1875,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 75,
-                'macro' => ''
+                'line_nr' => 75
               }
             },
             {
@@ -1974,8 +1900,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 76,
-                'macro' => ''
+                'line_nr' => 76
               }
             },
             {
@@ -2000,8 +1925,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 77,
-                'macro' => ''
+                'line_nr' => 77
               }
             },
             {
@@ -2026,8 +1950,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 78,
-                'macro' => ''
+                'line_nr' => 78
               }
             },
             {
@@ -2052,8 +1975,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 79,
-                'macro' => ''
+                'line_nr' => 79
               }
             },
             {
@@ -2078,8 +2000,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 80,
-                'macro' => ''
+                'line_nr' => 80
               }
             },
             {
@@ -2104,8 +2025,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 81,
-                'macro' => ''
+                'line_nr' => 81
               }
             },
             {
@@ -2130,8 +2050,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 82,
-                'macro' => ''
+                'line_nr' => 82
               }
             },
             {
@@ -2156,8 +2075,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 83,
-                'macro' => ''
+                'line_nr' => 83
               }
             },
             {
@@ -2182,8 +2100,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 84,
-                'macro' => ''
+                'line_nr' => 84
               }
             },
             {
@@ -2208,8 +2125,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 85,
-                'macro' => ''
+                'line_nr' => 85
               }
             },
             {
@@ -2234,8 +2150,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 86,
-                'macro' => ''
+                'line_nr' => 86
               }
             },
             {
@@ -2260,8 +2175,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 87,
-                'macro' => ''
+                'line_nr' => 87
               }
             },
             {
@@ -2286,8 +2200,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 88,
-                'macro' => ''
+                'line_nr' => 88
               }
             },
             {
@@ -2312,8 +2225,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 89,
-                'macro' => ''
+                'line_nr' => 89
               }
             },
             {
@@ -2338,8 +2250,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 90,
-                'macro' => ''
+                'line_nr' => 90
               }
             },
             {
@@ -2364,8 +2275,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 91,
-                'macro' => ''
+                'line_nr' => 91
               }
             },
             {
@@ -2390,8 +2300,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 92,
-                'macro' => ''
+                'line_nr' => 92
               }
             },
             {
@@ -2416,8 +2325,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 93,
-                'macro' => ''
+                'line_nr' => 93
               }
             },
             {
@@ -2442,8 +2350,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 94,
-                'macro' => ''
+                'line_nr' => 94
               }
             },
             {
@@ -2468,8 +2375,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 95,
-                'macro' => ''
+                'line_nr' => 95
               }
             },
             {
@@ -2494,8 +2400,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 96,
-                'macro' => ''
+                'line_nr' => 96
               }
             },
             {
@@ -2520,8 +2425,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 97,
-                'macro' => ''
+                'line_nr' => 97
               }
             },
             {
@@ -2546,8 +2450,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 98,
-                'macro' => ''
+                'line_nr' => 98
               }
             },
             {
@@ -2572,8 +2475,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 99,
-                'macro' => ''
+                'line_nr' => 99
               }
             },
             {
@@ -2598,8 +2500,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 100,
-                'macro' => ''
+                'line_nr' => 100
               }
             },
             {
@@ -2624,8 +2525,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 101,
-                'macro' => ''
+                'line_nr' => 101
               }
             },
             {
@@ -2650,8 +2550,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 102,
-                'macro' => ''
+                'line_nr' => 102
               }
             },
             {
@@ -2676,8 +2575,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 103,
-                'macro' => ''
+                'line_nr' => 103
               }
             },
             {
@@ -2702,8 +2600,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 104,
-                'macro' => ''
+                'line_nr' => 104
               }
             },
             {
@@ -2728,8 +2625,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 105,
-                'macro' => ''
+                'line_nr' => 105
               }
             },
             {
@@ -2754,8 +2650,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 106,
-                'macro' => ''
+                'line_nr' => 106
               }
             },
             {
@@ -2780,8 +2675,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 107,
-                'macro' => ''
+                'line_nr' => 107
               }
             },
             {
@@ -2806,8 +2700,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 108,
-                'macro' => ''
+                'line_nr' => 108
               }
             },
             {
@@ -2832,8 +2725,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 109,
-                'macro' => ''
+                'line_nr' => 109
               }
             },
             {
@@ -2858,8 +2750,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 110,
-                'macro' => ''
+                'line_nr' => 110
               }
             },
             {
@@ -2884,8 +2775,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 111,
-                'macro' => ''
+                'line_nr' => 111
               }
             },
             {
@@ -2910,8 +2800,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 112,
-                'macro' => ''
+                'line_nr' => 112
               }
             },
             {
@@ -2936,8 +2825,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 113,
-                'macro' => ''
+                'line_nr' => 113
               }
             },
             {
@@ -2962,8 +2850,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 114,
-                'macro' => ''
+                'line_nr' => 114
               }
             },
             {
@@ -2988,8 +2875,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 115,
-                'macro' => ''
+                'line_nr' => 115
               }
             },
             {
@@ -3014,8 +2900,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 116,
-                'macro' => ''
+                'line_nr' => 116
               }
             },
             {
@@ -3040,8 +2925,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 117,
-                'macro' => ''
+                'line_nr' => 117
               }
             },
             {
@@ -3066,8 +2950,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 118,
-                'macro' => ''
+                'line_nr' => 118
               }
             },
             {
@@ -3092,8 +2975,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 119,
-                'macro' => ''
+                'line_nr' => 119
               }
             },
             {
@@ -3118,8 +3000,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 120,
-                'macro' => ''
+                'line_nr' => 120
               }
             },
             {
@@ -3144,8 +3025,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 121,
-                'macro' => ''
+                'line_nr' => 121
               }
             },
             {
@@ -3170,8 +3050,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 122,
-                'macro' => ''
+                'line_nr' => 122
               }
             },
             {
@@ -3196,8 +3075,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 123,
-                'macro' => ''
+                'line_nr' => 123
               }
             },
             {
@@ -3222,8 +3100,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 124,
-                'macro' => ''
+                'line_nr' => 124
               }
             },
             {
@@ -3248,8 +3125,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 125,
-                'macro' => ''
+                'line_nr' => 125
               }
             },
             {
@@ -3274,8 +3150,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 126,
-                'macro' => ''
+                'line_nr' => 126
               }
             },
             {
@@ -3300,8 +3175,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 127,
-                'macro' => ''
+                'line_nr' => 127
               }
             },
             {
@@ -3326,8 +3200,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 128,
-                'macro' => ''
+                'line_nr' => 128
               }
             },
             {
@@ -3352,8 +3225,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 129,
-                'macro' => ''
+                'line_nr' => 129
               }
             },
             {
@@ -3378,8 +3250,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 130,
-                'macro' => ''
+                'line_nr' => 130
               }
             },
             {
@@ -3404,8 +3275,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 131,
-                'macro' => ''
+                'line_nr' => 131
               }
             },
             {
@@ -3430,8 +3300,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 132,
-                'macro' => ''
+                'line_nr' => 132
               }
             },
             {
@@ -3456,8 +3325,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 133,
-                'macro' => ''
+                'line_nr' => 133
               }
             },
             {
@@ -3482,8 +3350,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 134,
-                'macro' => ''
+                'line_nr' => 134
               }
             },
             {
@@ -3508,8 +3375,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 135,
-                'macro' => ''
+                'line_nr' => 135
               }
             },
             {
@@ -3534,8 +3400,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 136,
-                'macro' => ''
+                'line_nr' => 136
               }
             },
             {
@@ -3560,8 +3425,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 137,
-                'macro' => ''
+                'line_nr' => 137
               }
             },
             {
@@ -3586,8 +3450,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 138,
-                'macro' => ''
+                'line_nr' => 138
               }
             },
             {
@@ -3612,8 +3475,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 139,
-                'macro' => ''
+                'line_nr' => 139
               }
             },
             {
@@ -3638,8 +3500,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 140,
-                'macro' => ''
+                'line_nr' => 140
               }
             },
             {
@@ -3664,8 +3525,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 141,
-                'macro' => ''
+                'line_nr' => 141
               }
             },
             {
@@ -3690,8 +3550,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 142,
-                'macro' => ''
+                'line_nr' => 142
               }
             },
             {
@@ -3716,8 +3575,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 143,
-                'macro' => ''
+                'line_nr' => 143
               }
             },
             {
@@ -3742,8 +3600,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 144,
-                'macro' => ''
+                'line_nr' => 144
               }
             },
             {
@@ -3768,8 +3625,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 145,
-                'macro' => ''
+                'line_nr' => 145
               }
             },
             {
@@ -3794,8 +3650,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 146,
-                'macro' => ''
+                'line_nr' => 146
               }
             },
             {
@@ -3820,8 +3675,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 147,
-                'macro' => ''
+                'line_nr' => 147
               }
             },
             {
@@ -3846,8 +3700,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 148,
-                'macro' => ''
+                'line_nr' => 148
               }
             },
             {
@@ -3872,8 +3725,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 149,
-                'macro' => ''
+                'line_nr' => 149
               }
             },
             {
@@ -3898,8 +3750,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 150,
-                'macro' => ''
+                'line_nr' => 150
               }
             },
             {
@@ -3924,8 +3775,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 151,
-                'macro' => ''
+                'line_nr' => 151
               }
             },
             {
@@ -3950,8 +3800,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 152,
-                'macro' => ''
+                'line_nr' => 152
               }
             },
             {
@@ -3976,8 +3825,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 153,
-                'macro' => ''
+                'line_nr' => 153
               }
             },
             {
@@ -4002,8 +3850,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 154,
-                'macro' => ''
+                'line_nr' => 154
               }
             },
             {
@@ -4028,8 +3875,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 155,
-                'macro' => ''
+                'line_nr' => 155
               }
             },
             {
@@ -4054,8 +3900,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 156,
-                'macro' => ''
+                'line_nr' => 156
               }
             },
             {
@@ -4080,8 +3925,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 157,
-                'macro' => ''
+                'line_nr' => 157
               }
             },
             {
@@ -4106,8 +3950,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 158,
-                'macro' => ''
+                'line_nr' => 158
               }
             },
             {
@@ -4132,8 +3975,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 159,
-                'macro' => ''
+                'line_nr' => 159
               }
             },
             {
@@ -4158,8 +4000,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 160,
-                'macro' => ''
+                'line_nr' => 160
               }
             },
             {
@@ -4184,8 +4025,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 161,
-                'macro' => ''
+                'line_nr' => 161
               }
             },
             {
@@ -4210,8 +4050,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 162,
-                'macro' => ''
+                'line_nr' => 162
               }
             },
             {
@@ -4236,8 +4075,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 163,
-                'macro' => ''
+                'line_nr' => 163
               }
             },
             {
@@ -4262,8 +4100,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 164,
-                'macro' => ''
+                'line_nr' => 164
               }
             },
             {
@@ -4288,8 +4125,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 165,
-                'macro' => ''
+                'line_nr' => 165
               }
             },
             {
@@ -4314,8 +4150,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 166,
-                'macro' => ''
+                'line_nr' => 166
               }
             },
             {
@@ -4340,8 +4175,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 167,
-                'macro' => ''
+                'line_nr' => 167
               }
             },
             {
@@ -4366,8 +4200,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 168,
-                'macro' => ''
+                'line_nr' => 168
               }
             },
             {
@@ -4392,8 +4225,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 169,
-                'macro' => ''
+                'line_nr' => 169
               }
             },
             {
@@ -4418,8 +4250,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 170,
-                'macro' => ''
+                'line_nr' => 170
               }
             },
             {
@@ -4444,8 +4275,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 171,
-                'macro' => ''
+                'line_nr' => 171
               }
             },
             {
@@ -4470,8 +4300,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 172,
-                'macro' => ''
+                'line_nr' => 172
               }
             },
             {
@@ -4496,8 +4325,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 173,
-                'macro' => ''
+                'line_nr' => 173
               }
             },
             {
@@ -4522,8 +4350,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 174,
-                'macro' => ''
+                'line_nr' => 174
               }
             },
             {
@@ -4548,8 +4375,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 175,
-                'macro' => ''
+                'line_nr' => 175
               }
             },
             {
@@ -4574,8 +4400,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 176,
-                'macro' => ''
+                'line_nr' => 176
               }
             },
             {
@@ -4600,8 +4425,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 177,
-                'macro' => ''
+                'line_nr' => 177
               }
             },
             {
@@ -4626,8 +4450,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 178,
-                'macro' => ''
+                'line_nr' => 178
               }
             },
             {
@@ -4652,8 +4475,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 179,
-                'macro' => ''
+                'line_nr' => 179
               }
             },
             {
@@ -4678,8 +4500,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 180,
-                'macro' => ''
+                'line_nr' => 180
               }
             },
             {
@@ -4704,8 +4525,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 181,
-                'macro' => ''
+                'line_nr' => 181
               }
             },
             {
@@ -4730,8 +4550,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 182,
-                'macro' => ''
+                'line_nr' => 182
               }
             },
             {
@@ -4756,8 +4575,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 183,
-                'macro' => ''
+                'line_nr' => 183
               }
             },
             {
@@ -4782,8 +4600,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 184,
-                'macro' => ''
+                'line_nr' => 184
               }
             },
             {
@@ -4808,8 +4625,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 185,
-                'macro' => ''
+                'line_nr' => 185
               }
             },
             {
@@ -4834,8 +4650,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 186,
-                'macro' => ''
+                'line_nr' => 186
               }
             },
             {
@@ -4860,8 +4675,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 187,
-                'macro' => ''
+                'line_nr' => 187
               }
             },
             {
@@ -4886,8 +4700,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 188,
-                'macro' => ''
+                'line_nr' => 188
               }
             },
             {
@@ -4912,8 +4725,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 189,
-                'macro' => ''
+                'line_nr' => 189
               }
             },
             {
@@ -4938,8 +4750,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 190,
-                'macro' => ''
+                'line_nr' => 190
               }
             },
             {
@@ -4964,8 +4775,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 191,
-                'macro' => ''
+                'line_nr' => 191
               }
             },
             {
@@ -4990,8 +4800,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 192,
-                'macro' => ''
+                'line_nr' => 192
               }
             },
             {
@@ -5016,8 +4825,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 193,
-                'macro' => ''
+                'line_nr' => 193
               }
             },
             {
@@ -5042,8 +4850,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 194,
-                'macro' => ''
+                'line_nr' => 194
               }
             },
             {
@@ -5068,8 +4875,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 195,
-                'macro' => ''
+                'line_nr' => 195
               }
             },
             {
@@ -5094,8 +4900,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 196,
-                'macro' => ''
+                'line_nr' => 196
               }
             },
             {
@@ -5120,8 +4925,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 197,
-                'macro' => ''
+                'line_nr' => 197
               }
             },
             {
@@ -5146,8 +4950,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 198,
-                'macro' => ''
+                'line_nr' => 198
               }
             },
             {
@@ -5172,8 +4975,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 199,
-                'macro' => ''
+                'line_nr' => 199
               }
             },
             {
@@ -5198,8 +5000,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 200,
-                'macro' => ''
+                'line_nr' => 200
               }
             },
             {
@@ -5224,8 +5025,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 201,
-                'macro' => ''
+                'line_nr' => 201
               }
             },
             {
@@ -5250,8 +5050,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 202,
-                'macro' => ''
+                'line_nr' => 202
               }
             },
             {
@@ -5276,8 +5075,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 203,
-                'macro' => ''
+                'line_nr' => 203
               }
             },
             {
@@ -5302,8 +5100,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 204,
-                'macro' => ''
+                'line_nr' => 204
               }
             },
             {
@@ -5328,8 +5125,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 205,
-                'macro' => ''
+                'line_nr' => 205
               }
             },
             {
@@ -5354,8 +5150,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 206,
-                'macro' => ''
+                'line_nr' => 206
               }
             },
             {
@@ -5380,8 +5175,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 207,
-                'macro' => ''
+                'line_nr' => 207
               }
             },
             {
@@ -5406,8 +5200,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 208,
-                'macro' => ''
+                'line_nr' => 208
               }
             },
             {
@@ -5432,8 +5225,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 209,
-                'macro' => ''
+                'line_nr' => 209
               }
             },
             {
@@ -5458,8 +5250,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 210,
-                'macro' => ''
+                'line_nr' => 210
               }
             },
             {
@@ -5484,8 +5275,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 211,
-                'macro' => ''
+                'line_nr' => 211
               }
             },
             {
@@ -5510,8 +5300,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 212,
-                'macro' => ''
+                'line_nr' => 212
               }
             },
             {
@@ -5536,8 +5325,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 213,
-                'macro' => ''
+                'line_nr' => 213
               }
             },
             {
@@ -5562,8 +5350,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 214,
-                'macro' => ''
+                'line_nr' => 214
               }
             },
             {
@@ -5588,8 +5375,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 215,
-                'macro' => ''
+                'line_nr' => 215
               }
             },
             {
@@ -5614,8 +5400,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 216,
-                'macro' => ''
+                'line_nr' => 216
               }
             },
             {
@@ -5640,8 +5425,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 217,
-                'macro' => ''
+                'line_nr' => 217
               }
             },
             {
@@ -5666,8 +5450,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 218,
-                'macro' => ''
+                'line_nr' => 218
               }
             },
             {
@@ -5692,8 +5475,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 219,
-                'macro' => ''
+                'line_nr' => 219
               }
             },
             {
@@ -5718,8 +5500,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 220,
-                'macro' => ''
+                'line_nr' => 220
               }
             },
             {
@@ -5744,8 +5525,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 221,
-                'macro' => ''
+                'line_nr' => 221
               }
             },
             {
@@ -5770,8 +5550,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 222,
-                'macro' => ''
+                'line_nr' => 222
               }
             },
             {
@@ -5796,8 +5575,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 223,
-                'macro' => ''
+                'line_nr' => 223
               }
             },
             {
@@ -5822,8 +5600,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 224,
-                'macro' => ''
+                'line_nr' => 224
               }
             },
             {
@@ -5848,8 +5625,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 225,
-                'macro' => ''
+                'line_nr' => 225
               }
             },
             {
@@ -5874,8 +5650,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 226,
-                'macro' => ''
+                'line_nr' => 226
               }
             },
             {
@@ -5900,8 +5675,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 227,
-                'macro' => ''
+                'line_nr' => 227
               }
             },
             {
@@ -5926,8 +5700,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 228,
-                'macro' => ''
+                'line_nr' => 228
               }
             },
             {
@@ -5952,8 +5725,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 229,
-                'macro' => ''
+                'line_nr' => 229
               }
             },
             {
@@ -5978,8 +5750,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 230,
-                'macro' => ''
+                'line_nr' => 230
               }
             },
             {
@@ -6004,8 +5775,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 231,
-                'macro' => ''
+                'line_nr' => 231
               }
             },
             {
@@ -6030,8 +5800,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 232,
-                'macro' => ''
+                'line_nr' => 232
               }
             },
             {
@@ -6056,8 +5825,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 233,
-                'macro' => ''
+                'line_nr' => 233
               }
             },
             {
@@ -6082,8 +5850,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 234,
-                'macro' => ''
+                'line_nr' => 234
               }
             },
             {
@@ -6108,8 +5875,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 235,
-                'macro' => ''
+                'line_nr' => 235
               }
             },
             {
@@ -6134,8 +5900,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 236,
-                'macro' => ''
+                'line_nr' => 236
               }
             },
             {
@@ -6160,8 +5925,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 237,
-                'macro' => ''
+                'line_nr' => 237
               }
             },
             {
@@ -6186,8 +5950,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 238,
-                'macro' => ''
+                'line_nr' => 238
               }
             },
             {
@@ -6212,8 +5975,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 239,
-                'macro' => ''
+                'line_nr' => 239
               }
             },
             {
@@ -6238,8 +6000,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 240,
-                'macro' => ''
+                'line_nr' => 240
               }
             },
             {
@@ -6264,8 +6025,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 241,
-                'macro' => ''
+                'line_nr' => 241
               }
             },
             {
@@ -6290,8 +6050,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 242,
-                'macro' => ''
+                'line_nr' => 242
               }
             },
             {
@@ -6316,8 +6075,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 243,
-                'macro' => ''
+                'line_nr' => 243
               }
             },
             {
@@ -6342,8 +6100,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 244,
-                'macro' => ''
+                'line_nr' => 244
               }
             },
             {
@@ -6368,8 +6125,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 245,
-                'macro' => ''
+                'line_nr' => 245
               }
             },
             {
@@ -6394,8 +6150,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 246,
-                'macro' => ''
+                'line_nr' => 246
               }
             },
             {
@@ -6420,8 +6175,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 247,
-                'macro' => ''
+                'line_nr' => 247
               }
             },
             {
@@ -6446,8 +6200,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 248,
-                'macro' => ''
+                'line_nr' => 248
               }
             },
             {
@@ -6472,8 +6225,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 249,
-                'macro' => ''
+                'line_nr' => 249
               }
             },
             {
@@ -6498,8 +6250,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 250,
-                'macro' => ''
+                'line_nr' => 250
               }
             },
             {
@@ -6524,8 +6275,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 251,
-                'macro' => ''
+                'line_nr' => 251
               }
             },
             {
@@ -6550,8 +6300,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 252,
-                'macro' => ''
+                'line_nr' => 252
               }
             },
             {
@@ -6576,8 +6325,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 253,
-                'macro' => ''
+                'line_nr' => 253
               }
             },
             {
@@ -6602,8 +6350,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 254,
-                'macro' => ''
+                'line_nr' => 254
               }
             },
             {
@@ -6628,8 +6375,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 255,
-                'macro' => ''
+                'line_nr' => 255
               }
             },
             {
@@ -6654,8 +6400,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 256,
-                'macro' => ''
+                'line_nr' => 256
               }
             },
             {
@@ -6680,8 +6425,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 257,
-                'macro' => ''
+                'line_nr' => 257
               }
             },
             {
@@ -6706,8 +6450,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 258,
-                'macro' => ''
+                'line_nr' => 258
               }
             },
             {
@@ -6732,8 +6475,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 259,
-                'macro' => ''
+                'line_nr' => 259
               }
             },
             {
@@ -6758,8 +6500,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 260,
-                'macro' => ''
+                'line_nr' => 260
               }
             },
             {
@@ -6784,8 +6525,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 261,
-                'macro' => ''
+                'line_nr' => 261
               }
             },
             {
@@ -6810,8 +6550,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 262,
-                'macro' => ''
+                'line_nr' => 262
               }
             },
             {
@@ -6836,8 +6575,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 263,
-                'macro' => ''
+                'line_nr' => 263
               }
             },
             {
@@ -6862,8 +6600,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 264,
-                'macro' => ''
+                'line_nr' => 264
               }
             },
             {
@@ -6888,8 +6625,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 265,
-                'macro' => ''
+                'line_nr' => 265
               }
             },
             {
@@ -6914,8 +6650,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 266,
-                'macro' => ''
+                'line_nr' => 266
               }
             },
             {
@@ -6940,8 +6675,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 267,
-                'macro' => ''
+                'line_nr' => 267
               }
             },
             {
@@ -6966,8 +6700,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 268,
-                'macro' => ''
+                'line_nr' => 268
               }
             },
             {
@@ -6992,8 +6725,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 269,
-                'macro' => ''
+                'line_nr' => 269
               }
             },
             {
@@ -7018,8 +6750,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 270,
-                'macro' => ''
+                'line_nr' => 270
               }
             },
             {
@@ -7044,8 +6775,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 271,
-                'macro' => ''
+                'line_nr' => 271
               }
             },
             {
@@ -7070,8 +6800,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 272,
-                'macro' => ''
+                'line_nr' => 272
               }
             },
             {
@@ -7096,8 +6825,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 273,
-                'macro' => ''
+                'line_nr' => 273
               }
             },
             {
@@ -7122,8 +6850,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 274,
-                'macro' => ''
+                'line_nr' => 274
               }
             },
             {
@@ -7148,8 +6875,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 275,
-                'macro' => ''
+                'line_nr' => 275
               }
             },
             {
@@ -7174,8 +6900,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 276,
-                'macro' => ''
+                'line_nr' => 276
               }
             },
             {
@@ -7200,8 +6925,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 277,
-                'macro' => ''
+                'line_nr' => 277
               }
             },
             {
@@ -7226,8 +6950,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 278,
-                'macro' => ''
+                'line_nr' => 278
               }
             },
             {
@@ -7252,8 +6975,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 279,
-                'macro' => ''
+                'line_nr' => 279
               }
             },
             {
@@ -7278,8 +7000,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 280,
-                'macro' => ''
+                'line_nr' => 280
               }
             },
             {
@@ -7304,8 +7025,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 281,
-                'macro' => ''
+                'line_nr' => 281
               }
             },
             {
@@ -7330,8 +7050,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 282,
-                'macro' => ''
+                'line_nr' => 282
               }
             },
             {
@@ -7356,8 +7075,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 283,
-                'macro' => ''
+                'line_nr' => 283
               }
             },
             {
@@ -7382,8 +7100,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 284,
-                'macro' => ''
+                'line_nr' => 284
               }
             },
             {
@@ -7408,8 +7125,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 285,
-                'macro' => ''
+                'line_nr' => 285
               }
             },
             {
@@ -7434,8 +7150,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 286,
-                'macro' => ''
+                'line_nr' => 286
               }
             },
             {
@@ -7460,8 +7175,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 287,
-                'macro' => ''
+                'line_nr' => 287
               }
             },
             {
@@ -7486,8 +7200,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 288,
-                'macro' => ''
+                'line_nr' => 288
               }
             },
             {
@@ -7512,8 +7225,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 289,
-                'macro' => ''
+                'line_nr' => 289
               }
             },
             {
@@ -7538,8 +7250,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 290,
-                'macro' => ''
+                'line_nr' => 290
               }
             },
             {
@@ -7564,8 +7275,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 291,
-                'macro' => ''
+                'line_nr' => 291
               }
             },
             {
@@ -7590,8 +7300,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 292,
-                'macro' => ''
+                'line_nr' => 292
               }
             },
             {
@@ -7616,8 +7325,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 293,
-                'macro' => ''
+                'line_nr' => 293
               }
             },
             {
@@ -7642,8 +7350,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 294,
-                'macro' => ''
+                'line_nr' => 294
               }
             },
             {
@@ -7668,8 +7375,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 295,
-                'macro' => ''
+                'line_nr' => 295
               }
             },
             {
@@ -7694,8 +7400,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 296,
-                'macro' => ''
+                'line_nr' => 296
               }
             },
             {
@@ -7720,8 +7425,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 297,
-                'macro' => ''
+                'line_nr' => 297
               }
             },
             {
@@ -7746,8 +7450,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 298,
-                'macro' => ''
+                'line_nr' => 298
               }
             },
             {
@@ -7772,8 +7475,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 299,
-                'macro' => ''
+                'line_nr' => 299
               }
             },
             {
@@ -7798,8 +7500,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 300,
-                'macro' => ''
+                'line_nr' => 300
               }
             },
             {
@@ -7824,8 +7525,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 301,
-                'macro' => ''
+                'line_nr' => 301
               }
             },
             {
@@ -7850,8 +7550,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 302,
-                'macro' => ''
+                'line_nr' => 302
               }
             },
             {
@@ -7876,8 +7575,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 303,
-                'macro' => ''
+                'line_nr' => 303
               }
             },
             {
@@ -7902,8 +7600,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 304,
-                'macro' => ''
+                'line_nr' => 304
               }
             },
             {
@@ -7928,8 +7625,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 305,
-                'macro' => ''
+                'line_nr' => 305
               }
             },
             {
@@ -7954,8 +7650,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 306,
-                'macro' => ''
+                'line_nr' => 306
               }
             },
             {
@@ -7980,8 +7675,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 307,
-                'macro' => ''
+                'line_nr' => 307
               }
             },
             {
@@ -8006,8 +7700,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 308,
-                'macro' => ''
+                'line_nr' => 308
               }
             },
             {
@@ -8032,8 +7725,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 309,
-                'macro' => ''
+                'line_nr' => 309
               }
             },
             {
@@ -8058,8 +7750,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 310,
-                'macro' => ''
+                'line_nr' => 310
               }
             },
             {
@@ -8084,8 +7775,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 311,
-                'macro' => ''
+                'line_nr' => 311
               }
             },
             {
@@ -8110,8 +7800,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 312,
-                'macro' => ''
+                'line_nr' => 312
               }
             },
             {
@@ -8136,8 +7825,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 313,
-                'macro' => ''
+                'line_nr' => 313
               }
             },
             {
@@ -8162,8 +7850,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 314,
-                'macro' => ''
+                'line_nr' => 314
               }
             },
             {
@@ -8188,8 +7875,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 315,
-                'macro' => ''
+                'line_nr' => 315
               }
             },
             {
@@ -8214,8 +7900,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 316,
-                'macro' => ''
+                'line_nr' => 316
               }
             },
             {
@@ -8240,8 +7925,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 317,
-                'macro' => ''
+                'line_nr' => 317
               }
             },
             {
@@ -8266,8 +7950,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 318,
-                'macro' => ''
+                'line_nr' => 318
               }
             },
             {
@@ -8292,8 +7975,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 319,
-                'macro' => ''
+                'line_nr' => 319
               }
             },
             {
@@ -8318,8 +8000,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 320,
-                'macro' => ''
+                'line_nr' => 320
               }
             },
             {
@@ -8344,8 +8025,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 321,
-                'macro' => ''
+                'line_nr' => 321
               }
             },
             {
@@ -8370,8 +8050,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 322,
-                'macro' => ''
+                'line_nr' => 322
               }
             },
             {
@@ -8396,8 +8075,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 323,
-                'macro' => ''
+                'line_nr' => 323
               }
             },
             {
@@ -8422,8 +8100,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 324,
-                'macro' => ''
+                'line_nr' => 324
               }
             },
             {
@@ -8448,8 +8125,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 325,
-                'macro' => ''
+                'line_nr' => 325
               }
             },
             {
@@ -8474,8 +8150,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 326,
-                'macro' => ''
+                'line_nr' => 326
               }
             },
             {
@@ -8500,8 +8175,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 327,
-                'macro' => ''
+                'line_nr' => 327
               }
             },
             {
@@ -8526,8 +8200,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 328,
-                'macro' => ''
+                'line_nr' => 328
               }
             },
             {
@@ -8552,8 +8225,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 329,
-                'macro' => ''
+                'line_nr' => 329
               }
             },
             {
@@ -8578,8 +8250,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 330,
-                'macro' => ''
+                'line_nr' => 330
               }
             },
             {
@@ -8604,8 +8275,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 331,
-                'macro' => ''
+                'line_nr' => 331
               }
             },
             {
@@ -8630,8 +8300,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 332,
-                'macro' => ''
+                'line_nr' => 332
               }
             },
             {
@@ -8656,8 +8325,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 333,
-                'macro' => ''
+                'line_nr' => 333
               }
             },
             {
@@ -8682,8 +8350,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 334,
-                'macro' => ''
+                'line_nr' => 334
               }
             },
             {
@@ -8708,8 +8375,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 335,
-                'macro' => ''
+                'line_nr' => 335
               }
             },
             {
@@ -8734,8 +8400,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 336,
-                'macro' => ''
+                'line_nr' => 336
               }
             },
             {
@@ -8760,8 +8425,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 337,
-                'macro' => ''
+                'line_nr' => 337
               }
             },
             {
@@ -8786,8 +8450,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 338,
-                'macro' => ''
+                'line_nr' => 338
               }
             },
             {
@@ -8812,8 +8475,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 339,
-                'macro' => ''
+                'line_nr' => 339
               }
             },
             {
@@ -8838,8 +8500,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 340,
-                'macro' => ''
+                'line_nr' => 340
               }
             },
             {
@@ -8864,8 +8525,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 341,
-                'macro' => ''
+                'line_nr' => 341
               }
             },
             {
@@ -8890,8 +8550,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 342,
-                'macro' => ''
+                'line_nr' => 342
               }
             },
             {
@@ -8916,8 +8575,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 343,
-                'macro' => ''
+                'line_nr' => 343
               }
             },
             {
@@ -8942,8 +8600,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 344,
-                'macro' => ''
+                'line_nr' => 344
               }
             },
             {
@@ -8968,8 +8625,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 345,
-                'macro' => ''
+                'line_nr' => 345
               }
             },
             {
@@ -8994,8 +8650,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 346,
-                'macro' => ''
+                'line_nr' => 346
               }
             },
             {
@@ -9020,8 +8675,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 347,
-                'macro' => ''
+                'line_nr' => 347
               }
             },
             {
@@ -9046,8 +8700,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 348,
-                'macro' => ''
+                'line_nr' => 348
               }
             },
             {
@@ -9072,8 +8725,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 349,
-                'macro' => ''
+                'line_nr' => 349
               }
             },
             {
@@ -9098,8 +8750,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 350,
-                'macro' => ''
+                'line_nr' => 350
               }
             },
             {
@@ -9124,8 +8775,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 351,
-                'macro' => ''
+                'line_nr' => 351
               }
             },
             {
@@ -9150,8 +8800,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 352,
-                'macro' => ''
+                'line_nr' => 352
               }
             },
             {
@@ -9176,8 +8825,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 353,
-                'macro' => ''
+                'line_nr' => 353
               }
             },
             {
@@ -9202,8 +8850,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 354,
-                'macro' => ''
+                'line_nr' => 354
               }
             },
             {
@@ -9228,8 +8875,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 355,
-                'macro' => ''
+                'line_nr' => 355
               }
             },
             {
@@ -9254,8 +8900,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 356,
-                'macro' => ''
+                'line_nr' => 356
               }
             },
             {
@@ -9280,8 +8925,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 357,
-                'macro' => ''
+                'line_nr' => 357
               }
             },
             {
@@ -9306,8 +8950,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 358,
-                'macro' => ''
+                'line_nr' => 358
               }
             },
             {
@@ -9332,8 +8975,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 359,
-                'macro' => ''
+                'line_nr' => 359
               }
             },
             {
@@ -9358,8 +9000,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 360,
-                'macro' => ''
+                'line_nr' => 360
               }
             },
             {
@@ -9384,8 +9025,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 361,
-                'macro' => ''
+                'line_nr' => 361
               }
             },
             {
@@ -9410,8 +9050,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 362,
-                'macro' => ''
+                'line_nr' => 362
               }
             },
             {
@@ -9436,8 +9075,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 363,
-                'macro' => ''
+                'line_nr' => 363
               }
             },
             {
@@ -9462,8 +9100,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 364,
-                'macro' => ''
+                'line_nr' => 364
               }
             },
             {
@@ -9488,8 +9125,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 365,
-                'macro' => ''
+                'line_nr' => 365
               }
             },
             {
@@ -9514,8 +9150,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 366,
-                'macro' => ''
+                'line_nr' => 366
               }
             },
             {
@@ -9540,8 +9175,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 367,
-                'macro' => ''
+                'line_nr' => 367
               }
             },
             {
@@ -9566,8 +9200,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 368,
-                'macro' => ''
+                'line_nr' => 368
               }
             },
             {
@@ -9592,8 +9225,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 369,
-                'macro' => ''
+                'line_nr' => 369
               }
             },
             {
@@ -9618,8 +9250,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 370,
-                'macro' => ''
+                'line_nr' => 370
               }
             },
             {
@@ -9644,8 +9275,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 371,
-                'macro' => ''
+                'line_nr' => 371
               }
             },
             {
@@ -9670,8 +9300,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 372,
-                'macro' => ''
+                'line_nr' => 372
               }
             },
             {
@@ -9696,8 +9325,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 373,
-                'macro' => ''
+                'line_nr' => 373
               }
             },
             {
@@ -9722,8 +9350,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 374,
-                'macro' => ''
+                'line_nr' => 374
               }
             },
             {
@@ -9748,8 +9375,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 375,
-                'macro' => ''
+                'line_nr' => 375
               }
             },
             {
@@ -9774,8 +9400,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 376,
-                'macro' => ''
+                'line_nr' => 376
               }
             },
             {
@@ -9800,8 +9425,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 377,
-                'macro' => ''
+                'line_nr' => 377
               }
             },
             {
@@ -9826,8 +9450,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 378,
-                'macro' => ''
+                'line_nr' => 378
               }
             },
             {
@@ -9852,8 +9475,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 379,
-                'macro' => ''
+                'line_nr' => 379
               }
             },
             {
@@ -9878,8 +9500,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 380,
-                'macro' => ''
+                'line_nr' => 380
               }
             },
             {
@@ -9904,8 +9525,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 381,
-                'macro' => ''
+                'line_nr' => 381
               }
             },
             {
@@ -9930,8 +9550,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 382,
-                'macro' => ''
+                'line_nr' => 382
               }
             },
             {
@@ -9956,8 +9575,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 383,
-                'macro' => ''
+                'line_nr' => 383
               }
             },
             {
@@ -9982,8 +9600,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 384,
-                'macro' => ''
+                'line_nr' => 384
               }
             },
             {
@@ -10008,8 +9625,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 385,
-                'macro' => ''
+                'line_nr' => 385
               }
             },
             {
@@ -10034,8 +9650,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 386,
-                'macro' => ''
+                'line_nr' => 386
               }
             },
             {
@@ -10060,8 +9675,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 387,
-                'macro' => ''
+                'line_nr' => 387
               }
             },
             {
@@ -10086,8 +9700,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 388,
-                'macro' => ''
+                'line_nr' => 388
               }
             },
             {
@@ -10112,8 +9725,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 389,
-                'macro' => ''
+                'line_nr' => 389
               }
             },
             {
@@ -10138,8 +9750,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 390,
-                'macro' => ''
+                'line_nr' => 390
               }
             },
             {
@@ -10164,8 +9775,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 391,
-                'macro' => ''
+                'line_nr' => 391
               }
             },
             {
@@ -10190,8 +9800,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 392,
-                'macro' => ''
+                'line_nr' => 392
               }
             },
             {
@@ -10216,8 +9825,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 393,
-                'macro' => ''
+                'line_nr' => 393
               }
             },
             {
@@ -10242,8 +9850,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 394,
-                'macro' => ''
+                'line_nr' => 394
               }
             },
             {
@@ -10268,8 +9875,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 395,
-                'macro' => ''
+                'line_nr' => 395
               }
             },
             {
@@ -10294,8 +9900,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 396,
-                'macro' => ''
+                'line_nr' => 396
               }
             },
             {
@@ -10320,8 +9925,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 397,
-                'macro' => ''
+                'line_nr' => 397
               }
             },
             {
@@ -10346,8 +9950,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 398,
-                'macro' => ''
+                'line_nr' => 398
               }
             },
             {
@@ -10372,8 +9975,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 399,
-                'macro' => ''
+                'line_nr' => 399
               }
             },
             {
@@ -10398,8 +10000,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 400,
-                'macro' => ''
+                'line_nr' => 400
               }
             },
             {
@@ -10424,8 +10025,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 401,
-                'macro' => ''
+                'line_nr' => 401
               }
             },
             {
@@ -10450,8 +10050,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 402,
-                'macro' => ''
+                'line_nr' => 402
               }
             },
             {
@@ -10476,8 +10075,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 403,
-                'macro' => ''
+                'line_nr' => 403
               }
             },
             {
@@ -10502,8 +10100,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 404,
-                'macro' => ''
+                'line_nr' => 404
               }
             },
             {
@@ -10528,8 +10125,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 405,
-                'macro' => ''
+                'line_nr' => 405
               }
             },
             {
@@ -10554,8 +10150,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 406,
-                'macro' => ''
+                'line_nr' => 406
               }
             },
             {
@@ -10580,8 +10175,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 407,
-                'macro' => ''
+                'line_nr' => 407
               }
             },
             {
@@ -10606,8 +10200,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 408,
-                'macro' => ''
+                'line_nr' => 408
               }
             },
             {
@@ -10632,8 +10225,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 409,
-                'macro' => ''
+                'line_nr' => 409
               }
             },
             {
@@ -10658,8 +10250,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 410,
-                'macro' => ''
+                'line_nr' => 410
               }
             },
             {
@@ -10684,8 +10275,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 411,
-                'macro' => ''
+                'line_nr' => 411
               }
             },
             {
@@ -10710,8 +10300,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 412,
-                'macro' => ''
+                'line_nr' => 412
               }
             },
             {
@@ -10736,8 +10325,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 413,
-                'macro' => ''
+                'line_nr' => 413
               }
             },
             {
@@ -10762,8 +10350,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 414,
-                'macro' => ''
+                'line_nr' => 414
               }
             },
             {
@@ -10788,8 +10375,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 415,
-                'macro' => ''
+                'line_nr' => 415
               }
             },
             {
@@ -10814,8 +10400,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 416,
-                'macro' => ''
+                'line_nr' => 416
               }
             },
             {
@@ -10840,8 +10425,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 417,
-                'macro' => ''
+                'line_nr' => 417
               }
             },
             {
@@ -10866,8 +10450,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 418,
-                'macro' => ''
+                'line_nr' => 418
               }
             },
             {
@@ -10892,8 +10475,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 419,
-                'macro' => ''
+                'line_nr' => 419
               }
             },
             {
@@ -10918,8 +10500,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 420,
-                'macro' => ''
+                'line_nr' => 420
               }
             },
             {
@@ -10944,8 +10525,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 421,
-                'macro' => ''
+                'line_nr' => 421
               }
             },
             {
@@ -10970,8 +10550,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 422,
-                'macro' => ''
+                'line_nr' => 422
               }
             },
             {
@@ -10996,8 +10575,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 423,
-                'macro' => ''
+                'line_nr' => 423
               }
             },
             {
@@ -11022,8 +10600,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 424,
-                'macro' => ''
+                'line_nr' => 424
               }
             },
             {
@@ -11048,8 +10625,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 425,
-                'macro' => ''
+                'line_nr' => 425
               }
             },
             {
@@ -11074,8 +10650,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 426,
-                'macro' => ''
+                'line_nr' => 426
               }
             },
             {
@@ -11100,8 +10675,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 427,
-                'macro' => ''
+                'line_nr' => 427
               }
             },
             {
@@ -11126,8 +10700,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 428,
-                'macro' => ''
+                'line_nr' => 428
               }
             },
             {
@@ -11152,8 +10725,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 429,
-                'macro' => ''
+                'line_nr' => 429
               }
             },
             {
@@ -11178,8 +10750,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 430,
-                'macro' => ''
+                'line_nr' => 430
               }
             },
             {
@@ -11204,8 +10775,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 431,
-                'macro' => ''
+                'line_nr' => 431
               }
             },
             {
@@ -11230,8 +10800,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 432,
-                'macro' => ''
+                'line_nr' => 432
               }
             },
             {
@@ -11256,8 +10825,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 433,
-                'macro' => ''
+                'line_nr' => 433
               }
             },
             {
@@ -11282,8 +10850,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 434,
-                'macro' => ''
+                'line_nr' => 434
               }
             },
             {
@@ -11308,8 +10875,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 435,
-                'macro' => ''
+                'line_nr' => 435
               }
             },
             {
@@ -11334,8 +10900,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 436,
-                'macro' => ''
+                'line_nr' => 436
               }
             },
             {
@@ -11360,8 +10925,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 437,
-                'macro' => ''
+                'line_nr' => 437
               }
             },
             {
@@ -11386,8 +10950,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 438,
-                'macro' => ''
+                'line_nr' => 438
               }
             },
             {
@@ -11412,8 +10975,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 439,
-                'macro' => ''
+                'line_nr' => 439
               }
             },
             {
@@ -11438,8 +11000,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 440,
-                'macro' => ''
+                'line_nr' => 440
               }
             },
             {
@@ -11464,8 +11025,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 441,
-                'macro' => ''
+                'line_nr' => 441
               }
             },
             {
@@ -11490,8 +11050,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 442,
-                'macro' => ''
+                'line_nr' => 442
               }
             },
             {
@@ -11516,8 +11075,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 443,
-                'macro' => ''
+                'line_nr' => 443
               }
             },
             {
@@ -11542,8 +11100,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 444,
-                'macro' => ''
+                'line_nr' => 444
               }
             },
             {
@@ -11568,8 +11125,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 445,
-                'macro' => ''
+                'line_nr' => 445
               }
             },
             {
@@ -11594,8 +11150,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 446,
-                'macro' => ''
+                'line_nr' => 446
               }
             },
             {
@@ -11620,8 +11175,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 447,
-                'macro' => ''
+                'line_nr' => 447
               }
             },
             {
@@ -11646,8 +11200,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 448,
-                'macro' => ''
+                'line_nr' => 448
               }
             },
             {
@@ -11672,8 +11225,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 449,
-                'macro' => ''
+                'line_nr' => 449
               }
             },
             {
@@ -11698,8 +11250,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 450,
-                'macro' => ''
+                'line_nr' => 450
               }
             },
             {
@@ -11724,8 +11275,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 451,
-                'macro' => ''
+                'line_nr' => 451
               }
             },
             {
@@ -11750,8 +11300,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 452,
-                'macro' => ''
+                'line_nr' => 452
               }
             },
             {
@@ -11776,8 +11325,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 453,
-                'macro' => ''
+                'line_nr' => 453
               }
             },
             {
@@ -11802,8 +11350,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 454,
-                'macro' => ''
+                'line_nr' => 454
               }
             },
             {
@@ -11828,8 +11375,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 455,
-                'macro' => ''
+                'line_nr' => 455
               }
             },
             {
@@ -11854,8 +11400,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 456,
-                'macro' => ''
+                'line_nr' => 456
               }
             },
             {
@@ -11880,8 +11425,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 457,
-                'macro' => ''
+                'line_nr' => 457
               }
             },
             {
@@ -11906,8 +11450,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 458,
-                'macro' => ''
+                'line_nr' => 458
               }
             },
             {
@@ -11932,8 +11475,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 459,
-                'macro' => ''
+                'line_nr' => 459
               }
             },
             {
@@ -11958,8 +11500,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 460,
-                'macro' => ''
+                'line_nr' => 460
               }
             },
             {
@@ -11984,8 +11525,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 461,
-                'macro' => ''
+                'line_nr' => 461
               }
             },
             {
@@ -12010,8 +11550,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 462,
-                'macro' => ''
+                'line_nr' => 462
               }
             },
             {
@@ -12036,8 +11575,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 463,
-                'macro' => ''
+                'line_nr' => 463
               }
             },
             {
@@ -12062,8 +11600,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 464,
-                'macro' => ''
+                'line_nr' => 464
               }
             },
             {
@@ -12088,8 +11625,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 465,
-                'macro' => ''
+                'line_nr' => 465
               }
             },
             {
@@ -12114,8 +11650,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 466,
-                'macro' => ''
+                'line_nr' => 466
               }
             },
             {
@@ -12140,8 +11675,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 467,
-                'macro' => ''
+                'line_nr' => 467
               }
             },
             {
@@ -12166,8 +11700,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 468,
-                'macro' => ''
+                'line_nr' => 468
               }
             },
             {
@@ -12192,8 +11725,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 469,
-                'macro' => ''
+                'line_nr' => 469
               }
             },
             {
@@ -12218,8 +11750,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 470,
-                'macro' => ''
+                'line_nr' => 470
               }
             },
             {
@@ -12244,8 +11775,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 471,
-                'macro' => ''
+                'line_nr' => 471
               }
             },
             {
@@ -12270,8 +11800,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 472,
-                'macro' => ''
+                'line_nr' => 472
               }
             },
             {
@@ -12296,8 +11825,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 473,
-                'macro' => ''
+                'line_nr' => 473
               }
             },
             {
@@ -12322,8 +11850,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 474,
-                'macro' => ''
+                'line_nr' => 474
               }
             },
             {
@@ -12348,8 +11875,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 475,
-                'macro' => ''
+                'line_nr' => 475
               }
             },
             {
@@ -12374,8 +11900,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 476,
-                'macro' => ''
+                'line_nr' => 476
               }
             },
             {
@@ -12400,8 +11925,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 477,
-                'macro' => ''
+                'line_nr' => 477
               }
             },
             {
@@ -12426,8 +11950,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 478,
-                'macro' => ''
+                'line_nr' => 478
               }
             },
             {
@@ -12452,8 +11975,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 479,
-                'macro' => ''
+                'line_nr' => 479
               }
             },
             {
@@ -12478,8 +12000,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 480,
-                'macro' => ''
+                'line_nr' => 480
               }
             },
             {
@@ -12504,8 +12025,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 481,
-                'macro' => ''
+                'line_nr' => 481
               }
             },
             {
@@ -12530,8 +12050,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 482,
-                'macro' => ''
+                'line_nr' => 482
               }
             },
             {
@@ -12556,8 +12075,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 483,
-                'macro' => ''
+                'line_nr' => 483
               }
             },
             {
@@ -12582,8 +12100,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 484,
-                'macro' => ''
+                'line_nr' => 484
               }
             },
             {
@@ -12608,8 +12125,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 485,
-                'macro' => ''
+                'line_nr' => 485
               }
             },
             {
@@ -12634,8 +12150,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 486,
-                'macro' => ''
+                'line_nr' => 486
               }
             },
             {
@@ -12660,8 +12175,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 487,
-                'macro' => ''
+                'line_nr' => 487
               }
             },
             {
@@ -12686,8 +12200,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 488,
-                'macro' => ''
+                'line_nr' => 488
               }
             },
             {
@@ -12712,8 +12225,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 489,
-                'macro' => ''
+                'line_nr' => 489
               }
             },
             {
@@ -12738,8 +12250,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 490,
-                'macro' => ''
+                'line_nr' => 490
               }
             },
             {
@@ -12764,8 +12275,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 491,
-                'macro' => ''
+                'line_nr' => 491
               }
             },
             {
@@ -12790,8 +12300,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 492,
-                'macro' => ''
+                'line_nr' => 492
               }
             },
             {
@@ -12816,8 +12325,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 493,
-                'macro' => ''
+                'line_nr' => 493
               }
             },
             {
@@ -12842,8 +12350,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 494,
-                'macro' => ''
+                'line_nr' => 494
               }
             },
             {
@@ -12868,8 +12375,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 495,
-                'macro' => ''
+                'line_nr' => 495
               }
             },
             {
@@ -12894,8 +12400,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 496,
-                'macro' => ''
+                'line_nr' => 496
               }
             },
             {
@@ -12920,8 +12425,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 497,
-                'macro' => ''
+                'line_nr' => 497
               }
             },
             {
@@ -12946,8 +12450,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 498,
-                'macro' => ''
+                'line_nr' => 498
               }
             },
             {
@@ -12972,8 +12475,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 499,
-                'macro' => ''
+                'line_nr' => 499
               }
             },
             {
@@ -12998,8 +12500,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 500,
-                'macro' => ''
+                'line_nr' => 500
               }
             },
             {
@@ -13024,8 +12525,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 501,
-                'macro' => ''
+                'line_nr' => 501
               }
             },
             {
@@ -13050,8 +12550,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 502,
-                'macro' => ''
+                'line_nr' => 502
               }
             },
             {
@@ -13076,8 +12575,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 503,
-                'macro' => ''
+                'line_nr' => 503
               }
             },
             {
@@ -13102,8 +12600,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 504,
-                'macro' => ''
+                'line_nr' => 504
               }
             },
             {
@@ -13128,8 +12625,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 505,
-                'macro' => ''
+                'line_nr' => 505
               }
             },
             {
@@ -13154,8 +12650,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 506,
-                'macro' => ''
+                'line_nr' => 506
               }
             },
             {
@@ -13180,8 +12675,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 507,
-                'macro' => ''
+                'line_nr' => 507
               }
             },
             {
@@ -13206,8 +12700,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 508,
-                'macro' => ''
+                'line_nr' => 508
               }
             },
             {
@@ -13232,8 +12725,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 509,
-                'macro' => ''
+                'line_nr' => 509
               }
             },
             {
@@ -13258,8 +12750,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 510,
-                'macro' => ''
+                'line_nr' => 510
               }
             },
             {
@@ -13284,8 +12775,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 511,
-                'macro' => ''
+                'line_nr' => 511
               }
             },
             {
@@ -13310,8 +12800,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 512,
-                'macro' => ''
+                'line_nr' => 512
               }
             },
             {
@@ -13336,8 +12825,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 513,
-                'macro' => ''
+                'line_nr' => 513
               }
             },
             {
@@ -13362,8 +12850,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 514,
-                'macro' => ''
+                'line_nr' => 514
               }
             },
             {
@@ -13388,8 +12875,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 515,
-                'macro' => ''
+                'line_nr' => 515
               }
             },
             {
@@ -13414,8 +12900,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 516,
-                'macro' => ''
+                'line_nr' => 516
               }
             },
             {
@@ -13440,8 +12925,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 517,
-                'macro' => ''
+                'line_nr' => 517
               }
             },
             {
@@ -13466,8 +12950,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 518,
-                'macro' => ''
+                'line_nr' => 518
               }
             },
             {
@@ -13492,8 +12975,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 519,
-                'macro' => ''
+                'line_nr' => 519
               }
             },
             {
@@ -13518,8 +13000,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 520,
-                'macro' => ''
+                'line_nr' => 520
               }
             },
             {
@@ -13544,8 +13025,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 521,
-                'macro' => ''
+                'line_nr' => 521
               }
             },
             {
@@ -13570,8 +13050,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 522,
-                'macro' => ''
+                'line_nr' => 522
               }
             },
             {
@@ -13596,8 +13075,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 523,
-                'macro' => ''
+                'line_nr' => 523
               }
             },
             {
@@ -13622,8 +13100,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 524,
-                'macro' => ''
+                'line_nr' => 524
               }
             },
             {
@@ -13648,8 +13125,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 525,
-                'macro' => ''
+                'line_nr' => 525
               }
             },
             {
@@ -13674,8 +13150,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 526,
-                'macro' => ''
+                'line_nr' => 526
               }
             },
             {
@@ -13700,8 +13175,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 527,
-                'macro' => ''
+                'line_nr' => 527
               }
             },
             {
@@ -13726,8 +13200,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 528,
-                'macro' => ''
+                'line_nr' => 528
               }
             },
             {
@@ -13752,8 +13225,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 529,
-                'macro' => ''
+                'line_nr' => 529
               }
             },
             {
@@ -13778,8 +13250,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 530,
-                'macro' => ''
+                'line_nr' => 530
               }
             },
             {
@@ -13804,8 +13275,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 531,
-                'macro' => ''
+                'line_nr' => 531
               }
             },
             {
@@ -13830,8 +13300,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 532,
-                'macro' => ''
+                'line_nr' => 532
               }
             },
             {
@@ -13856,8 +13325,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 533,
-                'macro' => ''
+                'line_nr' => 533
               }
             },
             {
@@ -13882,8 +13350,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 534,
-                'macro' => ''
+                'line_nr' => 534
               }
             },
             {
@@ -13908,8 +13375,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 535,
-                'macro' => ''
+                'line_nr' => 535
               }
             },
             {
@@ -13934,8 +13400,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 536,
-                'macro' => ''
+                'line_nr' => 536
               }
             },
             {
@@ -13960,8 +13425,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 537,
-                'macro' => ''
+                'line_nr' => 537
               }
             },
             {
@@ -13986,8 +13450,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 538,
-                'macro' => ''
+                'line_nr' => 538
               }
             },
             {
@@ -14012,8 +13475,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 539,
-                'macro' => ''
+                'line_nr' => 539
               }
             },
             {
@@ -14038,8 +13500,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 540,
-                'macro' => ''
+                'line_nr' => 540
               }
             },
             {
@@ -14064,8 +13525,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 541,
-                'macro' => ''
+                'line_nr' => 541
               }
             },
             {
@@ -14090,8 +13550,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 542,
-                'macro' => ''
+                'line_nr' => 542
               }
             },
             {
@@ -14116,8 +13575,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 543,
-                'macro' => ''
+                'line_nr' => 543
               }
             },
             {
@@ -14142,8 +13600,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 544,
-                'macro' => ''
+                'line_nr' => 544
               }
             },
             {
@@ -14168,8 +13625,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 545,
-                'macro' => ''
+                'line_nr' => 545
               }
             },
             {
@@ -14194,8 +13650,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 546,
-                'macro' => ''
+                'line_nr' => 546
               }
             },
             {
@@ -14220,8 +13675,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 547,
-                'macro' => ''
+                'line_nr' => 547
               }
             },
             {
@@ -14246,8 +13700,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 548,
-                'macro' => ''
+                'line_nr' => 548
               }
             },
             {
@@ -14272,8 +13725,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 549,
-                'macro' => ''
+                'line_nr' => 549
               }
             },
             {
@@ -14298,8 +13750,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 550,
-                'macro' => ''
+                'line_nr' => 550
               }
             },
             {
@@ -14324,8 +13775,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 551,
-                'macro' => ''
+                'line_nr' => 551
               }
             },
             {
@@ -14350,8 +13800,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 552,
-                'macro' => ''
+                'line_nr' => 552
               }
             },
             {
@@ -14376,8 +13825,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 553,
-                'macro' => ''
+                'line_nr' => 553
               }
             },
             {
@@ -14402,8 +13850,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 554,
-                'macro' => ''
+                'line_nr' => 554
               }
             },
             {
@@ -14428,8 +13875,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 555,
-                'macro' => ''
+                'line_nr' => 555
               }
             },
             {
@@ -14454,8 +13900,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 556,
-                'macro' => ''
+                'line_nr' => 556
               }
             },
             {
@@ -14480,8 +13925,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 557,
-                'macro' => ''
+                'line_nr' => 557
               }
             },
             {
@@ -14506,8 +13950,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 558,
-                'macro' => ''
+                'line_nr' => 558
               }
             },
             {
@@ -14532,8 +13975,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 559,
-                'macro' => ''
+                'line_nr' => 559
               }
             },
             {
@@ -14558,8 +14000,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 560,
-                'macro' => ''
+                'line_nr' => 560
               }
             },
             {
@@ -14584,8 +14025,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 561,
-                'macro' => ''
+                'line_nr' => 561
               }
             },
             {
@@ -14610,8 +14050,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 562,
-                'macro' => ''
+                'line_nr' => 562
               }
             },
             {
@@ -14636,8 +14075,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 563,
-                'macro' => ''
+                'line_nr' => 563
               }
             },
             {
@@ -14662,8 +14100,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 564,
-                'macro' => ''
+                'line_nr' => 564
               }
             },
             {
@@ -14688,8 +14125,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 565,
-                'macro' => ''
+                'line_nr' => 565
               }
             },
             {
@@ -14714,8 +14150,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 566,
-                'macro' => ''
+                'line_nr' => 566
               }
             },
             {
@@ -14740,8 +14175,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 567,
-                'macro' => ''
+                'line_nr' => 567
               }
             },
             {
@@ -14766,8 +14200,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 568,
-                'macro' => ''
+                'line_nr' => 568
               }
             },
             {
@@ -14792,8 +14225,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 569,
-                'macro' => ''
+                'line_nr' => 569
               }
             },
             {
@@ -14818,8 +14250,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 570,
-                'macro' => ''
+                'line_nr' => 570
               }
             },
             {
@@ -14844,8 +14275,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 571,
-                'macro' => ''
+                'line_nr' => 571
               }
             },
             {
@@ -14870,8 +14300,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 572,
-                'macro' => ''
+                'line_nr' => 572
               }
             },
             {
@@ -14896,8 +14325,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 573,
-                'macro' => ''
+                'line_nr' => 573
               }
             },
             {
@@ -14922,8 +14350,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 574,
-                'macro' => ''
+                'line_nr' => 574
               }
             },
             {
@@ -14948,8 +14375,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 575,
-                'macro' => ''
+                'line_nr' => 575
               }
             },
             {
@@ -14974,8 +14400,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 576,
-                'macro' => ''
+                'line_nr' => 576
               }
             },
             {
@@ -15000,8 +14425,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 577,
-                'macro' => ''
+                'line_nr' => 577
               }
             },
             {
@@ -15026,8 +14450,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 578,
-                'macro' => ''
+                'line_nr' => 578
               }
             },
             {
@@ -15052,8 +14475,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 579,
-                'macro' => ''
+                'line_nr' => 579
               }
             },
             {
@@ -15078,8 +14500,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 580,
-                'macro' => ''
+                'line_nr' => 580
               }
             },
             {
@@ -15104,8 +14525,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 581,
-                'macro' => ''
+                'line_nr' => 581
               }
             },
             {
@@ -15130,8 +14550,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 582,
-                'macro' => ''
+                'line_nr' => 582
               }
             },
             {
@@ -15156,8 +14575,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 583,
-                'macro' => ''
+                'line_nr' => 583
               }
             },
             {
@@ -15182,8 +14600,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 584,
-                'macro' => ''
+                'line_nr' => 584
               }
             },
             {
@@ -15208,8 +14625,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 585,
-                'macro' => ''
+                'line_nr' => 585
               }
             },
             {
@@ -15234,8 +14650,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 586,
-                'macro' => ''
+                'line_nr' => 586
               }
             },
             {
@@ -15260,8 +14675,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 587,
-                'macro' => ''
+                'line_nr' => 587
               }
             },
             {
@@ -15286,8 +14700,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 588,
-                'macro' => ''
+                'line_nr' => 588
               }
             },
             {
@@ -15312,8 +14725,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 589,
-                'macro' => ''
+                'line_nr' => 589
               }
             },
             {
@@ -15338,8 +14750,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 590,
-                'macro' => ''
+                'line_nr' => 590
               }
             },
             {
@@ -15364,8 +14775,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 591,
-                'macro' => ''
+                'line_nr' => 591
               }
             },
             {
@@ -15390,8 +14800,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 592,
-                'macro' => ''
+                'line_nr' => 592
               }
             },
             {
@@ -15416,8 +14825,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 593,
-                'macro' => ''
+                'line_nr' => 593
               }
             },
             {
@@ -15442,8 +14850,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 594,
-                'macro' => ''
+                'line_nr' => 594
               }
             },
             {
@@ -15468,8 +14875,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 595,
-                'macro' => ''
+                'line_nr' => 595
               }
             },
             {
@@ -15494,8 +14900,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 596,
-                'macro' => ''
+                'line_nr' => 596
               }
             },
             {
@@ -15520,8 +14925,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 597,
-                'macro' => ''
+                'line_nr' => 597
               }
             },
             {
@@ -15546,8 +14950,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 598,
-                'macro' => ''
+                'line_nr' => 598
               }
             },
             {
@@ -15572,8 +14975,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 599,
-                'macro' => ''
+                'line_nr' => 599
               }
             },
             {
@@ -15598,8 +15000,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 600,
-                'macro' => ''
+                'line_nr' => 600
               }
             },
             {
@@ -15624,8 +15025,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 601,
-                'macro' => ''
+                'line_nr' => 601
               }
             },
             {
@@ -15650,8 +15050,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 602,
-                'macro' => ''
+                'line_nr' => 602
               }
             },
             {
@@ -15676,8 +15075,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 603,
-                'macro' => ''
+                'line_nr' => 603
               }
             },
             {
@@ -15702,8 +15100,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 604,
-                'macro' => ''
+                'line_nr' => 604
               }
             },
             {
@@ -15728,8 +15125,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 605,
-                'macro' => ''
+                'line_nr' => 605
               }
             },
             {
@@ -15754,8 +15150,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 606,
-                'macro' => ''
+                'line_nr' => 606
               }
             },
             {
@@ -15780,8 +15175,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 607,
-                'macro' => ''
+                'line_nr' => 607
               }
             },
             {
@@ -15806,8 +15200,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 608,
-                'macro' => ''
+                'line_nr' => 608
               }
             },
             {
@@ -15832,8 +15225,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 609,
-                'macro' => ''
+                'line_nr' => 609
               }
             },
             {
@@ -15858,8 +15250,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 610,
-                'macro' => ''
+                'line_nr' => 610
               }
             },
             {
@@ -15884,8 +15275,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 611,
-                'macro' => ''
+                'line_nr' => 611
               }
             },
             {
@@ -15910,8 +15300,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 612,
-                'macro' => ''
+                'line_nr' => 612
               }
             },
             {
@@ -15936,8 +15325,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 613,
-                'macro' => ''
+                'line_nr' => 613
               }
             },
             {
@@ -15962,8 +15350,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 614,
-                'macro' => ''
+                'line_nr' => 614
               }
             },
             {
@@ -15988,8 +15375,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 615,
-                'macro' => ''
+                'line_nr' => 615
               }
             },
             {
@@ -16014,8 +15400,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 616,
-                'macro' => ''
+                'line_nr' => 616
               }
             },
             {
@@ -16040,8 +15425,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 617,
-                'macro' => ''
+                'line_nr' => 617
               }
             },
             {
@@ -16066,8 +15450,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 618,
-                'macro' => ''
+                'line_nr' => 618
               }
             },
             {
@@ -16092,8 +15475,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 619,
-                'macro' => ''
+                'line_nr' => 619
               }
             },
             {
@@ -16118,8 +15500,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 620,
-                'macro' => ''
+                'line_nr' => 620
               }
             },
             {
@@ -16144,8 +15525,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 621,
-                'macro' => ''
+                'line_nr' => 621
               }
             },
             {
@@ -16170,8 +15550,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 622,
-                'macro' => ''
+                'line_nr' => 622
               }
             },
             {
@@ -16196,8 +15575,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 623,
-                'macro' => ''
+                'line_nr' => 623
               }
             },
             {
@@ -16222,8 +15600,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 624,
-                'macro' => ''
+                'line_nr' => 624
               }
             },
             {
@@ -16248,8 +15625,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 625,
-                'macro' => ''
+                'line_nr' => 625
               }
             },
             {
@@ -16274,8 +15650,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 626,
-                'macro' => ''
+                'line_nr' => 626
               }
             },
             {
@@ -16300,8 +15675,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 627,
-                'macro' => ''
+                'line_nr' => 627
               }
             },
             {
@@ -16326,8 +15700,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 628,
-                'macro' => ''
+                'line_nr' => 628
               }
             },
             {
@@ -16352,8 +15725,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 629,
-                'macro' => ''
+                'line_nr' => 629
               }
             },
             {
@@ -16378,8 +15750,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 630,
-                'macro' => ''
+                'line_nr' => 630
               }
             },
             {
@@ -16404,8 +15775,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 631,
-                'macro' => ''
+                'line_nr' => 631
               }
             },
             {
@@ -16430,8 +15800,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 632,
-                'macro' => ''
+                'line_nr' => 632
               }
             },
             {
@@ -16456,8 +15825,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 633,
-                'macro' => ''
+                'line_nr' => 633
               }
             },
             {
@@ -16482,8 +15850,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 634,
-                'macro' => ''
+                'line_nr' => 634
               }
             },
             {
@@ -16508,8 +15875,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 635,
-                'macro' => ''
+                'line_nr' => 635
               }
             },
             {
@@ -16534,8 +15900,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 636,
-                'macro' => ''
+                'line_nr' => 636
               }
             },
             {
@@ -16560,8 +15925,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 637,
-                'macro' => ''
+                'line_nr' => 637
               }
             },
             {
@@ -16586,8 +15950,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 638,
-                'macro' => ''
+                'line_nr' => 638
               }
             },
             {
@@ -16612,8 +15975,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 639,
-                'macro' => ''
+                'line_nr' => 639
               }
             },
             {
@@ -16638,8 +16000,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 640,
-                'macro' => ''
+                'line_nr' => 640
               }
             },
             {
@@ -16664,8 +16025,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 641,
-                'macro' => ''
+                'line_nr' => 641
               }
             },
             {
@@ -16690,8 +16050,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 642,
-                'macro' => ''
+                'line_nr' => 642
               }
             },
             {
@@ -16716,8 +16075,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 643,
-                'macro' => ''
+                'line_nr' => 643
               }
             },
             {
@@ -16742,8 +16100,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 644,
-                'macro' => ''
+                'line_nr' => 644
               }
             },
             {
@@ -16768,8 +16125,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 645,
-                'macro' => ''
+                'line_nr' => 645
               }
             },
             {
@@ -16794,8 +16150,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 646,
-                'macro' => ''
+                'line_nr' => 646
               }
             },
             {
@@ -16820,8 +16175,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 647,
-                'macro' => ''
+                'line_nr' => 647
               }
             },
             {
@@ -16846,8 +16200,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 648,
-                'macro' => ''
+                'line_nr' => 648
               }
             },
             {
@@ -16872,8 +16225,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 649,
-                'macro' => ''
+                'line_nr' => 649
               }
             },
             {
@@ -16898,8 +16250,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 650,
-                'macro' => ''
+                'line_nr' => 650
               }
             },
             {
@@ -16924,8 +16275,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 651,
-                'macro' => ''
+                'line_nr' => 651
               }
             },
             {
@@ -16950,8 +16300,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 652,
-                'macro' => ''
+                'line_nr' => 652
               }
             },
             {
@@ -16976,8 +16325,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 653,
-                'macro' => ''
+                'line_nr' => 653
               }
             },
             {
@@ -17002,8 +16350,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 654,
-                'macro' => ''
+                'line_nr' => 654
               }
             },
             {
@@ -17028,8 +16375,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 655,
-                'macro' => ''
+                'line_nr' => 655
               }
             },
             {
@@ -17054,8 +16400,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 656,
-                'macro' => ''
+                'line_nr' => 656
               }
             },
             {
@@ -17080,8 +16425,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 657,
-                'macro' => ''
+                'line_nr' => 657
               }
             },
             {
@@ -17106,8 +16450,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 658,
-                'macro' => ''
+                'line_nr' => 658
               }
             },
             {
@@ -17132,8 +16475,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 659,
-                'macro' => ''
+                'line_nr' => 659
               }
             },
             {
@@ -17158,8 +16500,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 660,
-                'macro' => ''
+                'line_nr' => 660
               }
             },
             {
@@ -17184,8 +16525,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 661,
-                'macro' => ''
+                'line_nr' => 661
               }
             },
             {
@@ -17210,8 +16550,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 662,
-                'macro' => ''
+                'line_nr' => 662
               }
             },
             {
@@ -17236,8 +16575,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 663,
-                'macro' => ''
+                'line_nr' => 663
               }
             },
             {
@@ -17262,8 +16600,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 664,
-                'macro' => ''
+                'line_nr' => 664
               }
             },
             {
@@ -17288,8 +16625,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 665,
-                'macro' => ''
+                'line_nr' => 665
               }
             },
             {
@@ -17314,8 +16650,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 666,
-                'macro' => ''
+                'line_nr' => 666
               }
             },
             {
@@ -17340,8 +16675,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 667,
-                'macro' => ''
+                'line_nr' => 667
               }
             },
             {
@@ -17366,8 +16700,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 668,
-                'macro' => ''
+                'line_nr' => 668
               }
             },
             {
@@ -17392,8 +16725,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 669,
-                'macro' => ''
+                'line_nr' => 669
               }
             },
             {
@@ -17418,8 +16750,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 670,
-                'macro' => ''
+                'line_nr' => 670
               }
             },
             {
@@ -17444,8 +16775,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 671,
-                'macro' => ''
+                'line_nr' => 671
               }
             },
             {
@@ -17470,8 +16800,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 672,
-                'macro' => ''
+                'line_nr' => 672
               }
             },
             {
@@ -17496,8 +16825,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 673,
-                'macro' => ''
+                'line_nr' => 673
               }
             },
             {
@@ -17522,8 +16850,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 674,
-                'macro' => ''
+                'line_nr' => 674
               }
             },
             {
@@ -17548,8 +16875,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 675,
-                'macro' => ''
+                'line_nr' => 675
               }
             },
             {
@@ -17574,8 +16900,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 676,
-                'macro' => ''
+                'line_nr' => 676
               }
             },
             {
@@ -17600,8 +16925,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 677,
-                'macro' => ''
+                'line_nr' => 677
               }
             },
             {
@@ -17626,8 +16950,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 678,
-                'macro' => ''
+                'line_nr' => 678
               }
             },
             {
@@ -17652,8 +16975,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 679,
-                'macro' => ''
+                'line_nr' => 679
               }
             },
             {
@@ -17678,8 +17000,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 680,
-                'macro' => ''
+                'line_nr' => 680
               }
             },
             {
@@ -17704,8 +17025,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 681,
-                'macro' => ''
+                'line_nr' => 681
               }
             },
             {
@@ -17730,8 +17050,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 682,
-                'macro' => ''
+                'line_nr' => 682
               }
             },
             {
@@ -17756,8 +17075,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 683,
-                'macro' => ''
+                'line_nr' => 683
               }
             },
             {
@@ -17782,8 +17100,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 684,
-                'macro' => ''
+                'line_nr' => 684
               }
             },
             {
@@ -17808,8 +17125,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 685,
-                'macro' => ''
+                'line_nr' => 685
               }
             },
             {
@@ -17834,8 +17150,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 686,
-                'macro' => ''
+                'line_nr' => 686
               }
             },
             {
@@ -17860,8 +17175,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 687,
-                'macro' => ''
+                'line_nr' => 687
               }
             },
             {
@@ -17886,8 +17200,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 688,
-                'macro' => ''
+                'line_nr' => 688
               }
             },
             {
@@ -17912,8 +17225,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 689,
-                'macro' => ''
+                'line_nr' => 689
               }
             },
             {
@@ -17938,8 +17250,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 690,
-                'macro' => ''
+                'line_nr' => 690
               }
             },
             {
@@ -17964,8 +17275,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 691,
-                'macro' => ''
+                'line_nr' => 691
               }
             },
             {
@@ -17990,8 +17300,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 692,
-                'macro' => ''
+                'line_nr' => 692
               }
             },
             {
@@ -18016,8 +17325,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 693,
-                'macro' => ''
+                'line_nr' => 693
               }
             },
             {
@@ -18042,8 +17350,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 694,
-                'macro' => ''
+                'line_nr' => 694
               }
             },
             {
@@ -18068,8 +17375,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 695,
-                'macro' => ''
+                'line_nr' => 695
               }
             },
             {
@@ -18094,8 +17400,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 696,
-                'macro' => ''
+                'line_nr' => 696
               }
             },
             {
@@ -18120,8 +17425,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 697,
-                'macro' => ''
+                'line_nr' => 697
               }
             },
             {
@@ -18146,8 +17450,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 698,
-                'macro' => ''
+                'line_nr' => 698
               }
             },
             {
@@ -18172,8 +17475,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 699,
-                'macro' => ''
+                'line_nr' => 699
               }
             },
             {
@@ -18198,8 +17500,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 700,
-                'macro' => ''
+                'line_nr' => 700
               }
             },
             {
@@ -18224,8 +17525,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 701,
-                'macro' => ''
+                'line_nr' => 701
               }
             },
             {
@@ -18250,8 +17550,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 702,
-                'macro' => ''
+                'line_nr' => 702
               }
             },
             {
@@ -18276,8 +17575,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 703,
-                'macro' => ''
+                'line_nr' => 703
               }
             },
             {
@@ -18302,8 +17600,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 704,
-                'macro' => ''
+                'line_nr' => 704
               }
             },
             {
@@ -18328,8 +17625,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 705,
-                'macro' => ''
+                'line_nr' => 705
               }
             },
             {
@@ -18354,8 +17650,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 706,
-                'macro' => ''
+                'line_nr' => 706
               }
             },
             {
@@ -18380,8 +17675,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 707,
-                'macro' => ''
+                'line_nr' => 707
               }
             },
             {
@@ -18406,8 +17700,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 708,
-                'macro' => ''
+                'line_nr' => 708
               }
             },
             {
@@ -18432,8 +17725,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 709,
-                'macro' => ''
+                'line_nr' => 709
               }
             },
             {
@@ -18458,8 +17750,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 710,
-                'macro' => ''
+                'line_nr' => 710
               }
             },
             {
@@ -18484,8 +17775,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 711,
-                'macro' => ''
+                'line_nr' => 711
               }
             },
             {
@@ -18510,8 +17800,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 712,
-                'macro' => ''
+                'line_nr' => 712
               }
             },
             {
@@ -18536,8 +17825,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 713,
-                'macro' => ''
+                'line_nr' => 713
               }
             },
             {
@@ -18562,8 +17850,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 714,
-                'macro' => ''
+                'line_nr' => 714
               }
             },
             {
@@ -18588,8 +17875,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 715,
-                'macro' => ''
+                'line_nr' => 715
               }
             },
             {
@@ -18614,8 +17900,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 716,
-                'macro' => ''
+                'line_nr' => 716
               }
             },
             {
@@ -18640,8 +17925,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 717,
-                'macro' => ''
+                'line_nr' => 717
               }
             },
             {
@@ -18666,8 +17950,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 718,
-                'macro' => ''
+                'line_nr' => 718
               }
             },
             {
@@ -18692,8 +17975,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 719,
-                'macro' => ''
+                'line_nr' => 719
               }
             },
             {
@@ -18718,8 +18000,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 720,
-                'macro' => ''
+                'line_nr' => 720
               }
             },
             {
@@ -18744,8 +18025,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 721,
-                'macro' => ''
+                'line_nr' => 721
               }
             },
             {
@@ -18770,8 +18050,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 722,
-                'macro' => ''
+                'line_nr' => 722
               }
             },
             {
@@ -18796,8 +18075,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 723,
-                'macro' => ''
+                'line_nr' => 723
               }
             },
             {
@@ -18822,8 +18100,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 724,
-                'macro' => ''
+                'line_nr' => 724
               }
             },
             {
@@ -18848,8 +18125,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 725,
-                'macro' => ''
+                'line_nr' => 725
               }
             },
             {
@@ -18874,8 +18150,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 726,
-                'macro' => ''
+                'line_nr' => 726
               }
             },
             {
@@ -18900,8 +18175,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 727,
-                'macro' => ''
+                'line_nr' => 727
               }
             },
             {
@@ -18926,8 +18200,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 728,
-                'macro' => ''
+                'line_nr' => 728
               }
             },
             {
@@ -18952,8 +18225,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 729,
-                'macro' => ''
+                'line_nr' => 729
               }
             },
             {
@@ -18978,8 +18250,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 730,
-                'macro' => ''
+                'line_nr' => 730
               }
             },
             {
@@ -19004,8 +18275,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 731,
-                'macro' => ''
+                'line_nr' => 731
               }
             },
             {
@@ -19030,8 +18300,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 732,
-                'macro' => ''
+                'line_nr' => 732
               }
             },
             {
@@ -19056,8 +18325,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 733,
-                'macro' => ''
+                'line_nr' => 733
               }
             },
             {
@@ -19082,8 +18350,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 734,
-                'macro' => ''
+                'line_nr' => 734
               }
             },
             {
@@ -19108,8 +18375,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 735,
-                'macro' => ''
+                'line_nr' => 735
               }
             },
             {
@@ -19134,8 +18400,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 736,
-                'macro' => ''
+                'line_nr' => 736
               }
             },
             {
@@ -19160,8 +18425,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 737,
-                'macro' => ''
+                'line_nr' => 737
               }
             },
             {
@@ -19186,8 +18450,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 738,
-                'macro' => ''
+                'line_nr' => 738
               }
             },
             {
@@ -19212,8 +18475,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 739,
-                'macro' => ''
+                'line_nr' => 739
               }
             },
             {
@@ -19238,8 +18500,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 740,
-                'macro' => ''
+                'line_nr' => 740
               }
             },
             {
@@ -19264,8 +18525,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 741,
-                'macro' => ''
+                'line_nr' => 741
               }
             },
             {
@@ -19290,8 +18550,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 742,
-                'macro' => ''
+                'line_nr' => 742
               }
             },
             {
@@ -19316,8 +18575,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 743,
-                'macro' => ''
+                'line_nr' => 743
               }
             },
             {
@@ -19342,8 +18600,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 744,
-                'macro' => ''
+                'line_nr' => 744
               }
             },
             {
@@ -19368,8 +18625,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 745,
-                'macro' => ''
+                'line_nr' => 745
               }
             },
             {
@@ -19394,8 +18650,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 746,
-                'macro' => ''
+                'line_nr' => 746
               }
             },
             {
@@ -19420,8 +18675,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 747,
-                'macro' => ''
+                'line_nr' => 747
               }
             },
             {
@@ -19446,8 +18700,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 748,
-                'macro' => ''
+                'line_nr' => 748
               }
             },
             {
@@ -19472,8 +18725,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 749,
-                'macro' => ''
+                'line_nr' => 749
               }
             },
             {
@@ -19498,8 +18750,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 750,
-                'macro' => ''
+                'line_nr' => 750
               }
             },
             {
@@ -19524,8 +18775,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 751,
-                'macro' => ''
+                'line_nr' => 751
               }
             },
             {
@@ -19550,8 +18800,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 752,
-                'macro' => ''
+                'line_nr' => 752
               }
             },
             {
@@ -19576,8 +18825,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 753,
-                'macro' => ''
+                'line_nr' => 753
               }
             },
             {
@@ -19602,8 +18850,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 754,
-                'macro' => ''
+                'line_nr' => 754
               }
             },
             {
@@ -19628,8 +18875,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 755,
-                'macro' => ''
+                'line_nr' => 755
               }
             },
             {
@@ -19654,8 +18900,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 756,
-                'macro' => ''
+                'line_nr' => 756
               }
             },
             {
@@ -19680,8 +18925,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 757,
-                'macro' => ''
+                'line_nr' => 757
               }
             },
             {
@@ -19706,8 +18950,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 758,
-                'macro' => ''
+                'line_nr' => 758
               }
             },
             {
@@ -19732,8 +18975,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 759,
-                'macro' => ''
+                'line_nr' => 759
               }
             },
             {
@@ -19758,8 +19000,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 760,
-                'macro' => ''
+                'line_nr' => 760
               }
             },
             {
@@ -19784,8 +19025,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 761,
-                'macro' => ''
+                'line_nr' => 761
               }
             },
             {
@@ -19810,8 +19050,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 762,
-                'macro' => ''
+                'line_nr' => 762
               }
             },
             {
@@ -19836,8 +19075,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 763,
-                'macro' => ''
+                'line_nr' => 763
               }
             },
             {
@@ -19862,8 +19100,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 764,
-                'macro' => ''
+                'line_nr' => 764
               }
             },
             {
@@ -19888,8 +19125,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 765,
-                'macro' => ''
+                'line_nr' => 765
               }
             },
             {
@@ -19914,8 +19150,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 766,
-                'macro' => ''
+                'line_nr' => 766
               }
             },
             {
@@ -19940,8 +19175,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 767,
-                'macro' => ''
+                'line_nr' => 767
               }
             },
             {
@@ -19966,8 +19200,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 768,
-                'macro' => ''
+                'line_nr' => 768
               }
             },
             {
@@ -19992,8 +19225,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 769,
-                'macro' => ''
+                'line_nr' => 769
               }
             },
             {
@@ -20018,8 +19250,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 770,
-                'macro' => ''
+                'line_nr' => 770
               }
             },
             {
@@ -20044,8 +19275,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 771,
-                'macro' => ''
+                'line_nr' => 771
               }
             },
             {
@@ -20070,8 +19300,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 772,
-                'macro' => ''
+                'line_nr' => 772
               }
             },
             {
@@ -20096,8 +19325,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 773,
-                'macro' => ''
+                'line_nr' => 773
               }
             },
             {
@@ -20122,8 +19350,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 774,
-                'macro' => ''
+                'line_nr' => 774
               }
             },
             {
@@ -20148,8 +19375,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 775,
-                'macro' => ''
+                'line_nr' => 775
               }
             },
             {
@@ -20174,8 +19400,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 776,
-                'macro' => ''
+                'line_nr' => 776
               }
             },
             {
@@ -20200,8 +19425,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 777,
-                'macro' => ''
+                'line_nr' => 777
               }
             },
             {
@@ -20226,8 +19450,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 778,
-                'macro' => ''
+                'line_nr' => 778
               }
             },
             {
@@ -20252,8 +19475,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 779,
-                'macro' => ''
+                'line_nr' => 779
               }
             },
             {
@@ -20278,8 +19500,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 780,
-                'macro' => ''
+                'line_nr' => 780
               }
             },
             {
@@ -20304,8 +19525,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 781,
-                'macro' => ''
+                'line_nr' => 781
               }
             },
             {
@@ -20330,8 +19550,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 782,
-                'macro' => ''
+                'line_nr' => 782
               }
             },
             {
@@ -20356,8 +19575,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 783,
-                'macro' => ''
+                'line_nr' => 783
               }
             },
             {
@@ -20382,8 +19600,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 784,
-                'macro' => ''
+                'line_nr' => 784
               }
             },
             {
@@ -20408,8 +19625,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 785,
-                'macro' => ''
+                'line_nr' => 785
               }
             },
             {
@@ -20434,8 +19650,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 786,
-                'macro' => ''
+                'line_nr' => 786
               }
             },
             {
@@ -20460,8 +19675,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 787,
-                'macro' => ''
+                'line_nr' => 787
               }
             },
             {
@@ -20486,8 +19700,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 788,
-                'macro' => ''
+                'line_nr' => 788
               }
             },
             {
@@ -20512,8 +19725,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 789,
-                'macro' => ''
+                'line_nr' => 789
               }
             },
             {
@@ -20538,8 +19750,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 790,
-                'macro' => ''
+                'line_nr' => 790
               }
             },
             {
@@ -20564,8 +19775,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 791,
-                'macro' => ''
+                'line_nr' => 791
               }
             },
             {
@@ -20590,8 +19800,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 792,
-                'macro' => ''
+                'line_nr' => 792
               }
             },
             {
@@ -20616,8 +19825,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 793,
-                'macro' => ''
+                'line_nr' => 793
               }
             },
             {
@@ -20642,8 +19850,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 794,
-                'macro' => ''
+                'line_nr' => 794
               }
             },
             {
@@ -20668,8 +19875,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 795,
-                'macro' => ''
+                'line_nr' => 795
               }
             },
             {
@@ -20694,8 +19900,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 796,
-                'macro' => ''
+                'line_nr' => 796
               }
             },
             {
@@ -20720,8 +19925,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 797,
-                'macro' => ''
+                'line_nr' => 797
               }
             },
             {
@@ -20746,8 +19950,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 798,
-                'macro' => ''
+                'line_nr' => 798
               }
             },
             {
@@ -20772,8 +19975,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 799,
-                'macro' => ''
+                'line_nr' => 799
               }
             },
             {
@@ -20798,8 +20000,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 800,
-                'macro' => ''
+                'line_nr' => 800
               }
             },
             {
@@ -20824,8 +20025,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 801,
-                'macro' => ''
+                'line_nr' => 801
               }
             },
             {
@@ -20850,8 +20050,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 802,
-                'macro' => ''
+                'line_nr' => 802
               }
             },
             {
@@ -20876,8 +20075,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 803,
-                'macro' => ''
+                'line_nr' => 803
               }
             },
             {
@@ -20908,8 +20106,7 @@ $result_trees{'enumerate_more_letters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 804,
-                'macro' => ''
+                'line_nr' => 804
               }
             }
           ],
@@ -20923,8 +20120,7 @@ $result_trees{'enumerate_more_letters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/itemize/headitem_itemx_in_enumerate.pl 
b/tp/t/results/itemize/headitem_itemx_in_enumerate.pl
index 8609093a81..161064a932 100644
--- a/tp/t/results/itemize/headitem_itemx_in_enumerate.pl
+++ b/tp/t/results/itemize/headitem_itemx_in_enumerate.pl
@@ -64,8 +64,7 @@ $result_trees{'headitem_itemx_in_enumerate'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 },
                 {
@@ -87,8 +86,7 @@ $result_trees{'headitem_itemx_in_enumerate'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -119,8 +117,7 @@ $result_trees{'headitem_itemx_in_enumerate'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -129,8 +126,7 @@ $result_trees{'headitem_itemx_in_enumerate'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -159,7 +155,6 @@ $result_errors{'headitem_itemx_in_enumerate'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@itemx outside of table or list',
     'type' => 'error'
   },
@@ -168,7 +163,6 @@ $result_errors{'headitem_itemx_in_enumerate'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '@headitem not meaningful inside `@enumerate\' block',
     'type' => 'error'
   }
diff --git a/tp/t/results/itemize/headitem_itemx_in_itemize.pl 
b/tp/t/results/itemize/headitem_itemx_in_itemize.pl
index 709d64d137..27a41b1660 100644
--- a/tp/t/results/itemize/headitem_itemx_in_itemize.pl
+++ b/tp/t/results/itemize/headitem_itemx_in_itemize.pl
@@ -70,8 +70,7 @@ $result_trees{'headitem_itemx_in_itemize'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 },
                 {
@@ -93,8 +92,7 @@ $result_trees{'headitem_itemx_in_itemize'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -125,8 +123,7 @@ $result_trees{'headitem_itemx_in_itemize'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -135,8 +132,7 @@ $result_trees{'headitem_itemx_in_itemize'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -166,7 +162,6 @@ $result_errors{'headitem_itemx_in_itemize'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@itemx outside of table or list',
     'type' => 'error'
   },
@@ -175,7 +170,6 @@ $result_errors{'headitem_itemx_in_itemize'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '@headitem not meaningful inside `@itemize\' block',
     'type' => 'error'
   }
diff --git a/tp/t/results/itemize/inter_item_commands_in_enumerate.pl 
b/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
index 1fdaeb7bff..5c4c244f27 100644
--- a/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
@@ -44,8 +44,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -81,8 +80,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -114,8 +112,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -198,8 +195,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -230,8 +226,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
@@ -240,8 +235,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -303,8 +297,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 15,
-                    'macro' => ''
+                    'line_nr' => 15
                   },
                   'type' => 'index_entry_command'
                 },
@@ -338,8 +331,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -370,8 +362,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             }
           ],
@@ -380,8 +371,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -443,8 +433,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 22,
-                    'macro' => ''
+                    'line_nr' => 22
                   },
                   'type' => 'index_entry_command'
                 }
@@ -473,8 +462,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -505,8 +493,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             }
           ],
@@ -515,8 +502,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
@@ -573,8 +559,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 27,
-                    'macro' => ''
+                    'line_nr' => 27
                   },
                   'type' => 'index_entry_command'
                 },
@@ -608,8 +593,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             },
             {
@@ -640,8 +624,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             }
           ],
@@ -650,8 +633,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         },
         {
@@ -714,8 +696,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 34,
-                        'macro' => ''
+                        'line_nr' => 34
                       },
                       'type' => 'index_entry_command'
                     }
@@ -747,8 +728,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             },
             {
@@ -779,8 +759,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               }
             }
           ],
@@ -789,8 +768,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 32,
-            'macro' => ''
+            'line_nr' => 32
           }
         },
         {
@@ -847,8 +825,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 39,
-                    'macro' => ''
+                    'line_nr' => 39
                   },
                   'type' => 'index_entry_command'
                 },
@@ -895,8 +872,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 41,
-                    'macro' => ''
+                    'line_nr' => 41
                   },
                   'type' => 'index_entry_command'
                 },
@@ -933,8 +909,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 42,
-                    'macro' => ''
+                    'line_nr' => 42
                   },
                   'type' => 'index_entry_command'
                 }
@@ -963,8 +938,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               }
             },
             {
@@ -995,8 +969,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             }
           ],
@@ -1005,8 +978,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 38,
-            'macro' => ''
+            'line_nr' => 38
           }
         },
         {
@@ -1025,8 +997,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
diff --git a/tp/t/results/itemize/inter_item_commands_in_itemize.pl 
b/tp/t/results/itemize/inter_item_commands_in_itemize.pl
index 63bff36a24..5053069828 100644
--- a/tp/t/results/itemize/inter_item_commands_in_itemize.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_itemize.pl
@@ -44,8 +44,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -81,8 +80,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -114,8 +112,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -150,8 +147,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                   'cmdname' => 'minus',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   },
                   'type' => 'command_as_argument'
                 }
@@ -212,8 +208,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   },
                   'type' => 'index_entry_command'
                 }
@@ -242,8 +237,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -274,8 +268,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
@@ -289,8 +282,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -306,8 +298,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                   'cmdname' => 'bullet',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 13,
-                    'macro' => ''
+                    'line_nr' => 13
                   },
                   'type' => 'command_as_argument'
                 }
@@ -358,8 +349,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 14,
-                    'macro' => ''
+                    'line_nr' => 14
                   },
                   'type' => 'index_entry_command'
                 }
@@ -388,8 +378,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -438,8 +427,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 16,
-                    'macro' => ''
+                    'line_nr' => 16
                   },
                   'type' => 'index_entry_command'
                 },
@@ -458,8 +446,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -490,8 +477,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             }
           ],
@@ -505,8 +491,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -585,8 +570,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 23,
-                        'macro' => ''
+                        'line_nr' => 23
                       },
                       'type' => 'index_entry_command'
                     }
@@ -618,8 +602,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -650,8 +633,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               }
             }
           ],
@@ -660,8 +642,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         }
       ],
@@ -675,8 +656,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
diff --git a/tp/t/results/itemize/itemize_and_empty_lines.pl 
b/tp/t/results/itemize/itemize_and_empty_lines.pl
index cd8dee9fbd..c6afccdac3 100644
--- a/tp/t/results/itemize/itemize_and_empty_lines.pl
+++ b/tp/t/results/itemize/itemize_and_empty_lines.pl
@@ -50,8 +50,7 @@ $result_trees{'itemize_and_empty_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -122,15 +121,13 @@ $result_trees{'itemize_and_empty_lines'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     }
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 }
               ],
@@ -139,8 +136,7 @@ $result_trees{'itemize_and_empty_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -171,8 +167,7 @@ $result_trees{'itemize_and_empty_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -239,15 +234,13 @@ $result_trees{'itemize_and_empty_lines'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     }
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 14,
-                    'macro' => ''
+                    'line_nr' => 14
                   }
                 },
                 {
@@ -301,15 +294,13 @@ $result_trees{'itemize_and_empty_lines'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 19,
-                        'macro' => ''
+                        'line_nr' => 19
                       }
                     }
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 17,
-                    'macro' => ''
+                    'line_nr' => 17
                   }
                 },
                 {
@@ -323,8 +314,7 @@ $result_trees{'itemize_and_empty_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -391,15 +381,13 @@ $result_trees{'itemize_and_empty_lines'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 25,
-                        'macro' => ''
+                        'line_nr' => 25
                       }
                     }
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 23,
-                    'macro' => ''
+                    'line_nr' => 23
                   }
                 }
               ],
@@ -408,8 +396,7 @@ $result_trees{'itemize_and_empty_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -440,8 +427,7 @@ $result_trees{'itemize_and_empty_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             }
           ],
@@ -452,8 +438,7 @@ $result_trees{'itemize_and_empty_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -503,8 +488,7 @@ $result_trees{'itemize_and_empty_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             },
             {
@@ -575,15 +559,13 @@ $result_trees{'itemize_and_empty_lines'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 35,
-                        'macro' => ''
+                        'line_nr' => 35
                       }
                     }
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 31,
-                    'macro' => ''
+                    'line_nr' => 31
                   }
                 }
               ],
@@ -592,8 +574,7 @@ $result_trees{'itemize_and_empty_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -624,8 +605,7 @@ $result_trees{'itemize_and_empty_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               }
             },
             {
@@ -692,15 +672,13 @@ $result_trees{'itemize_and_empty_lines'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 43,
-                        'macro' => ''
+                        'line_nr' => 43
                       }
                     }
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 41,
-                    'macro' => ''
+                    'line_nr' => 41
                   }
                 }
               ],
@@ -709,8 +687,7 @@ $result_trees{'itemize_and_empty_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 39,
-                'macro' => ''
+                'line_nr' => 39
               }
             },
             {
@@ -772,15 +749,13 @@ $result_trees{'itemize_and_empty_lines'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 47,
-                        'macro' => ''
+                        'line_nr' => 47
                       }
                     }
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 45,
-                    'macro' => ''
+                    'line_nr' => 45
                   }
                 },
                 {
@@ -794,8 +769,7 @@ $result_trees{'itemize_and_empty_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             },
             {
@@ -862,15 +836,13 @@ $result_trees{'itemize_and_empty_lines'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 53,
-                        'macro' => ''
+                        'line_nr' => 53
                       }
                     }
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 51,
-                    'macro' => ''
+                    'line_nr' => 51
                   }
                 }
               ],
@@ -879,8 +851,7 @@ $result_trees{'itemize_and_empty_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             },
             {
@@ -911,8 +882,7 @@ $result_trees{'itemize_and_empty_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 54,
-                'macro' => ''
+                'line_nr' => 54
               }
             }
           ],
@@ -921,8 +891,7 @@ $result_trees{'itemize_and_empty_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 28,
-            'macro' => ''
+            'line_nr' => 28
           }
         },
         {
@@ -947,8 +916,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                   'cmdname' => 'minus',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 57,
-                    'macro' => ''
+                    'line_nr' => 57
                   },
                   'type' => 'command_as_argument'
                 }
@@ -990,8 +958,7 @@ $result_trees{'itemize_and_empty_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             },
             {
@@ -1022,8 +989,7 @@ $result_trees{'itemize_and_empty_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 60,
-                'macro' => ''
+                'line_nr' => 60
               }
             }
           ],
@@ -1037,8 +1003,7 @@ $result_trees{'itemize_and_empty_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 57,
-            'macro' => ''
+            'line_nr' => 57
           }
         },
         {
@@ -1077,8 +1042,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                   'cmdname' => 'minus',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 65,
-                    'macro' => ''
+                    'line_nr' => 65
                   },
                   'type' => 'command_as_argument'
                 }
@@ -1122,8 +1086,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                           'cmdname' => 'bullet',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 68,
-                            'macro' => ''
+                            'line_nr' => 68
                           },
                           'type' => 'command_as_argument'
                         }
@@ -1161,8 +1124,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 69,
-                        'macro' => ''
+                        'line_nr' => 69
                       }
                     },
                     {
@@ -1193,8 +1155,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 70,
-                        'macro' => ''
+                        'line_nr' => 70
                       }
                     }
                   ],
@@ -1208,8 +1169,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 68,
-                    'macro' => ''
+                    'line_nr' => 68
                   }
                 },
                 {
@@ -1227,8 +1187,7 @@ $result_trees{'itemize_and_empty_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 66,
-                'macro' => ''
+                'line_nr' => 66
               }
             },
             {
@@ -1259,8 +1218,7 @@ $result_trees{'itemize_and_empty_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 72,
-                'macro' => ''
+                'line_nr' => 72
               }
             }
           ],
@@ -1274,8 +1232,7 @@ $result_trees{'itemize_and_empty_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 65,
-            'macro' => ''
+            'line_nr' => 65
           }
         },
         {
@@ -1300,8 +1257,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                   'cmdname' => 'bullet',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 75,
-                    'macro' => ''
+                    'line_nr' => 75
                   },
                   'type' => 'command_as_argument'
                 }
@@ -1339,8 +1295,7 @@ $result_trees{'itemize_and_empty_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 76,
-                'macro' => ''
+                'line_nr' => 76
               }
             },
             {
@@ -1365,8 +1320,7 @@ $result_trees{'itemize_and_empty_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 77,
-                'macro' => ''
+                'line_nr' => 77
               }
             },
             {
@@ -1395,8 +1349,7 @@ $result_trees{'itemize_and_empty_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 78,
-                'macro' => ''
+                'line_nr' => 78
               }
             },
             {
@@ -1427,8 +1380,7 @@ $result_trees{'itemize_and_empty_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 80,
-                'macro' => ''
+                'line_nr' => 80
               }
             }
           ],
@@ -1442,8 +1394,7 @@ $result_trees{'itemize_and_empty_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 75,
-            'macro' => ''
+            'line_nr' => 75
           }
         }
       ],
diff --git a/tp/t/results/itemize/itemize_in_example.pl 
b/tp/t/results/itemize/itemize_in_example.pl
index 6e9ebaf1d3..8e69bc9fc8 100644
--- a/tp/t/results/itemize/itemize_in_example.pl
+++ b/tp/t/results/itemize/itemize_in_example.pl
@@ -31,8 +31,7 @@ $result_trees{'itemize_in_example'} = {
                       'cmdname' => 'bullet',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       },
                       'type' => 'command_as_argument'
                     }
@@ -79,8 +78,7 @@ $result_trees{'itemize_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 },
                 {
@@ -111,8 +109,7 @@ $result_trees{'itemize_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   }
                 }
               ],
@@ -126,8 +123,7 @@ $result_trees{'itemize_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -148,8 +144,7 @@ $result_trees{'itemize_in_example'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       },
                       'type' => 'command_as_argument'
                     }
@@ -187,8 +182,7 @@ $result_trees{'itemize_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 },
                 {
@@ -219,8 +213,7 @@ $result_trees{'itemize_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 }
               ],
@@ -234,8 +227,7 @@ $result_trees{'itemize_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -289,8 +281,7 @@ $result_trees{'itemize_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 13,
-                    'macro' => ''
+                    'line_nr' => 13
                   }
                 },
                 {
@@ -321,8 +312,7 @@ $result_trees{'itemize_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 14,
-                    'macro' => ''
+                    'line_nr' => 14
                   }
                 }
               ],
@@ -333,8 +323,7 @@ $result_trees{'itemize_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -388,8 +377,7 @@ $result_trees{'itemize_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 17,
-                    'macro' => ''
+                    'line_nr' => 17
                   }
                 },
                 {
@@ -420,8 +408,7 @@ $result_trees{'itemize_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 18,
-                    'macro' => ''
+                    'line_nr' => 18
                   }
                 }
               ],
@@ -432,8 +419,7 @@ $result_trees{'itemize_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -459,8 +445,7 @@ $result_trees{'itemize_in_example'} = {
                       'cmdname' => 'bullet',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     },
                     {
@@ -500,8 +485,7 @@ $result_trees{'itemize_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 21,
-                    'macro' => ''
+                    'line_nr' => 21
                   }
                 },
                 {
@@ -532,8 +516,7 @@ $result_trees{'itemize_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 22,
-                    'macro' => ''
+                    'line_nr' => 22
                   }
                 }
               ],
@@ -544,8 +527,7 @@ $result_trees{'itemize_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -576,15 +558,13 @@ $result_trees{'itemize_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/itemize/itemize_line_commands_with_brace.pl 
b/tp/t/results/itemize/itemize_line_commands_with_brace.pl
index 286549c46b..9d5e1fc14e 100644
--- a/tp/t/results/itemize/itemize_line_commands_with_brace.pl
+++ b/tp/t/results/itemize/itemize_line_commands_with_brace.pl
@@ -22,8 +22,7 @@ $result_trees{'itemize_line_commands_with_brace'} = {
                   'cmdname' => 'bullet',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'command_as_argument'
                 }
@@ -61,8 +60,7 @@ $result_trees{'itemize_line_commands_with_brace'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -93,8 +91,7 @@ $result_trees{'itemize_line_commands_with_brace'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -108,8 +105,7 @@ $result_trees{'itemize_line_commands_with_brace'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -130,8 +126,7 @@ $result_trees{'itemize_line_commands_with_brace'} = {
                   'cmdname' => 'minus',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   },
                   'type' => 'command_as_argument'
                 }
@@ -169,8 +164,7 @@ $result_trees{'itemize_line_commands_with_brace'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -201,8 +195,7 @@ $result_trees{'itemize_line_commands_with_brace'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -216,8 +209,7 @@ $result_trees{'itemize_line_commands_with_brace'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
diff --git a/tp/t/results/itemize/itemize_long_item.pl 
b/tp/t/results/itemize/itemize_long_item.pl
index 26081af84b..df277e6f90 100644
--- a/tp/t/results/itemize/itemize_long_item.pl
+++ b/tp/t/results/itemize/itemize_long_item.pl
@@ -50,8 +50,7 @@ $result_trees{'itemize_long_item'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -122,15 +121,13 @@ $result_trees{'itemize_long_item'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     }
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 }
               ],
@@ -139,8 +136,7 @@ $result_trees{'itemize_long_item'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -171,8 +167,7 @@ $result_trees{'itemize_long_item'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -239,15 +234,13 @@ $result_trees{'itemize_long_item'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     }
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 14,
-                    'macro' => ''
+                    'line_nr' => 14
                   }
                 }
               ],
@@ -256,8 +249,7 @@ $result_trees{'itemize_long_item'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -319,15 +311,13 @@ $result_trees{'itemize_long_item'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     }
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 18,
-                    'macro' => ''
+                    'line_nr' => 18
                   }
                 },
                 {
@@ -341,8 +331,7 @@ $result_trees{'itemize_long_item'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -409,15 +398,13 @@ $result_trees{'itemize_long_item'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 26,
-                        'macro' => ''
+                        'line_nr' => 26
                       }
                     }
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 24,
-                    'macro' => ''
+                    'line_nr' => 24
                   }
                 }
               ],
@@ -426,8 +413,7 @@ $result_trees{'itemize_long_item'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -458,8 +444,7 @@ $result_trees{'itemize_long_item'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             }
           ],
@@ -470,8 +455,7 @@ $result_trees{'itemize_long_item'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/itemize/lone_end_itemize.pl 
b/tp/t/results/itemize/lone_end_itemize.pl
index c5054d5f02..41221db7d4 100644
--- a/tp/t/results/itemize/lone_end_itemize.pl
+++ b/tp/t/results/itemize/lone_end_itemize.pl
@@ -25,7 +25,6 @@ $result_errors{'lone_end_itemize'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'unmatched `@end itemize\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/itemize/not_closed_item.pl 
b/tp/t/results/itemize/not_closed_item.pl
index def0d268a1..dac97c5a9d 100644
--- a/tp/t/results/itemize/not_closed_item.pl
+++ b/tp/t/results/itemize/not_closed_item.pl
@@ -51,8 +51,7 @@ $result_trees{'not_closed_item'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -61,8 +60,7 @@ $result_trees{'not_closed_item'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -87,7 +85,6 @@ $result_errors{'not_closed_item'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'no matching `@end itemize\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/itemize/not_closed_itemize.pl 
b/tp/t/results/itemize/not_closed_itemize.pl
index 741205b5ad..8dd4146e3d 100644
--- a/tp/t/results/itemize/not_closed_itemize.pl
+++ b/tp/t/results/itemize/not_closed_itemize.pl
@@ -33,8 +33,7 @@ $result_trees{'not_closed_itemize'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -57,7 +56,6 @@ $result_errors{'not_closed_itemize'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'no matching `@end itemize\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/itemize/table_in_itemize.pl 
b/tp/t/results/itemize/table_in_itemize.pl
index 3373984b1a..06a225d1be 100644
--- a/tp/t/results/itemize/table_in_itemize.pl
+++ b/tp/t/results/itemize/table_in_itemize.pl
@@ -17,8 +17,7 @@ $result_trees{'table_in_itemize'} = {
                   'cmdname' => 'bullet',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'command_as_argument'
                 }
@@ -56,8 +55,7 @@ $result_trees{'table_in_itemize'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -76,8 +74,7 @@ $result_trees{'table_in_itemize'} = {
                           'cmdname' => 'asis',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 4,
-                            'macro' => ''
+                            'line_nr' => 4
                           },
                           'type' => 'command_as_argument'
                         }
@@ -122,8 +119,7 @@ $result_trees{'table_in_itemize'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 5,
-                                'macro' => ''
+                                'line_nr' => 5
                               }
                             }
                           ],
@@ -189,8 +185,7 @@ $result_trees{'table_in_itemize'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 9,
-                                'macro' => ''
+                                'line_nr' => 9
                               }
                             }
                           ],
@@ -255,8 +250,7 @@ $result_trees{'table_in_itemize'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     }
                   ],
@@ -270,8 +264,7 @@ $result_trees{'table_in_itemize'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 }
               ],
@@ -280,8 +273,7 @@ $result_trees{'table_in_itemize'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -306,8 +298,7 @@ $result_trees{'table_in_itemize'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -332,8 +323,7 @@ $result_trees{'table_in_itemize'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
@@ -347,8 +337,7 @@ $result_trees{'table_in_itemize'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/itemize/w_argument.pl 
b/tp/t/results/itemize/w_argument.pl
index b484d336cd..dfcc48178b 100644
--- a/tp/t/results/itemize/w_argument.pl
+++ b/tp/t/results/itemize/w_argument.pl
@@ -22,8 +22,7 @@ $result_trees{'w_argument'} = {
                   'cmdname' => 'w',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'command_as_argument'
                 }
@@ -62,8 +61,7 @@ $result_trees{'w_argument'} = {
                       'cmdname' => 'option',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -79,8 +77,7 @@ $result_trees{'w_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -106,8 +103,7 @@ $result_trees{'w_argument'} = {
                       'cmdname' => 'option',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     },
                     {
@@ -123,8 +119,7 @@ $result_trees{'w_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -155,8 +150,7 @@ $result_trees{'w_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -170,8 +164,7 @@ $result_trees{'w_argument'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/languages/appendix_translated.pl 
b/tp/t/results/languages/appendix_translated.pl
index 399f79ba7a..9e2bbc37ba 100644
--- a/tp/t/results/languages/appendix_translated.pl
+++ b/tp/t/results/languages/appendix_translated.pl
@@ -39,8 +39,7 @@ $result_trees{'appendix_translated'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -83,8 +82,7 @@ $result_trees{'appendix_translated'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -120,8 +118,7 @@ $result_trees{'appendix_translated'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -159,8 +156,7 @@ $result_trees{'appendix_translated'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         }
       ],
@@ -174,8 +170,7 @@ $result_trees{'appendix_translated'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     }
   ],
diff --git a/tp/t/results/languages/command_translated.pl 
b/tp/t/results/languages/command_translated.pl
index ca836f038d..fe25efe402 100644
--- a/tp/t/results/languages/command_translated.pl
+++ b/tp/t/results/languages/command_translated.pl
@@ -39,8 +39,7 @@ $result_trees{'command_translated'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -83,8 +82,7 @@ $result_trees{'command_translated'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -103,8 +101,7 @@ $result_trees{'command_translated'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -135,8 +132,7 @@ $result_trees{'command_translated'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -160,8 +156,7 @@ $result_trees{'command_translated'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -180,8 +175,7 @@ $result_trees{'command_translated'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
@@ -206,8 +200,7 @@ $result_trees{'command_translated'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -238,8 +231,7 @@ $result_trees{'command_translated'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     }
   ],
diff --git a/tp/t/results/languages/documentlanguage.pl 
b/tp/t/results/languages/documentlanguage.pl
index 00cc213858..ec37689da3 100644
--- a/tp/t/results/languages/documentlanguage.pl
+++ b/tp/t/results/languages/documentlanguage.pl
@@ -239,8 +239,7 @@ $result_trees{'documentlanguage'} = {
               },
               'source_info' => {
                 'file_name' => 'documentlanguage.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -283,8 +282,7 @@ $result_trees{'documentlanguage'} = {
       },
       'source_info' => {
         'file_name' => 'documentlanguage.texi',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     {
@@ -320,8 +318,7 @@ $result_trees{'documentlanguage'} = {
       },
       'source_info' => {
         'file_name' => 'documentlanguage.texi',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
@@ -354,8 +351,7 @@ $result_trees{'documentlanguage'} = {
       },
       'source_info' => {
         'file_name' => 'documentlanguage.texi',
-        'line_nr' => 27,
-        'macro' => ''
+        'line_nr' => 27
       }
     },
     {
@@ -406,8 +402,7 @@ $result_trees{'documentlanguage'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'documentlanguage.texi',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -557,8 +552,7 @@ $result_trees{'documentlanguage'} = {
               },
               'source_info' => {
                 'file_name' => 'documentlanguage.texi',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               },
               'type' => 'def_line'
             },
@@ -604,8 +598,7 @@ $result_trees{'documentlanguage'} = {
               },
               'source_info' => {
                 'file_name' => 'documentlanguage.texi',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             }
           ],
@@ -616,8 +609,7 @@ $result_trees{'documentlanguage'} = {
           },
           'source_info' => {
             'file_name' => 'documentlanguage.texi',
-            'line_nr' => 32,
-            'macro' => ''
+            'line_nr' => 32
           }
         },
         {
@@ -655,8 +647,7 @@ $result_trees{'documentlanguage'} = {
           },
           'source_info' => {
             'file_name' => 'documentlanguage.texi',
-            'line_nr' => 36,
-            'macro' => ''
+            'line_nr' => 36
           }
         },
         {
@@ -675,8 +666,7 @@ $result_trees{'documentlanguage'} = {
       },
       'source_info' => {
         'file_name' => 'documentlanguage.texi',
-        'line_nr' => 28,
-        'macro' => ''
+        'line_nr' => 28
       }
     },
     {
diff --git a/tp/t/results/languages/documentlanguage_option.pl 
b/tp/t/results/languages/documentlanguage_option.pl
index c3a3cf7a28..2c2ef9740f 100644
--- a/tp/t/results/languages/documentlanguage_option.pl
+++ b/tp/t/results/languages/documentlanguage_option.pl
@@ -239,8 +239,7 @@ $result_trees{'documentlanguage_option'} = {
               },
               'source_info' => {
                 'file_name' => 'documentlanguage.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -283,8 +282,7 @@ $result_trees{'documentlanguage_option'} = {
       },
       'source_info' => {
         'file_name' => 'documentlanguage.texi',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     {
@@ -320,8 +318,7 @@ $result_trees{'documentlanguage_option'} = {
       },
       'source_info' => {
         'file_name' => 'documentlanguage.texi',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
@@ -354,8 +351,7 @@ $result_trees{'documentlanguage_option'} = {
       },
       'source_info' => {
         'file_name' => 'documentlanguage.texi',
-        'line_nr' => 27,
-        'macro' => ''
+        'line_nr' => 27
       }
     },
     {
@@ -406,8 +402,7 @@ $result_trees{'documentlanguage_option'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'documentlanguage.texi',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -557,8 +552,7 @@ $result_trees{'documentlanguage_option'} = {
               },
               'source_info' => {
                 'file_name' => 'documentlanguage.texi',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               },
               'type' => 'def_line'
             },
@@ -604,8 +598,7 @@ $result_trees{'documentlanguage_option'} = {
               },
               'source_info' => {
                 'file_name' => 'documentlanguage.texi',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             }
           ],
@@ -616,8 +609,7 @@ $result_trees{'documentlanguage_option'} = {
           },
           'source_info' => {
             'file_name' => 'documentlanguage.texi',
-            'line_nr' => 32,
-            'macro' => ''
+            'line_nr' => 32
           }
         },
         {
@@ -655,8 +647,7 @@ $result_trees{'documentlanguage_option'} = {
           },
           'source_info' => {
             'file_name' => 'documentlanguage.texi',
-            'line_nr' => 36,
-            'macro' => ''
+            'line_nr' => 36
           }
         },
         {
@@ -675,8 +666,7 @@ $result_trees{'documentlanguage_option'} = {
       },
       'source_info' => {
         'file_name' => 'documentlanguage.texi',
-        'line_nr' => 28,
-        'macro' => ''
+        'line_nr' => 28
       }
     },
     {
diff --git a/tp/t/results/languages/documentlanguage_unknown.pl 
b/tp/t/results/languages/documentlanguage_unknown.pl
index b50e43c429..608d8d0198 100644
--- a/tp/t/results/languages/documentlanguage_unknown.pl
+++ b/tp/t/results/languages/documentlanguage_unknown.pl
@@ -239,8 +239,7 @@ $result_trees{'documentlanguage_unknown'} = {
               },
               'source_info' => {
                 'file_name' => 'documentlanguage.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -283,8 +282,7 @@ $result_trees{'documentlanguage_unknown'} = {
       },
       'source_info' => {
         'file_name' => 'documentlanguage.texi',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     {
@@ -320,8 +318,7 @@ $result_trees{'documentlanguage_unknown'} = {
       },
       'source_info' => {
         'file_name' => 'documentlanguage.texi',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
@@ -354,8 +351,7 @@ $result_trees{'documentlanguage_unknown'} = {
       },
       'source_info' => {
         'file_name' => 'documentlanguage.texi',
-        'line_nr' => 27,
-        'macro' => ''
+        'line_nr' => 27
       }
     },
     {
@@ -406,8 +402,7 @@ $result_trees{'documentlanguage_unknown'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'documentlanguage.texi',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -557,8 +552,7 @@ $result_trees{'documentlanguage_unknown'} = {
               },
               'source_info' => {
                 'file_name' => 'documentlanguage.texi',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               },
               'type' => 'def_line'
             },
@@ -604,8 +598,7 @@ $result_trees{'documentlanguage_unknown'} = {
               },
               'source_info' => {
                 'file_name' => 'documentlanguage.texi',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             }
           ],
@@ -616,8 +609,7 @@ $result_trees{'documentlanguage_unknown'} = {
           },
           'source_info' => {
             'file_name' => 'documentlanguage.texi',
-            'line_nr' => 32,
-            'macro' => ''
+            'line_nr' => 32
           }
         },
         {
@@ -655,8 +647,7 @@ $result_trees{'documentlanguage_unknown'} = {
           },
           'source_info' => {
             'file_name' => 'documentlanguage.texi',
-            'line_nr' => 36,
-            'macro' => ''
+            'line_nr' => 36
           }
         },
         {
@@ -675,8 +666,7 @@ $result_trees{'documentlanguage_unknown'} = {
       },
       'source_info' => {
         'file_name' => 'documentlanguage.texi',
-        'line_nr' => 28,
-        'macro' => ''
+        'line_nr' => 28
       }
     },
     {
diff --git a/tp/t/results/languages/multiple_documentlanguage.pl 
b/tp/t/results/languages/multiple_documentlanguage.pl
index 59a2f451fb..d3887ee095 100644
--- a/tp/t/results/languages/multiple_documentlanguage.pl
+++ b/tp/t/results/languages/multiple_documentlanguage.pl
@@ -39,8 +39,7 @@ $result_trees{'multiple_documentlanguage'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -184,8 +183,7 @@ $result_trees{'multiple_documentlanguage'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       },
                       'type' => 'def_line'
                     },
@@ -202,8 +200,7 @@ $result_trees{'multiple_documentlanguage'} = {
                               'cmdname' => 'error',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 5,
-                                'macro' => ''
+                                'line_nr' => 5
                               }
                             },
                             {
@@ -244,8 +241,7 @@ $result_trees{'multiple_documentlanguage'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     }
                   ],
@@ -256,8 +252,7 @@ $result_trees{'multiple_documentlanguage'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 },
                 {
@@ -288,15 +283,13 @@ $result_trees{'multiple_documentlanguage'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -339,8 +332,7 @@ $result_trees{'multiple_documentlanguage'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -376,8 +368,7 @@ $result_trees{'multiple_documentlanguage'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -410,8 +401,7 @@ $result_trees{'multiple_documentlanguage'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -560,8 +550,7 @@ $result_trees{'multiple_documentlanguage'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               },
               'type' => 'def_line'
             },
@@ -578,8 +567,7 @@ $result_trees{'multiple_documentlanguage'} = {
                       'cmdname' => 'error',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -620,8 +608,7 @@ $result_trees{'multiple_documentlanguage'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             }
           ],
@@ -632,8 +619,7 @@ $result_trees{'multiple_documentlanguage'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         },
         {
@@ -669,8 +655,7 @@ $result_trees{'multiple_documentlanguage'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         },
         {
@@ -689,8 +674,7 @@ $result_trees{'multiple_documentlanguage'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 21,
-            'macro' => ''
+            'line_nr' => 21
           }
         },
         {
@@ -726,8 +710,7 @@ $result_trees{'multiple_documentlanguage'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           }
         },
         {
@@ -857,8 +840,7 @@ $result_trees{'multiple_documentlanguage'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               },
               'type' => 'def_line'
             },
@@ -875,8 +857,7 @@ $result_trees{'multiple_documentlanguage'} = {
                       'cmdname' => 'error',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 26,
-                        'macro' => ''
+                        'line_nr' => 26
                       }
                     },
                     {
@@ -917,8 +898,7 @@ $result_trees{'multiple_documentlanguage'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             }
           ],
@@ -929,8 +909,7 @@ $result_trees{'multiple_documentlanguage'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           }
         },
         {
@@ -949,8 +928,7 @@ $result_trees{'multiple_documentlanguage'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 29,
-            'macro' => ''
+            'line_nr' => 29
           }
         },
         {
@@ -988,8 +966,7 @@ $result_trees{'multiple_documentlanguage'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 31,
-            'macro' => ''
+            'line_nr' => 31
           }
         }
       ],
@@ -1003,8 +980,7 @@ $result_trees{'multiple_documentlanguage'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     }
   ],
diff --git a/tp/t/results/languages/multiple_in_preamble.pl 
b/tp/t/results/languages/multiple_in_preamble.pl
index 8776fa3b21..4597186df7 100644
--- a/tp/t/results/languages/multiple_in_preamble.pl
+++ b/tp/t/results/languages/multiple_in_preamble.pl
@@ -39,8 +39,7 @@ $result_trees{'multiple_in_preamble'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -184,8 +183,7 @@ $result_trees{'multiple_in_preamble'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       },
                       'type' => 'def_line'
                     },
@@ -202,8 +200,7 @@ $result_trees{'multiple_in_preamble'} = {
                               'cmdname' => 'error',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 5,
-                                'macro' => ''
+                                'line_nr' => 5
                               }
                             },
                             {
@@ -244,8 +241,7 @@ $result_trees{'multiple_in_preamble'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     }
                   ],
@@ -256,8 +252,7 @@ $result_trees{'multiple_in_preamble'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 },
                 {
@@ -288,15 +283,13 @@ $result_trees{'multiple_in_preamble'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -332,8 +325,7 @@ $result_trees{'multiple_in_preamble'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -376,8 +368,7 @@ $result_trees{'multiple_in_preamble'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -413,8 +404,7 @@ $result_trees{'multiple_in_preamble'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -446,8 +436,7 @@ $result_trees{'multiple_in_preamble'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -596,8 +585,7 @@ $result_trees{'multiple_in_preamble'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               },
               'type' => 'def_line'
             },
@@ -614,8 +602,7 @@ $result_trees{'multiple_in_preamble'} = {
                       'cmdname' => 'error',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       }
                     },
                     {
@@ -656,8 +643,7 @@ $result_trees{'multiple_in_preamble'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             }
           ],
@@ -668,8 +654,7 @@ $result_trees{'multiple_in_preamble'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -705,8 +690,7 @@ $result_trees{'multiple_in_preamble'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 21,
-            'macro' => ''
+            'line_nr' => 21
           }
         },
         {
@@ -836,8 +820,7 @@ $result_trees{'multiple_in_preamble'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               },
               'type' => 'def_line'
             },
@@ -869,8 +852,7 @@ $result_trees{'multiple_in_preamble'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             }
           ],
@@ -881,8 +863,7 @@ $result_trees{'multiple_in_preamble'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           }
         }
       ],
@@ -896,8 +877,7 @@ $result_trees{'multiple_in_preamble'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     }
   ],
diff --git a/tp/t/results/languages/multiple_in_preamble_before_node.pl 
b/tp/t/results/languages/multiple_in_preamble_before_node.pl
index db21a19982..461c5f30f1 100644
--- a/tp/t/results/languages/multiple_in_preamble_before_node.pl
+++ b/tp/t/results/languages/multiple_in_preamble_before_node.pl
@@ -39,8 +39,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -184,8 +183,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       },
                       'type' => 'def_line'
                     },
@@ -202,8 +200,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
                               'cmdname' => 'error',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 5,
-                                'macro' => ''
+                                'line_nr' => 5
                               }
                             },
                             {
@@ -244,8 +241,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     }
                   ],
@@ -256,8 +252,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 },
                 {
@@ -288,15 +283,13 @@ $result_trees{'multiple_in_preamble_before_node'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -332,8 +325,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -386,8 +378,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -427,8 +418,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -464,8 +454,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 16,
-        'macro' => ''
+        'line_nr' => 16
       }
     },
     {
@@ -497,8 +486,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -647,8 +635,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               },
               'type' => 'def_line'
             },
@@ -665,8 +652,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
                       'cmdname' => 'error',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -707,8 +693,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             }
           ],
@@ -719,8 +704,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 21,
-            'macro' => ''
+            'line_nr' => 21
           }
         }
       ],
@@ -734,8 +718,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 19,
-        'macro' => ''
+        'line_nr' => 19
       }
     }
   ],
diff --git a/tp/t/results/languages/multiple_lang_chapters.pl 
b/tp/t/results/languages/multiple_lang_chapters.pl
index 1cb036d59e..02a6bf1648 100644
--- a/tp/t/results/languages/multiple_lang_chapters.pl
+++ b/tp/t/results/languages/multiple_lang_chapters.pl
@@ -50,8 +50,7 @@ $result_trees{'multiple_lang_chapters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -118,15 +117,13 @@ $result_trees{'multiple_lang_chapters'} = {
                         },
                         'source_info' => {
                           'file_name' => '',
-                          'line_nr' => 7,
-                          'macro' => ''
+                          'line_nr' => 7
                         }
                       }
                     ],
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 5,
-                      'macro' => ''
+                      'line_nr' => 5
                     }
                   },
                   'sourcemark_type' => 'ignored_conditional_block'
@@ -148,8 +145,7 @@ $result_trees{'multiple_lang_chapters'} = {
                     'cmdname' => 'iflatex',
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 8,
-                      'macro' => ''
+                      'line_nr' => 8
                     }
                   },
                   'sourcemark_type' => 'expanded_conditional_command',
@@ -185,8 +181,7 @@ $result_trees{'multiple_lang_chapters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'source_marks' => [
                 {
@@ -219,8 +214,7 @@ $result_trees{'multiple_lang_chapters'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 10,
-                      'macro' => ''
+                      'line_nr' => 10
                     }
                   },
                   'sourcemark_type' => 'expanded_conditional_command',
@@ -268,8 +262,7 @@ $result_trees{'multiple_lang_chapters'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -353,8 +346,7 @@ $result_trees{'multiple_lang_chapters'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               },
               'type' => 'menu_entry'
             },
@@ -401,8 +393,7 @@ $result_trees{'multiple_lang_chapters'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               },
               'type' => 'menu_entry'
             },
@@ -449,8 +440,7 @@ $result_trees{'multiple_lang_chapters'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               },
               'type' => 'menu_entry'
             },
@@ -497,8 +487,7 @@ $result_trees{'multiple_lang_chapters'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               },
               'type' => 'menu_entry'
             },
@@ -545,8 +534,7 @@ $result_trees{'multiple_lang_chapters'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               },
               'type' => 'menu_entry'
             },
@@ -578,15 +566,13 @@ $result_trees{'multiple_lang_chapters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         },
         {
@@ -622,8 +608,7 @@ $result_trees{'multiple_lang_chapters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           }
         }
       ],
@@ -635,8 +620,7 @@ $result_trees{'multiple_lang_chapters'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -668,8 +652,7 @@ $result_trees{'multiple_lang_chapters'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     {
@@ -723,8 +706,7 @@ $result_trees{'multiple_lang_chapters'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             },
             {
@@ -856,8 +838,7 @@ $result_trees{'multiple_lang_chapters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               },
               'type' => 'def_line'
             },
@@ -889,8 +870,7 @@ $result_trees{'multiple_lang_chapters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             }
           ],
@@ -901,8 +881,7 @@ $result_trees{'multiple_lang_chapters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 28,
-            'macro' => ''
+            'line_nr' => 28
           }
         },
         {
@@ -938,8 +917,7 @@ $result_trees{'multiple_lang_chapters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 31,
-            'macro' => ''
+            'line_nr' => 31
           }
         }
       ],
@@ -953,8 +931,7 @@ $result_trees{'multiple_lang_chapters'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
@@ -986,8 +963,7 @@ $result_trees{'multiple_lang_chapters'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 32,
-        'macro' => ''
+        'line_nr' => 32
       }
     },
     {
@@ -1041,8 +1017,7 @@ $result_trees{'multiple_lang_chapters'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             },
             {
@@ -1174,8 +1149,7 @@ $result_trees{'multiple_lang_chapters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               },
               'type' => 'def_line'
             },
@@ -1207,8 +1181,7 @@ $result_trees{'multiple_lang_chapters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 37,
-                'macro' => ''
+                'line_nr' => 37
               }
             }
           ],
@@ -1219,8 +1192,7 @@ $result_trees{'multiple_lang_chapters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 36,
-            'macro' => ''
+            'line_nr' => 36
           }
         },
         {
@@ -1256,8 +1228,7 @@ $result_trees{'multiple_lang_chapters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 39,
-            'macro' => ''
+            'line_nr' => 39
           }
         }
       ],
@@ -1271,8 +1242,7 @@ $result_trees{'multiple_lang_chapters'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 33,
-        'macro' => ''
+        'line_nr' => 33
       }
     },
     {
@@ -1304,8 +1274,7 @@ $result_trees{'multiple_lang_chapters'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 40,
-        'macro' => ''
+        'line_nr' => 40
       }
     },
     {
@@ -1454,8 +1423,7 @@ $result_trees{'multiple_lang_chapters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               },
               'type' => 'def_line'
             },
@@ -1487,8 +1455,7 @@ $result_trees{'multiple_lang_chapters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             }
           ],
@@ -1499,8 +1466,7 @@ $result_trees{'multiple_lang_chapters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 43,
-            'macro' => ''
+            'line_nr' => 43
           }
         },
         {
@@ -1536,8 +1502,7 @@ $result_trees{'multiple_lang_chapters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 46,
-            'macro' => ''
+            'line_nr' => 46
           }
         }
       ],
@@ -1551,8 +1516,7 @@ $result_trees{'multiple_lang_chapters'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 41,
-        'macro' => ''
+        'line_nr' => 41
       }
     },
     {
@@ -1584,8 +1548,7 @@ $result_trees{'multiple_lang_chapters'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 47,
-        'macro' => ''
+        'line_nr' => 47
       }
     },
     {
@@ -1640,8 +1603,7 @@ $result_trees{'multiple_lang_chapters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 50,
-            'macro' => ''
+            'line_nr' => 50
           }
         }
       ],
@@ -1655,8 +1617,7 @@ $result_trees{'multiple_lang_chapters'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 48,
-        'macro' => ''
+        'line_nr' => 48
       }
     },
     {
@@ -1688,8 +1649,7 @@ $result_trees{'multiple_lang_chapters'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 51,
-        'macro' => ''
+        'line_nr' => 51
       }
     },
     {
@@ -1743,8 +1703,7 @@ $result_trees{'multiple_lang_chapters'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 54,
-                'macro' => ''
+                'line_nr' => 54
               }
             },
             {
@@ -1765,8 +1724,7 @@ $result_trees{'multiple_lang_chapters'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 52,
-        'macro' => ''
+        'line_nr' => 52
       }
     }
   ],
diff --git a/tp/t/results/languages/multiple_lang_chapters_latex.pl 
b/tp/t/results/languages/multiple_lang_chapters_latex.pl
index 6e4c8f7778..1f7752f6de 100644
--- a/tp/t/results/languages/multiple_lang_chapters_latex.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_latex.pl
@@ -50,8 +50,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -118,15 +117,13 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                         },
                         'source_info' => {
                           'file_name' => '',
-                          'line_nr' => 7,
-                          'macro' => ''
+                          'line_nr' => 7
                         }
                       }
                     ],
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 5,
-                      'macro' => ''
+                      'line_nr' => 5
                     }
                   },
                   'sourcemark_type' => 'ignored_conditional_block'
@@ -148,8 +145,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                     'cmdname' => 'iflatex',
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 8,
-                      'macro' => ''
+                      'line_nr' => 8
                     }
                   },
                   'sourcemark_type' => 'expanded_conditional_command',
@@ -185,8 +181,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'source_marks' => [
                 {
@@ -219,8 +214,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 10,
-                      'macro' => ''
+                      'line_nr' => 10
                     }
                   },
                   'sourcemark_type' => 'expanded_conditional_command',
@@ -268,8 +262,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -353,8 +346,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               },
               'type' => 'menu_entry'
             },
@@ -401,8 +393,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               },
               'type' => 'menu_entry'
             },
@@ -449,8 +440,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               },
               'type' => 'menu_entry'
             },
@@ -497,8 +487,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               },
               'type' => 'menu_entry'
             },
@@ -545,8 +534,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               },
               'type' => 'menu_entry'
             },
@@ -578,15 +566,13 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         },
         {
@@ -622,8 +608,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           }
         }
       ],
@@ -635,8 +620,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -668,8 +652,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     {
@@ -723,8 +706,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             },
             {
@@ -856,8 +838,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               },
               'type' => 'def_line'
             },
@@ -889,8 +870,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             }
           ],
@@ -901,8 +881,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 28,
-            'macro' => ''
+            'line_nr' => 28
           }
         },
         {
@@ -938,8 +917,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 31,
-            'macro' => ''
+            'line_nr' => 31
           }
         }
       ],
@@ -953,8 +931,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
@@ -986,8 +963,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 32,
-        'macro' => ''
+        'line_nr' => 32
       }
     },
     {
@@ -1041,8 +1017,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             },
             {
@@ -1174,8 +1149,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               },
               'type' => 'def_line'
             },
@@ -1207,8 +1181,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 37,
-                'macro' => ''
+                'line_nr' => 37
               }
             }
           ],
@@ -1219,8 +1192,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 36,
-            'macro' => ''
+            'line_nr' => 36
           }
         },
         {
@@ -1256,8 +1228,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 39,
-            'macro' => ''
+            'line_nr' => 39
           }
         }
       ],
@@ -1271,8 +1242,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 33,
-        'macro' => ''
+        'line_nr' => 33
       }
     },
     {
@@ -1304,8 +1274,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 40,
-        'macro' => ''
+        'line_nr' => 40
       }
     },
     {
@@ -1454,8 +1423,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               },
               'type' => 'def_line'
             },
@@ -1487,8 +1455,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             }
           ],
@@ -1499,8 +1466,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 43,
-            'macro' => ''
+            'line_nr' => 43
           }
         },
         {
@@ -1536,8 +1502,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 46,
-            'macro' => ''
+            'line_nr' => 46
           }
         }
       ],
@@ -1551,8 +1516,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 41,
-        'macro' => ''
+        'line_nr' => 41
       }
     },
     {
@@ -1584,8 +1548,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 47,
-        'macro' => ''
+        'line_nr' => 47
       }
     },
     {
@@ -1640,8 +1603,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 50,
-            'macro' => ''
+            'line_nr' => 50
           }
         }
       ],
@@ -1655,8 +1617,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 48,
-        'macro' => ''
+        'line_nr' => 48
       }
     },
     {
@@ -1688,8 +1649,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 51,
-        'macro' => ''
+        'line_nr' => 51
       }
     },
     {
@@ -1743,8 +1703,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 54,
-                'macro' => ''
+                'line_nr' => 54
               }
             },
             {
@@ -1765,8 +1724,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 52,
-        'macro' => ''
+        'line_nr' => 52
       }
     }
   ],
diff --git a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl 
b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
index 3417649344..636aa35ffe 100644
--- a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
@@ -50,8 +50,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -118,15 +117,13 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                         },
                         'source_info' => {
                           'file_name' => '',
-                          'line_nr' => 7,
-                          'macro' => ''
+                          'line_nr' => 7
                         }
                       }
                     ],
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 5,
-                      'macro' => ''
+                      'line_nr' => 5
                     }
                   },
                   'sourcemark_type' => 'ignored_conditional_block'
@@ -180,15 +177,13 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                         },
                         'source_info' => {
                           'file_name' => '',
-                          'line_nr' => 10,
-                          'macro' => ''
+                          'line_nr' => 10
                         }
                       }
                     ],
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 8,
-                      'macro' => ''
+                      'line_nr' => 8
                     }
                   },
                   'sourcemark_type' => 'ignored_conditional_block'
@@ -235,8 +230,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -320,8 +314,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               },
               'type' => 'menu_entry'
             },
@@ -368,8 +361,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               },
               'type' => 'menu_entry'
             },
@@ -416,8 +408,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               },
               'type' => 'menu_entry'
             },
@@ -464,8 +455,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               },
               'type' => 'menu_entry'
             },
@@ -512,8 +502,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               },
               'type' => 'menu_entry'
             },
@@ -545,15 +534,13 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         },
         {
@@ -589,8 +576,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           }
         }
       ],
@@ -602,8 +588,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -635,8 +620,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     {
@@ -690,8 +674,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             },
             {
@@ -823,8 +806,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               },
               'type' => 'def_line'
             },
@@ -856,8 +838,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             }
           ],
@@ -868,8 +849,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 28,
-            'macro' => ''
+            'line_nr' => 28
           }
         },
         {
@@ -905,8 +885,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 31,
-            'macro' => ''
+            'line_nr' => 31
           }
         }
       ],
@@ -920,8 +899,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
@@ -953,8 +931,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 32,
-        'macro' => ''
+        'line_nr' => 32
       }
     },
     {
@@ -1008,8 +985,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             },
             {
@@ -1141,8 +1117,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               },
               'type' => 'def_line'
             },
@@ -1174,8 +1149,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 37,
-                'macro' => ''
+                'line_nr' => 37
               }
             }
           ],
@@ -1186,8 +1160,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 36,
-            'macro' => ''
+            'line_nr' => 36
           }
         },
         {
@@ -1223,8 +1196,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 39,
-            'macro' => ''
+            'line_nr' => 39
           }
         }
       ],
@@ -1238,8 +1210,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 33,
-        'macro' => ''
+        'line_nr' => 33
       }
     },
     {
@@ -1271,8 +1242,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 40,
-        'macro' => ''
+        'line_nr' => 40
       }
     },
     {
@@ -1421,8 +1391,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               },
               'type' => 'def_line'
             },
@@ -1454,8 +1423,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             }
           ],
@@ -1466,8 +1434,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 43,
-            'macro' => ''
+            'line_nr' => 43
           }
         },
         {
@@ -1503,8 +1470,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 46,
-            'macro' => ''
+            'line_nr' => 46
           }
         }
       ],
@@ -1518,8 +1484,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 41,
-        'macro' => ''
+        'line_nr' => 41
       }
     },
     {
@@ -1551,8 +1516,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 47,
-        'macro' => ''
+        'line_nr' => 47
       }
     },
     {
@@ -1607,8 +1571,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 50,
-            'macro' => ''
+            'line_nr' => 50
           }
         }
       ],
@@ -1622,8 +1585,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 48,
-        'macro' => ''
+        'line_nr' => 48
       }
     },
     {
@@ -1655,8 +1617,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 51,
-        'macro' => ''
+        'line_nr' => 51
       }
     },
     {
@@ -1710,8 +1671,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 54,
-                'macro' => ''
+                'line_nr' => 54
               }
             },
             {
@@ -1732,8 +1692,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 52,
-        'macro' => ''
+        'line_nr' => 52
       }
     }
   ],
diff --git a/tp/t/results/languages/simple_documentlanguage.pl 
b/tp/t/results/languages/simple_documentlanguage.pl
index 08b5476db6..ac659b8815 100644
--- a/tp/t/results/languages/simple_documentlanguage.pl
+++ b/tp/t/results/languages/simple_documentlanguage.pl
@@ -39,8 +39,7 @@ $result_trees{'simple_documentlanguage'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -83,8 +82,7 @@ $result_trees{'simple_documentlanguage'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -233,8 +231,7 @@ $result_trees{'simple_documentlanguage'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'def_line'
             },
@@ -266,8 +263,7 @@ $result_trees{'simple_documentlanguage'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -278,8 +274,7 @@ $result_trees{'simple_documentlanguage'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         }
       ],
@@ -294,8 +289,7 @@ $result_trees{'simple_documentlanguage'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     }
   ],
diff --git a/tp/t/results/languages/unknown_language.pl 
b/tp/t/results/languages/unknown_language.pl
index 825006748c..052ae0f17e 100644
--- a/tp/t/results/languages/unknown_language.pl
+++ b/tp/t/results/languages/unknown_language.pl
@@ -39,8 +39,7 @@ $result_trees{'unknown_language'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -83,8 +82,7 @@ $result_trees{'unknown_language'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -120,8 +118,7 @@ $result_trees{'unknown_language'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -153,8 +150,7 @@ $result_trees{'unknown_language'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -208,8 +204,7 @@ $result_trees{'unknown_language'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -252,8 +247,7 @@ $result_trees{'unknown_language'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -288,8 +282,7 @@ $result_trees{'unknown_language'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -310,8 +303,7 @@ $result_trees{'unknown_language'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     }
   ],
@@ -451,7 +443,6 @@ $result_errors{'unknown_language'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'unknown is not a valid language code',
     'type' => 'warning'
   },
@@ -460,7 +451,6 @@ $result_errors{'unknown_language'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'another is not a valid language code',
     'type' => 'warning'
   },
@@ -469,7 +459,6 @@ $result_errors{'unknown_language'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'UNKNOWN is not a valid region code',
     'type' => 'warning'
   }
diff --git a/tp/t/results/languages/unknown_region.pl 
b/tp/t/results/languages/unknown_region.pl
index 29790583cc..afff2cc91b 100644
--- a/tp/t/results/languages/unknown_region.pl
+++ b/tp/t/results/languages/unknown_region.pl
@@ -39,8 +39,7 @@ $result_trees{'unknown_region'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -83,8 +82,7 @@ $result_trees{'unknown_region'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -233,8 +231,7 @@ $result_trees{'unknown_region'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'def_line'
             },
@@ -266,8 +263,7 @@ $result_trees{'unknown_region'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -278,8 +274,7 @@ $result_trees{'unknown_region'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         }
       ],
@@ -294,8 +289,7 @@ $result_trees{'unknown_region'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     }
   ],
@@ -360,7 +354,6 @@ $result_errors{'unknown_region'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'NOWHERE is not a valid region code',
     'type' => 'warning'
   }
diff --git a/tp/t/results/latex_tests/anchor_before_top.pl 
b/tp/t/results/latex_tests/anchor_before_top.pl
index 798713a339..e770f524e9 100644
--- a/tp/t/results/latex_tests/anchor_before_top.pl
+++ b/tp/t/results/latex_tests/anchor_before_top.pl
@@ -40,8 +40,7 @@ $result_trees{'anchor_before_top'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -86,8 +85,7 @@ $result_trees{'anchor_before_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -123,8 +121,7 @@ $result_trees{'anchor_before_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -156,8 +153,7 @@ $result_trees{'anchor_before_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -208,8 +204,7 @@ $result_trees{'anchor_before_top'} = {
               'cmdname' => 'pxref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -230,8 +225,7 @@ $result_trees{'anchor_before_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     }
   ],
diff --git a/tp/t/results/latex_tests/anchor_in_copying.pl 
b/tp/t/results/latex_tests/anchor_in_copying.pl
index 2064c79a0a..a48a9308af 100644
--- a/tp/t/results/latex_tests/anchor_in_copying.pl
+++ b/tp/t/results/latex_tests/anchor_in_copying.pl
@@ -51,8 +51,7 @@ $result_trees{'anchor_in_copying'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -90,15 +89,13 @@ $result_trees{'anchor_in_copying'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -141,8 +138,7 @@ $result_trees{'anchor_in_copying'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -178,8 +174,7 @@ $result_trees{'anchor_in_copying'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -211,8 +206,7 @@ $result_trees{'anchor_in_copying'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -263,8 +257,7 @@ $result_trees{'anchor_in_copying'} = {
               'cmdname' => 'pxref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -285,8 +278,7 @@ $result_trees{'anchor_in_copying'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     }
   ],
diff --git a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_chap.pl 
b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_chap.pl
index 816188f017..67c7df3f05 100644
--- a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_chap.pl
+++ b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_chap.pl
@@ -51,8 +51,7 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -90,15 +89,13 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -141,8 +138,7 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -178,8 +174,7 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -211,8 +206,7 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -263,8 +257,7 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
               'cmdname' => 'pxref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -290,8 +283,7 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -323,8 +315,7 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
               'cmdname' => 'pxref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -345,8 +336,7 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     }
   ],
diff --git 
a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage.pl 
b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage.pl
index f869bb3ce8..5543387240 100644
--- a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage.pl
+++ b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage.pl
@@ -51,8 +51,7 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -90,15 +89,13 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -145,8 +142,7 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   }
                 },
                 {
@@ -185,8 +181,7 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 },
                 {
@@ -205,8 +200,7 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
                   'cmdname' => 'insertcopying',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 },
                 {
@@ -237,15 +231,13 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -288,8 +280,7 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -325,8 +316,7 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -358,8 +348,7 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 16,
-        'macro' => ''
+        'line_nr' => 16
       }
     },
     {
@@ -410,8 +399,7 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
               'cmdname' => 'pxref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -440,8 +428,7 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
               'cmdname' => 'pxref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -462,8 +449,7 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     }
   ],
diff --git 
a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage_chap.pl 
b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage_chap.pl
index 277824584f..8015029f34 100644
--- a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage_chap.pl
+++ b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage_chap.pl
@@ -51,8 +51,7 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -90,15 +89,13 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -145,8 +142,7 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   }
                 },
                 {
@@ -175,8 +171,7 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
                   'cmdname' => 'insertcopying',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 },
                 {
@@ -207,15 +202,13 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -258,8 +251,7 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -295,8 +287,7 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -328,8 +319,7 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -380,8 +370,7 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
               'cmdname' => 'pxref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -407,8 +396,7 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
@@ -440,8 +428,7 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
               'cmdname' => 'pxref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -462,8 +449,7 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 16,
-        'macro' => ''
+        'line_nr' => 16
       }
     }
   ],
diff --git 
a/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl 
b/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
index fe94b23d0a..9ecbde6a3a 100644
--- a/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
+++ b/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
@@ -63,8 +63,7 @@ $result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} 
= {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -92,8 +91,7 @@ $result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} 
= {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -125,8 +123,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -177,8 +174,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -203,8 +199,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -255,8 +250,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -284,8 +278,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -317,8 +310,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -369,8 +361,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -416,8 +407,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           }
         },
         {
@@ -444,8 +434,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -474,8 +463,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               }
             },
             {
@@ -504,8 +492,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             },
             {
@@ -534,8 +521,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             },
             {
@@ -580,8 +566,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 29,
-            'macro' => ''
+            'line_nr' => 29
           }
         },
         {
@@ -608,8 +593,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -638,8 +622,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               }
             },
             {
@@ -668,8 +651,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               }
             },
             {
@@ -698,8 +680,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               }
             },
             {
@@ -720,8 +701,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     }
   ],
@@ -923,7 +903,6 @@ 
$result_errors{'anchor_links_xref_xrefautomaticsectiontitle'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'node `node before\' unreferenced',
     'type' => 'warning'
   },
@@ -932,7 +911,6 @@ 
$result_errors{'anchor_links_xref_xrefautomaticsectiontitle'} = [
 ',
     'file_name' => '',
     'line_nr' => 12,
-    'macro' => '',
     'text' => 'node `after\' unreferenced',
     'type' => 'warning'
   }
diff --git a/tp/t/results/latex_tests/backslash_math.pl 
b/tp/t/results/latex_tests/backslash_math.pl
index 38098f4272..860906e5ef 100644
--- a/tp/t/results/latex_tests/backslash_math.pl
+++ b/tp/t/results/latex_tests/backslash_math.pl
@@ -36,8 +36,7 @@ $result_trees{'backslash_math'} = {
                       'cmdname' => 'backslashchar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     },
                     {
@@ -50,8 +49,7 @@ $result_trees{'backslash_math'} = {
               'cmdname' => 'math',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
diff --git a/tp/t/results/latex_tests/brace_in_index.pl 
b/tp/t/results/latex_tests/brace_in_index.pl
index 97874292f0..cdc44f61c3 100644
--- a/tp/t/results/latex_tests/brace_in_index.pl
+++ b/tp/t/results/latex_tests/brace_in_index.pl
@@ -45,8 +45,7 @@ $result_trees{'brace_in_index'} = {
               'cmdname' => 'math',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -110,15 +109,13 @@ $result_trees{'brace_in_index'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -158,8 +155,7 @@ $result_trees{'brace_in_index'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           },
           'type' => 'index_entry_command'
         },
@@ -186,8 +182,7 @@ $result_trees{'brace_in_index'} = {
                   'cmdname' => 'math',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 }
               ],
@@ -215,8 +210,7 @@ $result_trees{'brace_in_index'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           },
           'type' => 'index_entry_command'
         },
@@ -243,8 +237,7 @@ $result_trees{'brace_in_index'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 13,
-                    'macro' => ''
+                    'line_nr' => 13
                   }
                 }
               ],
@@ -272,8 +265,7 @@ $result_trees{'brace_in_index'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           },
           'type' => 'index_entry_command'
         },
@@ -372,8 +364,7 @@ $result_trees{'brace_in_index'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               },
               'type' => 'def_line'
             },
@@ -419,8 +410,7 @@ $result_trees{'brace_in_index'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             }
           ],
@@ -431,8 +421,7 @@ $result_trees{'brace_in_index'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         }
       ],
@@ -482,7 +471,6 @@ $result_errors{'brace_in_index'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -491,7 +479,6 @@ $result_errors{'brace_in_index'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -500,7 +487,6 @@ $result_errors{'brace_in_index'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -509,7 +495,6 @@ $result_errors{'brace_in_index'} = [
 ',
     'file_name' => '',
     'line_nr' => 15,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/latex_tests/custom_heading_with_include.pl 
b/tp/t/results/latex_tests/custom_heading_with_include.pl
index 3d7f9f341d..07b27f1460 100644
--- a/tp/t/results/latex_tests/custom_heading_with_include.pl
+++ b/tp/t/results/latex_tests/custom_heading_with_include.pl
@@ -41,8 +41,7 @@ $result_trees{'custom_heading_with_include'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -94,8 +93,7 @@ $result_trees{'custom_heading_with_include'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -138,8 +136,7 @@ $result_trees{'custom_heading_with_include'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -177,8 +174,7 @@ $result_trees{'custom_heading_with_include'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -195,8 +191,7 @@ $result_trees{'custom_heading_with_include'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -228,8 +223,7 @@ $result_trees{'custom_heading_with_include'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -303,8 +297,7 @@ $result_trees{'custom_heading_with_include'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 13,
-                  'macro' => ''
+                  'line_nr' => 13
                 }
               },
               'sourcemark_type' => 'include',
@@ -411,8 +404,7 @@ $result_trees{'custom_heading_with_include'} = {
                     },
                     'source_info' => {
                       'file_name' => 'section_file.texi',
-                      'line_nr' => 10,
-                      'macro' => ''
+                      'line_nr' => 10
                     }
                   }
                 ],
@@ -423,8 +415,7 @@ $result_trees{'custom_heading_with_include'} = {
                 },
                 'source_info' => {
                   'file_name' => 'section_file.texi',
-                  'line_nr' => 3,
-                  'macro' => ''
+                  'line_nr' => 3
                 }
               },
               'position' => 1,
@@ -451,8 +442,7 @@ $result_trees{'custom_heading_with_include'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -484,8 +474,7 @@ $result_trees{'custom_heading_with_include'} = {
       },
       'source_info' => {
         'file_name' => 'section_file.texi',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -569,8 +558,7 @@ $result_trees{'custom_heading_with_include'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_file.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               },
               'type' => 'menu_entry'
             },
@@ -602,15 +590,13 @@ $result_trees{'custom_heading_with_include'} = {
               },
               'source_info' => {
                 'file_name' => 'section_file.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             }
           ],
           'source_info' => {
             'file_name' => 'section_file.texi',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         },
         {
@@ -629,8 +615,7 @@ $result_trees{'custom_heading_with_include'} = {
       },
       'source_info' => {
         'file_name' => 'section_file.texi',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -662,8 +647,7 @@ $result_trees{'custom_heading_with_include'} = {
       },
       'source_info' => {
         'file_name' => 'section_file.texi',
-        'line_nr' => 19,
-        'macro' => ''
+        'line_nr' => 19
       }
     },
     {
@@ -747,8 +731,7 @@ $result_trees{'custom_heading_with_include'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_file.texi',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               },
               'type' => 'menu_entry'
             },
@@ -780,15 +763,13 @@ $result_trees{'custom_heading_with_include'} = {
               },
               'source_info' => {
                 'file_name' => 'section_file.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             }
           ],
           'source_info' => {
             'file_name' => 'section_file.texi',
-            'line_nr' => 22,
-            'macro' => ''
+            'line_nr' => 22
           }
         },
         {
@@ -807,8 +788,7 @@ $result_trees{'custom_heading_with_include'} = {
       },
       'source_info' => {
         'file_name' => 'section_file.texi',
-        'line_nr' => 20,
-        'macro' => ''
+        'line_nr' => 20
       }
     },
     {
@@ -840,8 +820,7 @@ $result_trees{'custom_heading_with_include'} = {
       },
       'source_info' => {
         'file_name' => 'section_file.texi',
-        'line_nr' => 26,
-        'macro' => ''
+        'line_nr' => 26
       }
     },
     {
@@ -944,8 +923,7 @@ $result_trees{'custom_heading_with_include'} = {
                     },
                     'source_info' => {
                       'file_name' => 'section_file.texi',
-                      'line_nr' => 36,
-                      'macro' => ''
+                      'line_nr' => 36
                     }
                   }
                 ],
@@ -956,8 +934,7 @@ $result_trees{'custom_heading_with_include'} = {
                 },
                 'source_info' => {
                   'file_name' => 'section_file.texi',
-                  'line_nr' => 29,
-                  'macro' => ''
+                  'line_nr' => 29
                 }
               },
               'position' => 1,
@@ -1029,8 +1006,7 @@ $result_trees{'custom_heading_with_include'} = {
                     },
                     'source_info' => {
                       'file_name' => 'section_file.texi',
-                      'line_nr' => 41,
-                      'macro' => ''
+                      'line_nr' => 41
                     }
                   }
                 ],
@@ -1041,8 +1017,7 @@ $result_trees{'custom_heading_with_include'} = {
                 },
                 'source_info' => {
                   'file_name' => 'section_file.texi',
-                  'line_nr' => 38,
-                  'macro' => ''
+                  'line_nr' => 38
                 }
               },
               'position' => 1,
@@ -1091,8 +1066,7 @@ $result_trees{'custom_heading_with_include'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 15,
-                  'macro' => ''
+                  'line_nr' => 15
                 }
               },
               'position' => 1,
@@ -1120,8 +1094,7 @@ $result_trees{'custom_heading_with_include'} = {
       },
       'source_info' => {
         'file_name' => 'section_file.texi',
-        'line_nr' => 27,
-        'macro' => ''
+        'line_nr' => 27
       }
     },
     {
@@ -1159,8 +1132,7 @@ $result_trees{'custom_heading_with_include'} = {
       },
       'source_info' => {
         'file_name' => 'section_file_no_node.texi',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -1198,8 +1170,7 @@ $result_trees{'custom_heading_with_include'} = {
       },
       'source_info' => {
         'file_name' => 'section_file_no_node.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -1277,8 +1248,7 @@ $result_trees{'custom_heading_with_include'} = {
                     },
                     'source_info' => {
                       'file_name' => 'section_file_no_node.texi',
-                      'line_nr' => 10,
-                      'macro' => ''
+                      'line_nr' => 10
                     }
                   }
                 ],
@@ -1289,8 +1259,7 @@ $result_trees{'custom_heading_with_include'} = {
                 },
                 'source_info' => {
                   'file_name' => 'section_file_no_node.texi',
-                  'line_nr' => 8,
-                  'macro' => ''
+                  'line_nr' => 8
                 }
               },
               'position' => 1,
@@ -1346,8 +1315,7 @@ $result_trees{'custom_heading_with_include'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 17,
-                  'macro' => ''
+                  'line_nr' => 17
                 }
               },
               'position' => 1,
@@ -1375,8 +1343,7 @@ $result_trees{'custom_heading_with_include'} = {
       },
       'source_info' => {
         'file_name' => 'section_file_no_node.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -1414,8 +1381,7 @@ $result_trees{'custom_heading_with_include'} = {
       },
       'source_info' => {
         'file_name' => 'section_file_no_node_include.texi',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -1453,8 +1419,7 @@ $result_trees{'custom_heading_with_include'} = {
       },
       'source_info' => {
         'file_name' => 'section_file_no_node_include.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -1532,8 +1497,7 @@ $result_trees{'custom_heading_with_include'} = {
                     },
                     'source_info' => {
                       'file_name' => 'section_file_no_node_include.texi',
-                      'line_nr' => 10,
-                      'macro' => ''
+                      'line_nr' => 10
                     }
                   }
                 ],
@@ -1544,8 +1508,7 @@ $result_trees{'custom_heading_with_include'} = {
                 },
                 'source_info' => {
                   'file_name' => 'section_file_no_node_include.texi',
-                  'line_nr' => 8,
-                  'macro' => ''
+                  'line_nr' => 8
                 }
               },
               'position' => 1,
@@ -1602,8 +1565,7 @@ $result_trees{'custom_heading_with_include'} = {
                 },
                 'source_info' => {
                   'file_name' => 'section_file_no_node_include.texi',
-                  'line_nr' => 14,
-                  'macro' => ''
+                  'line_nr' => 14
                 }
               },
               'position' => 1,
@@ -1631,8 +1593,7 @@ $result_trees{'custom_heading_with_include'} = {
       },
       'source_info' => {
         'file_name' => 'section_file_no_node_include.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -1670,8 +1631,7 @@ $result_trees{'custom_heading_with_include'} = {
       },
       'source_info' => {
         'file_name' => 'section_file_no_node.texi',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -1709,8 +1669,7 @@ $result_trees{'custom_heading_with_include'} = {
       },
       'source_info' => {
         'file_name' => 'section_file_no_node.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -1788,8 +1747,7 @@ $result_trees{'custom_heading_with_include'} = {
                     },
                     'source_info' => {
                       'file_name' => 'section_file_no_node.texi',
-                      'line_nr' => 10,
-                      'macro' => ''
+                      'line_nr' => 10
                     }
                   }
                 ],
@@ -1800,8 +1758,7 @@ $result_trees{'custom_heading_with_include'} = {
                 },
                 'source_info' => {
                   'file_name' => 'section_file_no_node.texi',
-                  'line_nr' => 8,
-                  'macro' => ''
+                  'line_nr' => 8
                 }
               },
               'position' => 1,
@@ -1870,8 +1827,7 @@ $result_trees{'custom_heading_with_include'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 19,
-                  'macro' => ''
+                  'line_nr' => 19
                 }
               },
               'position' => 1,
@@ -1899,8 +1855,7 @@ $result_trees{'custom_heading_with_include'} = {
       },
       'source_info' => {
         'file_name' => 'section_file_no_node.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -1938,8 +1893,7 @@ $result_trees{'custom_heading_with_include'} = {
       },
       'source_info' => {
         'file_name' => 'section_file_no_node.texi',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -1977,8 +1931,7 @@ $result_trees{'custom_heading_with_include'} = {
       },
       'source_info' => {
         'file_name' => 'section_file_no_node.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -2056,8 +2009,7 @@ $result_trees{'custom_heading_with_include'} = {
                     },
                     'source_info' => {
                       'file_name' => 'section_file_no_node.texi',
-                      'line_nr' => 10,
-                      'macro' => ''
+                      'line_nr' => 10
                     }
                   }
                 ],
@@ -2068,8 +2020,7 @@ $result_trees{'custom_heading_with_include'} = {
                 },
                 'source_info' => {
                   'file_name' => 'section_file_no_node.texi',
-                  'line_nr' => 8,
-                  'macro' => ''
+                  'line_nr' => 8
                 }
               },
               'position' => 1,
@@ -2109,8 +2060,7 @@ $result_trees{'custom_heading_with_include'} = {
       },
       'source_info' => {
         'file_name' => 'section_file_no_node.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -2142,8 +2092,7 @@ $result_trees{'custom_heading_with_include'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 21,
-        'macro' => ''
+        'line_nr' => 21
       }
     },
     {
@@ -2181,8 +2130,7 @@ $result_trees{'custom_heading_with_include'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 22,
-        'macro' => ''
+        'line_nr' => 22
       }
     }
   ],
diff --git a/tp/t/results/latex_tests/custom_heading_with_include_in_command.pl 
b/tp/t/results/latex_tests/custom_heading_with_include_in_command.pl
index 391dc686bb..b37117c0a4 100644
--- a/tp/t/results/latex_tests/custom_heading_with_include_in_command.pl
+++ b/tp/t/results/latex_tests/custom_heading_with_include_in_command.pl
@@ -41,8 +41,7 @@ $result_trees{'custom_heading_with_include_in_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -69,8 +68,7 @@ $result_trees{'custom_heading_with_include_in_command'} = {
                       'cmdname' => 'emph',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -109,8 +107,7 @@ $result_trees{'custom_heading_with_include_in_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -153,8 +150,7 @@ $result_trees{'custom_heading_with_include_in_command'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -192,8 +188,7 @@ $result_trees{'custom_heading_with_include_in_command'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -210,8 +205,7 @@ $result_trees{'custom_heading_with_include_in_command'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -243,8 +237,7 @@ $result_trees{'custom_heading_with_include_in_command'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -318,8 +311,7 @@ $result_trees{'custom_heading_with_include_in_command'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 13,
-                  'macro' => ''
+                  'line_nr' => 13
                 }
               },
               'sourcemark_type' => 'include',
@@ -426,8 +418,7 @@ $result_trees{'custom_heading_with_include_in_command'} = {
                     },
                     'source_info' => {
                       'file_name' => 'section_file.texi',
-                      'line_nr' => 10,
-                      'macro' => ''
+                      'line_nr' => 10
                     }
                   }
                 ],
@@ -438,8 +429,7 @@ $result_trees{'custom_heading_with_include_in_command'} = {
                 },
                 'source_info' => {
                   'file_name' => 'section_file.texi',
-                  'line_nr' => 3,
-                  'macro' => ''
+                  'line_nr' => 3
                 }
               },
               'position' => 1,
@@ -466,8 +456,7 @@ $result_trees{'custom_heading_with_include_in_command'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -499,8 +488,7 @@ $result_trees{'custom_heading_with_include_in_command'} = {
       },
       'source_info' => {
         'file_name' => 'section_file.texi',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -584,8 +572,7 @@ $result_trees{'custom_heading_with_include_in_command'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_file.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               },
               'type' => 'menu_entry'
             },
@@ -617,15 +604,13 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
               },
               'source_info' => {
                 'file_name' => 'section_file.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             }
           ],
           'source_info' => {
             'file_name' => 'section_file.texi',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         },
         {
@@ -644,8 +629,7 @@ $result_trees{'custom_heading_with_include_in_command'} = {
       },
       'source_info' => {
         'file_name' => 'section_file.texi',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -677,8 +661,7 @@ $result_trees{'custom_heading_with_include_in_command'} = {
       },
       'source_info' => {
         'file_name' => 'section_file.texi',
-        'line_nr' => 19,
-        'macro' => ''
+        'line_nr' => 19
       }
     },
     {
@@ -762,8 +745,7 @@ $result_trees{'custom_heading_with_include_in_command'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_file.texi',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               },
               'type' => 'menu_entry'
             },
@@ -795,15 +777,13 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
               },
               'source_info' => {
                 'file_name' => 'section_file.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             }
           ],
           'source_info' => {
             'file_name' => 'section_file.texi',
-            'line_nr' => 22,
-            'macro' => ''
+            'line_nr' => 22
           }
         },
         {
@@ -822,8 +802,7 @@ $result_trees{'custom_heading_with_include_in_command'} = {
       },
       'source_info' => {
         'file_name' => 'section_file.texi',
-        'line_nr' => 20,
-        'macro' => ''
+        'line_nr' => 20
       }
     },
     {
@@ -855,8 +834,7 @@ $result_trees{'custom_heading_with_include_in_command'} = {
       },
       'source_info' => {
         'file_name' => 'section_file.texi',
-        'line_nr' => 26,
-        'macro' => ''
+        'line_nr' => 26
       }
     },
     {
@@ -959,8 +937,7 @@ $result_trees{'custom_heading_with_include_in_command'} = {
                     },
                     'source_info' => {
                       'file_name' => 'section_file.texi',
-                      'line_nr' => 36,
-                      'macro' => ''
+                      'line_nr' => 36
                     }
                   }
                 ],
@@ -971,8 +948,7 @@ $result_trees{'custom_heading_with_include_in_command'} = {
                 },
                 'source_info' => {
                   'file_name' => 'section_file.texi',
-                  'line_nr' => 29,
-                  'macro' => ''
+                  'line_nr' => 29
                 }
               },
               'position' => 1,
@@ -1044,8 +1020,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
                     },
                     'source_info' => {
                       'file_name' => 'section_file.texi',
-                      'line_nr' => 41,
-                      'macro' => ''
+                      'line_nr' => 41
                     }
                   }
                 ],
@@ -1056,8 +1031,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
                 },
                 'source_info' => {
                   'file_name' => 'section_file.texi',
-                  'line_nr' => 38,
-                  'macro' => ''
+                  'line_nr' => 38
                 }
               },
               'position' => 1,
@@ -1106,8 +1080,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 15,
-                  'macro' => ''
+                  'line_nr' => 15
                 }
               },
               'position' => 1,
@@ -1135,8 +1108,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
       },
       'source_info' => {
         'file_name' => 'section_file.texi',
-        'line_nr' => 27,
-        'macro' => ''
+        'line_nr' => 27
       }
     },
     {
@@ -1174,8 +1146,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
       },
       'source_info' => {
         'file_name' => 'section_file_no_node.texi',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -1213,8 +1184,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
       },
       'source_info' => {
         'file_name' => 'section_file_no_node.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -1292,8 +1262,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
                     },
                     'source_info' => {
                       'file_name' => 'section_file_no_node.texi',
-                      'line_nr' => 10,
-                      'macro' => ''
+                      'line_nr' => 10
                     }
                   }
                 ],
@@ -1304,8 +1273,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
                 },
                 'source_info' => {
                   'file_name' => 'section_file_no_node.texi',
-                  'line_nr' => 8,
-                  'macro' => ''
+                  'line_nr' => 8
                 }
               },
               'position' => 1,
@@ -1361,8 +1329,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 17,
-                  'macro' => ''
+                  'line_nr' => 17
                 }
               },
               'position' => 1,
@@ -1390,8 +1357,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
       },
       'source_info' => {
         'file_name' => 'section_file_no_node.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -1429,8 +1395,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
       },
       'source_info' => {
         'file_name' => 'section_file_no_node_include.texi',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -1468,8 +1433,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
       },
       'source_info' => {
         'file_name' => 'section_file_no_node_include.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -1547,8 +1511,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
                     },
                     'source_info' => {
                       'file_name' => 'section_file_no_node_include.texi',
-                      'line_nr' => 10,
-                      'macro' => ''
+                      'line_nr' => 10
                     }
                   }
                 ],
@@ -1559,8 +1522,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
                 },
                 'source_info' => {
                   'file_name' => 'section_file_no_node_include.texi',
-                  'line_nr' => 8,
-                  'macro' => ''
+                  'line_nr' => 8
                 }
               },
               'position' => 1,
@@ -1617,8 +1579,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
                 },
                 'source_info' => {
                   'file_name' => 'section_file_no_node_include.texi',
-                  'line_nr' => 14,
-                  'macro' => ''
+                  'line_nr' => 14
                 }
               },
               'position' => 1,
@@ -1646,8 +1607,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
       },
       'source_info' => {
         'file_name' => 'section_file_no_node_include.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -1685,8 +1645,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
       },
       'source_info' => {
         'file_name' => 'section_file_no_node.texi',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -1724,8 +1683,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
       },
       'source_info' => {
         'file_name' => 'section_file_no_node.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -1803,8 +1761,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
                     },
                     'source_info' => {
                       'file_name' => 'section_file_no_node.texi',
-                      'line_nr' => 10,
-                      'macro' => ''
+                      'line_nr' => 10
                     }
                   }
                 ],
@@ -1815,8 +1772,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
                 },
                 'source_info' => {
                   'file_name' => 'section_file_no_node.texi',
-                  'line_nr' => 8,
-                  'macro' => ''
+                  'line_nr' => 8
                 }
               },
               'position' => 1,
@@ -1885,8 +1841,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 19,
-                  'macro' => ''
+                  'line_nr' => 19
                 }
               },
               'position' => 1,
@@ -1914,8 +1869,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
       },
       'source_info' => {
         'file_name' => 'section_file_no_node.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -1953,8 +1907,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
       },
       'source_info' => {
         'file_name' => 'section_file_no_node.texi',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -1992,8 +1945,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
       },
       'source_info' => {
         'file_name' => 'section_file_no_node.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -2071,8 +2023,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
                     },
                     'source_info' => {
                       'file_name' => 'section_file_no_node.texi',
-                      'line_nr' => 10,
-                      'macro' => ''
+                      'line_nr' => 10
                     }
                   }
                 ],
@@ -2083,8 +2034,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
                 },
                 'source_info' => {
                   'file_name' => 'section_file_no_node.texi',
-                  'line_nr' => 8,
-                  'macro' => ''
+                  'line_nr' => 8
                 }
               },
               'position' => 1,
@@ -2124,8 +2074,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
       },
       'source_info' => {
         'file_name' => 'section_file_no_node.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -2157,8 +2106,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 21,
-        'macro' => ''
+        'line_nr' => 21
       }
     },
     {
@@ -2196,8 +2144,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 22,
-        'macro' => ''
+        'line_nr' => 22
       }
     }
   ],
diff --git a/tp/t/results/latex_tests/custom_headings.pl 
b/tp/t/results/latex_tests/custom_headings.pl
index 289ec1d47c..95ead704bb 100644
--- a/tp/t/results/latex_tests/custom_headings.pl
+++ b/tp/t/results/latex_tests/custom_headings.pl
@@ -88,8 +88,7 @@ $result_trees{'custom_headings'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -140,8 +139,7 @@ $result_trees{'custom_headings'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -162,8 +160,7 @@ $result_trees{'custom_headings'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -206,8 +203,7 @@ $result_trees{'custom_headings'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -243,8 +239,7 @@ $result_trees{'custom_headings'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -276,8 +271,7 @@ $result_trees{'custom_headings'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -373,8 +367,7 @@ $result_trees{'custom_headings'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -412,8 +405,7 @@ $result_trees{'custom_headings'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 19,
-        'macro' => ''
+        'line_nr' => 19
       }
     },
     {
@@ -471,8 +463,7 @@ $result_trees{'custom_headings'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           }
         },
         {
@@ -549,8 +540,7 @@ $result_trees{'custom_headings'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 21,
-        'macro' => ''
+        'line_nr' => 21
       }
     },
     {
@@ -635,8 +625,7 @@ $result_trees{'custom_headings'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 37,
-            'macro' => ''
+            'line_nr' => 37
           }
         },
         {
@@ -655,8 +644,7 @@ $result_trees{'custom_headings'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 33,
-        'macro' => ''
+        'line_nr' => 33
       }
     }
   ],
diff --git a/tp/t/results/latex_tests/custom_headings_and_comments.pl 
b/tp/t/results/latex_tests/custom_headings_and_comments.pl
index 40cf362ae7..0c9ac56b65 100644
--- a/tp/t/results/latex_tests/custom_headings_and_comments.pl
+++ b/tp/t/results/latex_tests/custom_headings_and_comments.pl
@@ -78,8 +78,7 @@ $result_trees{'custom_headings_and_comments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -130,8 +129,7 @@ $result_trees{'custom_headings_and_comments'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -161,8 +159,7 @@ $result_trees{'custom_headings_and_comments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -205,8 +202,7 @@ $result_trees{'custom_headings_and_comments'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -242,8 +238,7 @@ $result_trees{'custom_headings_and_comments'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -275,8 +270,7 @@ $result_trees{'custom_headings_and_comments'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -372,8 +366,7 @@ $result_trees{'custom_headings_and_comments'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -411,8 +404,7 @@ $result_trees{'custom_headings_and_comments'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -450,8 +442,7 @@ $result_trees{'custom_headings_and_comments'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 20,
-        'macro' => ''
+        'line_nr' => 20
       }
     }
   ],
diff --git a/tp/t/results/latex_tests/customize_informative_commands.pl 
b/tp/t/results/latex_tests/customize_informative_commands.pl
index e18611c6d6..2c056c2f64 100644
--- a/tp/t/results/latex_tests/customize_informative_commands.pl
+++ b/tp/t/results/latex_tests/customize_informative_commands.pl
@@ -43,8 +43,7 @@ $result_trees{'customize_informative_commands'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
diff --git a/tp/t/results/latex_tests/enumerate_arguments.pl 
b/tp/t/results/latex_tests/enumerate_arguments.pl
index 6ec49f2b2d..23e3b84191 100644
--- a/tp/t/results/latex_tests/enumerate_arguments.pl
+++ b/tp/t/results/latex_tests/enumerate_arguments.pl
@@ -53,8 +53,7 @@ $result_trees{'enumerate_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -79,8 +78,7 @@ $result_trees{'enumerate_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -111,8 +109,7 @@ $result_trees{'enumerate_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -126,8 +123,7 @@ $result_trees{'enumerate_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -176,8 +172,7 @@ $result_trees{'enumerate_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -202,8 +197,7 @@ $result_trees{'enumerate_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -234,8 +228,7 @@ $result_trees{'enumerate_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
@@ -249,8 +242,7 @@ $result_trees{'enumerate_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -299,8 +291,7 @@ $result_trees{'enumerate_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -325,8 +316,7 @@ $result_trees{'enumerate_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -357,8 +347,7 @@ $result_trees{'enumerate_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
@@ -372,8 +361,7 @@ $result_trees{'enumerate_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -422,8 +410,7 @@ $result_trees{'enumerate_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -448,8 +435,7 @@ $result_trees{'enumerate_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -480,8 +466,7 @@ $result_trees{'enumerate_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             }
           ],
@@ -495,8 +480,7 @@ $result_trees{'enumerate_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           }
         },
         {
@@ -545,8 +529,7 @@ $result_trees{'enumerate_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -571,8 +554,7 @@ $result_trees{'enumerate_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -603,8 +585,7 @@ $result_trees{'enumerate_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             }
           ],
@@ -618,8 +599,7 @@ $result_trees{'enumerate_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 21,
-            'macro' => ''
+            'line_nr' => 21
           }
         },
         {
@@ -668,8 +648,7 @@ $result_trees{'enumerate_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             },
             {
@@ -694,8 +673,7 @@ $result_trees{'enumerate_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             },
             {
@@ -726,8 +704,7 @@ $result_trees{'enumerate_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             }
           ],
@@ -741,8 +718,7 @@ $result_trees{'enumerate_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         },
         {
diff --git a/tp/t/results/latex_tests/error_in_sectioning_command.pl 
b/tp/t/results/latex_tests/error_in_sectioning_command.pl
index cd0bc98477..7431ca3575 100644
--- a/tp/t/results/latex_tests/error_in_sectioning_command.pl
+++ b/tp/t/results/latex_tests/error_in_sectioning_command.pl
@@ -22,8 +22,7 @@ $result_trees{'error_in_sectioning_command'} = {
               'cmdname' => 'contents',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -66,8 +65,7 @@ $result_trees{'error_in_sectioning_command'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -103,8 +101,7 @@ $result_trees{'error_in_sectioning_command'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -134,8 +131,7 @@ $result_trees{'error_in_sectioning_command'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -150,8 +146,7 @@ $result_trees{'error_in_sectioning_command'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -179,8 +174,7 @@ $result_trees{'error_in_sectioning_command'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -210,8 +204,7 @@ $result_trees{'error_in_sectioning_command'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -226,8 +219,7 @@ $result_trees{'error_in_sectioning_command'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -264,8 +256,7 @@ $result_trees{'error_in_sectioning_command'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -286,8 +277,7 @@ $result_trees{'error_in_sectioning_command'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     }
   ],
diff --git a/tp/t/results/latex_tests/example_in_cartouche.pl 
b/tp/t/results/latex_tests/example_in_cartouche.pl
index 2646646cc3..efa8420a67 100644
--- a/tp/t/results/latex_tests/example_in_cartouche.pl
+++ b/tp/t/results/latex_tests/example_in_cartouche.pl
@@ -77,15 +77,13 @@ $result_trees{'example_in_cartouche'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -162,15 +160,13 @@ $result_trees{'example_in_cartouche'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -201,15 +197,13 @@ $result_trees{'example_in_cartouche'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         }
       ],
diff --git a/tp/t/results/latex_tests/float_and_refs.pl 
b/tp/t/results/latex_tests/float_and_refs.pl
index 8d6cfae020..eeea15167f 100644
--- a/tp/t/results/latex_tests/float_and_refs.pl
+++ b/tp/t/results/latex_tests/float_and_refs.pl
@@ -44,8 +44,7 @@ $result_trees{'float_and_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -81,8 +80,7 @@ $result_trees{'float_and_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -114,8 +112,7 @@ $result_trees{'float_and_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -198,8 +195,7 @@ $result_trees{'float_and_refs'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -229,8 +225,7 @@ $result_trees{'float_and_refs'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -266,8 +261,7 @@ $result_trees{'float_and_refs'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
@@ -286,8 +280,7 @@ $result_trees{'float_and_refs'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -356,8 +349,7 @@ $result_trees{'float_and_refs'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -387,8 +379,7 @@ $result_trees{'float_and_refs'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -424,8 +415,7 @@ $result_trees{'float_and_refs'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             }
           ],
@@ -444,8 +434,7 @@ $result_trees{'float_and_refs'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -514,8 +503,7 @@ $result_trees{'float_and_refs'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -545,8 +533,7 @@ $result_trees{'float_and_refs'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -582,8 +569,7 @@ $result_trees{'float_and_refs'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             }
           ],
@@ -602,8 +588,7 @@ $result_trees{'float_and_refs'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         },
         {
@@ -622,8 +607,7 @@ $result_trees{'float_and_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -674,8 +658,7 @@ $result_trees{'float_and_refs'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             },
             {
@@ -717,8 +700,7 @@ $result_trees{'float_and_refs'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             },
             {
@@ -773,8 +755,7 @@ $result_trees{'float_and_refs'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             },
             {
@@ -841,8 +822,7 @@ $result_trees{'float_and_refs'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -922,8 +902,7 @@ $result_trees{'float_and_refs'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               }
             },
             {
@@ -962,8 +941,7 @@ $result_trees{'float_and_refs'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               }
             },
             {
@@ -1005,8 +983,7 @@ $result_trees{'float_and_refs'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             },
             {
@@ -1061,8 +1038,7 @@ $result_trees{'float_and_refs'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             },
             {
@@ -1129,8 +1105,7 @@ $result_trees{'float_and_refs'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               }
             },
             {
@@ -1210,8 +1185,7 @@ $result_trees{'float_and_refs'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 37,
-                'macro' => ''
+                'line_nr' => 37
               }
             },
             {
@@ -1250,8 +1224,7 @@ $result_trees{'float_and_refs'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 39,
-                'macro' => ''
+                'line_nr' => 39
               }
             },
             {
@@ -1293,8 +1266,7 @@ $result_trees{'float_and_refs'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               }
             },
             {
@@ -1349,8 +1321,7 @@ $result_trees{'float_and_refs'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 41,
-                'macro' => ''
+                'line_nr' => 41
               }
             },
             {
@@ -1417,8 +1388,7 @@ $result_trees{'float_and_refs'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               }
             },
             {
@@ -1498,8 +1468,7 @@ $result_trees{'float_and_refs'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               }
             },
             {
@@ -1525,8 +1494,7 @@ $result_trees{'float_and_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
@@ -1571,8 +1539,7 @@ $result_trees{'float_and_refs'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 47,
-            'macro' => ''
+            'line_nr' => 47
           }
         },
         {
@@ -1603,8 +1570,7 @@ $result_trees{'float_and_refs'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 48,
-            'macro' => ''
+            'line_nr' => 48
           }
         },
         {
@@ -1635,8 +1601,7 @@ $result_trees{'float_and_refs'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 49,
-            'macro' => ''
+            'line_nr' => 49
           }
         },
         {
@@ -1655,8 +1620,7 @@ $result_trees{'float_and_refs'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 45,
-        'macro' => ''
+        'line_nr' => 45
       }
     }
   ],
diff --git a/tp/t/results/latex_tests/fonttextsize.pl 
b/tp/t/results/latex_tests/fonttextsize.pl
index b8dfcd9967..eb402fad92 100644
--- a/tp/t/results/latex_tests/fonttextsize.pl
+++ b/tp/t/results/latex_tests/fonttextsize.pl
@@ -41,8 +41,7 @@ $result_trees{'fonttextsize'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -85,8 +84,7 @@ $result_trees{'fonttextsize'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -122,8 +120,7 @@ $result_trees{'fonttextsize'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -155,8 +152,7 @@ $result_trees{'fonttextsize'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -194,8 +190,7 @@ $result_trees{'fonttextsize'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -233,8 +228,7 @@ $result_trees{'fonttextsize'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -300,8 +294,7 @@ $result_trees{'fonttextsize'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           }
         }
       ],
@@ -315,8 +308,7 @@ $result_trees{'fonttextsize'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -382,8 +374,7 @@ $result_trees{'fonttextsize'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         }
       ],
@@ -397,8 +388,7 @@ $result_trees{'fonttextsize'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -464,8 +454,7 @@ $result_trees{'fonttextsize'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 24,
-            'macro' => ''
+            'line_nr' => 24
           }
         }
       ],
@@ -479,8 +468,7 @@ $result_trees{'fonttextsize'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 20,
-        'macro' => ''
+        'line_nr' => 20
       }
     },
     {
@@ -527,8 +515,7 @@ $result_trees{'fonttextsize'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     }
   ],
@@ -762,7 +749,6 @@ $result_errors{'fonttextsize'} = [
 ',
     'file_name' => '',
     'line_nr' => 14,
-    'macro' => '',
     'text' => 'multiple @fonttextsize',
     'type' => 'warning'
   },
@@ -771,7 +757,6 @@ $result_errors{'fonttextsize'} = [
 ',
     'file_name' => '',
     'line_nr' => 19,
-    'macro' => '',
     'text' => 'multiple @fonttextsize',
     'type' => 'warning'
   },
@@ -780,7 +765,6 @@ $result_errors{'fonttextsize'} = [
 ',
     'file_name' => '',
     'line_nr' => 19,
-    'macro' => '',
     'text' => 'Only @fonttextsize 10 or 11 is supported, not `8\'',
     'type' => 'error'
   },
@@ -789,7 +773,6 @@ $result_errors{'fonttextsize'} = [
 ',
     'file_name' => '',
     'line_nr' => 24,
-    'macro' => '',
     'text' => 'multiple @fonttextsize',
     'type' => 'warning'
   },
@@ -798,7 +781,6 @@ $result_errors{'fonttextsize'} = [
 ',
     'file_name' => '',
     'line_nr' => 24,
-    'macro' => '',
     'text' => 'Only @fonttextsize 10 or 11 is supported, not `15\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/latex_tests/indices.pl 
b/tp/t/results/latex_tests/indices.pl
index d2397094b3..324afc5b6e 100644
--- a/tp/t/results/latex_tests/indices.pl
+++ b/tp/t/results/latex_tests/indices.pl
@@ -78,8 +78,7 @@ $result_trees{'indices'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -115,8 +114,7 @@ $result_trees{'indices'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -149,8 +147,7 @@ $result_trees{'indices'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -195,8 +192,7 @@ $result_trees{'indices'} = {
                   'cmdname' => '"',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 },
                 {
@@ -216,8 +212,7 @@ $result_trees{'indices'} = {
                   'cmdname' => '"',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 }
               ],
@@ -247,8 +242,7 @@ $result_trees{'indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           },
           'type' => 'index_entry_command'
         },
@@ -286,8 +280,7 @@ $result_trees{'indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           },
           'type' => 'index_entry_command'
         },
@@ -325,8 +318,7 @@ $result_trees{'indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           },
           'type' => 'index_entry_command'
         },
@@ -364,8 +356,7 @@ $result_trees{'indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           },
           'type' => 'index_entry_command'
         },
@@ -403,8 +394,7 @@ $result_trees{'indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           },
           'type' => 'index_entry_command'
         },
@@ -426,8 +416,7 @@ $result_trees{'indices'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 15,
-                    'macro' => ''
+                    'line_nr' => 15
                   }
                 }
               ],
@@ -457,8 +446,7 @@ $result_trees{'indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           },
           'type' => 'index_entry_command'
         },
@@ -491,8 +479,7 @@ $result_trees{'indices'} = {
                   'cmdname' => 'math',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 17,
-                    'macro' => ''
+                    'line_nr' => 17
                   }
                 },
                 {
@@ -518,8 +505,7 @@ $result_trees{'indices'} = {
                   'cmdname' => '"',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 17,
-                    'macro' => ''
+                    'line_nr' => 17
                   }
                 },
                 {
@@ -539,8 +525,7 @@ $result_trees{'indices'} = {
                   'cmdname' => '"',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 17,
-                    'macro' => ''
+                    'line_nr' => 17
                   }
                 }
               ],
@@ -584,8 +569,7 @@ $result_trees{'indices'} = {
                       'cmdname' => 'sortas',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -615,8 +599,7 @@ $result_trees{'indices'} = {
                       'cmdname' => 'math',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -642,8 +625,7 @@ $result_trees{'indices'} = {
                       'cmdname' => '"',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -663,8 +645,7 @@ $result_trees{'indices'} = {
                       'cmdname' => '"',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -695,8 +676,7 @@ $result_trees{'indices'} = {
                               'cmdname' => 'math',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 17,
-                                'macro' => ''
+                                'line_nr' => 17
                               }
                             },
                             {
@@ -722,8 +702,7 @@ $result_trees{'indices'} = {
                               'cmdname' => '"',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 17,
-                                'macro' => ''
+                                'line_nr' => 17
                               }
                             },
                             {
@@ -743,8 +722,7 @@ $result_trees{'indices'} = {
                               'cmdname' => '"',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 17,
-                                'macro' => ''
+                                'line_nr' => 17
                               }
                             }
                           ],
@@ -754,8 +732,7 @@ $result_trees{'indices'} = {
                       'cmdname' => 'seealso',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     }
                   ],
@@ -781,8 +758,7 @@ $result_trees{'indices'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             }
           },
@@ -794,8 +770,7 @@ $result_trees{'indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           },
           'type' => 'index_entry_command'
         },
@@ -834,8 +809,7 @@ $result_trees{'indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           },
           'type' => 'index_entry_command'
         },
@@ -864,8 +838,7 @@ $result_trees{'indices'} = {
                   'cmdname' => 'sortas',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 19,
-                    'macro' => ''
+                    'line_nr' => 19
                   }
                 }
               ],
@@ -896,8 +869,7 @@ $result_trees{'indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           },
           'type' => 'index_entry_command'
         },
@@ -945,8 +917,7 @@ $result_trees{'indices'} = {
                   'cmdname' => 'file',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 23,
-                    'macro' => ''
+                    'line_nr' => 23
                   }
                 }
               ],
@@ -984,8 +955,7 @@ $result_trees{'indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           },
           'type' => 'index_entry_command'
         },
@@ -1015,8 +985,7 @@ $result_trees{'indices'} = {
                   'cmdname' => 'r',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 25,
-                    'macro' => ''
+                    'line_nr' => 25
                   }
                 },
                 {
@@ -1036,8 +1005,7 @@ $result_trees{'indices'} = {
                   'cmdname' => 'file',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 25,
-                    'macro' => ''
+                    'line_nr' => 25
                   }
                 }
               ],
@@ -1066,8 +1034,7 @@ $result_trees{'indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           },
           'type' => 'index_entry_command'
         },
@@ -1106,8 +1073,7 @@ $result_trees{'indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 27,
-            'macro' => ''
+            'line_nr' => 27
           }
         },
         {
@@ -1145,8 +1111,7 @@ $result_trees{'indices'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 29,
-            'macro' => ''
+            'line_nr' => 29
           }
         }
       ],
@@ -1160,8 +1125,7 @@ $result_trees{'indices'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     }
   ],
@@ -1332,7 +1296,6 @@ $result_errors{'indices'} = [
 ',
     'file_name' => '',
     'line_nr' => 23,
-    'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
   },
@@ -1341,7 +1304,6 @@ $result_errors{'indices'} = [
 ',
     'file_name' => '',
     'line_nr' => 23,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/latex_tests/indices_disable_encoding.pl 
b/tp/t/results/latex_tests/indices_disable_encoding.pl
index a7a009dd56..245c835116 100644
--- a/tp/t/results/latex_tests/indices_disable_encoding.pl
+++ b/tp/t/results/latex_tests/indices_disable_encoding.pl
@@ -78,8 +78,7 @@ $result_trees{'indices_disable_encoding'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -115,8 +114,7 @@ $result_trees{'indices_disable_encoding'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -149,8 +147,7 @@ $result_trees{'indices_disable_encoding'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -195,8 +192,7 @@ $result_trees{'indices_disable_encoding'} = {
                   'cmdname' => '"',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 },
                 {
@@ -216,8 +212,7 @@ $result_trees{'indices_disable_encoding'} = {
                   'cmdname' => '"',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 }
               ],
@@ -247,8 +242,7 @@ $result_trees{'indices_disable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           },
           'type' => 'index_entry_command'
         },
@@ -286,8 +280,7 @@ $result_trees{'indices_disable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           },
           'type' => 'index_entry_command'
         },
@@ -325,8 +318,7 @@ $result_trees{'indices_disable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           },
           'type' => 'index_entry_command'
         },
@@ -364,8 +356,7 @@ $result_trees{'indices_disable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           },
           'type' => 'index_entry_command'
         },
@@ -403,8 +394,7 @@ $result_trees{'indices_disable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           },
           'type' => 'index_entry_command'
         },
@@ -426,8 +416,7 @@ $result_trees{'indices_disable_encoding'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 15,
-                    'macro' => ''
+                    'line_nr' => 15
                   }
                 }
               ],
@@ -457,8 +446,7 @@ $result_trees{'indices_disable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           },
           'type' => 'index_entry_command'
         },
@@ -491,8 +479,7 @@ $result_trees{'indices_disable_encoding'} = {
                   'cmdname' => 'math',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 17,
-                    'macro' => ''
+                    'line_nr' => 17
                   }
                 },
                 {
@@ -518,8 +505,7 @@ $result_trees{'indices_disable_encoding'} = {
                   'cmdname' => '"',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 17,
-                    'macro' => ''
+                    'line_nr' => 17
                   }
                 },
                 {
@@ -539,8 +525,7 @@ $result_trees{'indices_disable_encoding'} = {
                   'cmdname' => '"',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 17,
-                    'macro' => ''
+                    'line_nr' => 17
                   }
                 }
               ],
@@ -584,8 +569,7 @@ $result_trees{'indices_disable_encoding'} = {
                       'cmdname' => 'sortas',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -615,8 +599,7 @@ $result_trees{'indices_disable_encoding'} = {
                       'cmdname' => 'math',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -642,8 +625,7 @@ $result_trees{'indices_disable_encoding'} = {
                       'cmdname' => '"',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -663,8 +645,7 @@ $result_trees{'indices_disable_encoding'} = {
                       'cmdname' => '"',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -695,8 +676,7 @@ $result_trees{'indices_disable_encoding'} = {
                               'cmdname' => 'math',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 17,
-                                'macro' => ''
+                                'line_nr' => 17
                               }
                             },
                             {
@@ -722,8 +702,7 @@ $result_trees{'indices_disable_encoding'} = {
                               'cmdname' => '"',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 17,
-                                'macro' => ''
+                                'line_nr' => 17
                               }
                             },
                             {
@@ -743,8 +722,7 @@ $result_trees{'indices_disable_encoding'} = {
                               'cmdname' => '"',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 17,
-                                'macro' => ''
+                                'line_nr' => 17
                               }
                             }
                           ],
@@ -754,8 +732,7 @@ $result_trees{'indices_disable_encoding'} = {
                       'cmdname' => 'seealso',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     }
                   ],
@@ -781,8 +758,7 @@ $result_trees{'indices_disable_encoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             }
           },
@@ -794,8 +770,7 @@ $result_trees{'indices_disable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           },
           'type' => 'index_entry_command'
         },
@@ -834,8 +809,7 @@ $result_trees{'indices_disable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           },
           'type' => 'index_entry_command'
         },
@@ -864,8 +838,7 @@ $result_trees{'indices_disable_encoding'} = {
                   'cmdname' => 'sortas',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 19,
-                    'macro' => ''
+                    'line_nr' => 19
                   }
                 }
               ],
@@ -896,8 +869,7 @@ $result_trees{'indices_disable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           },
           'type' => 'index_entry_command'
         },
@@ -945,8 +917,7 @@ $result_trees{'indices_disable_encoding'} = {
                   'cmdname' => 'file',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 23,
-                    'macro' => ''
+                    'line_nr' => 23
                   }
                 }
               ],
@@ -984,8 +955,7 @@ $result_trees{'indices_disable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           },
           'type' => 'index_entry_command'
         },
@@ -1015,8 +985,7 @@ $result_trees{'indices_disable_encoding'} = {
                   'cmdname' => 'r',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 25,
-                    'macro' => ''
+                    'line_nr' => 25
                   }
                 },
                 {
@@ -1036,8 +1005,7 @@ $result_trees{'indices_disable_encoding'} = {
                   'cmdname' => 'file',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 25,
-                    'macro' => ''
+                    'line_nr' => 25
                   }
                 }
               ],
@@ -1066,8 +1034,7 @@ $result_trees{'indices_disable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           },
           'type' => 'index_entry_command'
         },
@@ -1106,8 +1073,7 @@ $result_trees{'indices_disable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 27,
-            'macro' => ''
+            'line_nr' => 27
           }
         },
         {
@@ -1145,8 +1111,7 @@ $result_trees{'indices_disable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 29,
-            'macro' => ''
+            'line_nr' => 29
           }
         }
       ],
@@ -1160,8 +1125,7 @@ $result_trees{'indices_disable_encoding'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     }
   ],
@@ -1332,7 +1296,6 @@ $result_errors{'indices_disable_encoding'} = [
 ',
     'file_name' => '',
     'line_nr' => 23,
-    'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
   },
@@ -1341,7 +1304,6 @@ $result_errors{'indices_disable_encoding'} = [
 ',
     'file_name' => '',
     'line_nr' => 23,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/latex_tests/informative_commands_in_top_node.pl 
b/tp/t/results/latex_tests/informative_commands_in_top_node.pl
index c83460b802..73a03c044e 100644
--- a/tp/t/results/latex_tests/informative_commands_in_top_node.pl
+++ b/tp/t/results/latex_tests/informative_commands_in_top_node.pl
@@ -44,8 +44,7 @@ $result_trees{'informative_commands_in_top_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -102,8 +101,7 @@ $result_trees{'informative_commands_in_top_node'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -159,8 +157,7 @@ $result_trees{'informative_commands_in_top_node'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   }
                 }
               ],
@@ -181,8 +178,7 @@ $result_trees{'informative_commands_in_top_node'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -215,8 +211,7 @@ $result_trees{'informative_commands_in_top_node'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -233,8 +228,7 @@ $result_trees{'informative_commands_in_top_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -266,8 +260,7 @@ $result_trees{'informative_commands_in_top_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -314,8 +307,7 @@ $result_trees{'informative_commands_in_top_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     }
   ],
diff --git a/tp/t/results/latex_tests/nested_enumerate.pl 
b/tp/t/results/latex_tests/nested_enumerate.pl
index 3654413fb9..4d03913203 100644
--- a/tp/t/results/latex_tests/nested_enumerate.pl
+++ b/tp/t/results/latex_tests/nested_enumerate.pl
@@ -60,8 +60,7 @@ $result_trees{'nested_enumerate'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -128,8 +127,7 @@ $result_trees{'nested_enumerate'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -196,8 +194,7 @@ $result_trees{'nested_enumerate'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 8,
-                                'macro' => ''
+                                'line_nr' => 8
                               }
                             },
                             {
@@ -264,8 +261,7 @@ $result_trees{'nested_enumerate'} = {
                                       },
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 11,
-                                        'macro' => ''
+                                        'line_nr' => 11
                                       }
                                     },
                                     {
@@ -290,8 +286,7 @@ $result_trees{'nested_enumerate'} = {
                                       },
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 12,
-                                        'macro' => ''
+                                        'line_nr' => 12
                                       }
                                     },
                                     {
@@ -322,8 +317,7 @@ $result_trees{'nested_enumerate'} = {
                                       },
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 13,
-                                        'macro' => ''
+                                        'line_nr' => 13
                                       }
                                     }
                                   ],
@@ -332,8 +326,7 @@ $result_trees{'nested_enumerate'} = {
                                   },
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 10,
-                                    'macro' => ''
+                                    'line_nr' => 10
                                   }
                                 }
                               ],
@@ -342,8 +335,7 @@ $result_trees{'nested_enumerate'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 9,
-                                'macro' => ''
+                                'line_nr' => 9
                               }
                             },
                             {
@@ -374,8 +366,7 @@ $result_trees{'nested_enumerate'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 14,
-                                'macro' => ''
+                                'line_nr' => 14
                               }
                             }
                           ],
@@ -384,8 +375,7 @@ $result_trees{'nested_enumerate'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 7,
-                            'macro' => ''
+                            'line_nr' => 7
                           }
                         }
                       ],
@@ -394,8 +384,7 @@ $result_trees{'nested_enumerate'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     },
                     {
@@ -426,8 +415,7 @@ $result_trees{'nested_enumerate'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     }
                   ],
@@ -436,8 +424,7 @@ $result_trees{'nested_enumerate'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 }
               ],
@@ -446,8 +433,7 @@ $result_trees{'nested_enumerate'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -478,8 +464,7 @@ $result_trees{'nested_enumerate'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
@@ -488,8 +473,7 @@ $result_trees{'nested_enumerate'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/latex_tests/nested_itemize.pl 
b/tp/t/results/latex_tests/nested_itemize.pl
index 97f8bd4e81..da4e9cdb5b 100644
--- a/tp/t/results/latex_tests/nested_itemize.pl
+++ b/tp/t/results/latex_tests/nested_itemize.pl
@@ -66,8 +66,7 @@ $result_trees{'nested_itemize'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -140,8 +139,7 @@ $result_trees{'nested_itemize'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -214,8 +212,7 @@ $result_trees{'nested_itemize'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 8,
-                                'macro' => ''
+                                'line_nr' => 8
                               }
                             },
                             {
@@ -288,8 +285,7 @@ $result_trees{'nested_itemize'} = {
                                       },
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 11,
-                                        'macro' => ''
+                                        'line_nr' => 11
                                       }
                                     },
                                     {
@@ -314,8 +310,7 @@ $result_trees{'nested_itemize'} = {
                                       },
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 12,
-                                        'macro' => ''
+                                        'line_nr' => 12
                                       }
                                     },
                                     {
@@ -346,8 +341,7 @@ $result_trees{'nested_itemize'} = {
                                       },
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 13,
-                                        'macro' => ''
+                                        'line_nr' => 13
                                       }
                                     }
                                   ],
@@ -356,8 +350,7 @@ $result_trees{'nested_itemize'} = {
                                   },
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 10,
-                                    'macro' => ''
+                                    'line_nr' => 10
                                   }
                                 }
                               ],
@@ -366,8 +359,7 @@ $result_trees{'nested_itemize'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 9,
-                                'macro' => ''
+                                'line_nr' => 9
                               }
                             },
                             {
@@ -398,8 +390,7 @@ $result_trees{'nested_itemize'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 14,
-                                'macro' => ''
+                                'line_nr' => 14
                               }
                             }
                           ],
@@ -408,8 +399,7 @@ $result_trees{'nested_itemize'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 7,
-                            'macro' => ''
+                            'line_nr' => 7
                           }
                         }
                       ],
@@ -418,8 +408,7 @@ $result_trees{'nested_itemize'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     },
                     {
@@ -450,8 +439,7 @@ $result_trees{'nested_itemize'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     }
                   ],
@@ -460,8 +448,7 @@ $result_trees{'nested_itemize'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 }
               ],
@@ -470,8 +457,7 @@ $result_trees{'nested_itemize'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -502,8 +488,7 @@ $result_trees{'nested_itemize'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
@@ -512,8 +497,7 @@ $result_trees{'nested_itemize'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_odd.pl 
b/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_odd.pl
index e15bf4ccbe..7020d77983 100644
--- a/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_odd.pl
+++ b/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_odd.pl
@@ -41,8 +41,7 @@ $result_trees{'no_titlepage_and_setchapternewpage_odd'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
diff --git a/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_on.pl 
b/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_on.pl
index c1c5ffaf86..c31a72789d 100644
--- a/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_on.pl
+++ b/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_on.pl
@@ -41,8 +41,7 @@ $result_trees{'no_titlepage_and_setchapternewpage_on'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
diff --git a/tp/t/results/latex_tests/node_before_top.pl 
b/tp/t/results/latex_tests/node_before_top.pl
index d599dd6158..cc87f549a5 100644
--- a/tp/t/results/latex_tests/node_before_top.pl
+++ b/tp/t/results/latex_tests/node_before_top.pl
@@ -51,8 +51,7 @@ $result_trees{'node_before_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -84,8 +83,7 @@ $result_trees{'node_before_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -121,8 +119,7 @@ $result_trees{'node_before_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -154,8 +151,7 @@ $result_trees{'node_before_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -206,8 +202,7 @@ $result_trees{'node_before_top'} = {
               'cmdname' => 'pxref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -228,8 +223,7 @@ $result_trees{'node_before_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     }
   ],
diff --git a/tp/t/results/latex_tests/pagesizes.pl 
b/tp/t/results/latex_tests/pagesizes.pl
index 992afe2ea9..08c9f89546 100644
--- a/tp/t/results/latex_tests/pagesizes.pl
+++ b/tp/t/results/latex_tests/pagesizes.pl
@@ -36,8 +36,7 @@ $result_trees{'pagesizes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -80,8 +79,7 @@ $result_trees{'pagesizes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -117,8 +115,7 @@ $result_trees{'pagesizes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -150,8 +147,7 @@ $result_trees{'pagesizes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -203,8 +199,7 @@ $result_trees{'pagesizes'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -223,8 +218,7 @@ $result_trees{'pagesizes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -276,8 +270,7 @@ $result_trees{'pagesizes'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -310,8 +303,7 @@ $result_trees{'pagesizes'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         }
       ],
@@ -325,8 +317,7 @@ $result_trees{'pagesizes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     }
   ],
@@ -486,7 +477,6 @@ $result_errors{'pagesizes'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'multiple @pagesizes',
     'type' => 'warning'
   },
@@ -495,7 +485,6 @@ $result_errors{'pagesizes'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => 'multiple @pagesizes',
     'type' => 'warning'
   },
@@ -504,7 +493,6 @@ $result_errors{'pagesizes'} = [
 ',
     'file_name' => '',
     'line_nr' => 15,
-    'macro' => '',
     'text' => 'multiple @pagesizes',
     'type' => 'warning'
   }
diff --git a/tp/t/results/latex_tests/pagetype.pl 
b/tp/t/results/latex_tests/pagetype.pl
index 07616318d7..493efc5265 100644
--- a/tp/t/results/latex_tests/pagetype.pl
+++ b/tp/t/results/latex_tests/pagetype.pl
@@ -22,8 +22,7 @@ $result_trees{'pagetype'} = {
               'cmdname' => 'afourpaper',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -42,8 +41,7 @@ $result_trees{'pagetype'} = {
               'cmdname' => 'afourwide',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -86,8 +84,7 @@ $result_trees{'pagetype'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -123,8 +120,7 @@ $result_trees{'pagetype'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -156,8 +152,7 @@ $result_trees{'pagetype'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -195,8 +190,7 @@ $result_trees{'pagetype'} = {
           'cmdname' => 'smallbook',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -239,8 +233,7 @@ $result_trees{'pagetype'} = {
               'cmdname' => 'afourpaper',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
@@ -276,8 +269,7 @@ $result_trees{'pagetype'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -324,8 +316,7 @@ $result_trees{'pagetype'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 20,
-        'macro' => ''
+        'line_nr' => 20
       }
     }
   ],
@@ -499,7 +490,6 @@ $result_errors{'pagetype'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => 'unknown command `Chapter\'',
     'type' => 'error'
   },
@@ -508,7 +498,6 @@ $result_errors{'pagetype'} = [
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => 'multiple @afourpaper',
     'type' => 'warning'
   }
diff --git a/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl 
b/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl
index cb4efd8caf..f4ce39a320 100644
--- a/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl
+++ b/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl
@@ -41,8 +41,7 @@ $result_trees{'setchapternewpage_on_odd_titlepage'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -80,8 +79,7 @@ $result_trees{'setchapternewpage_on_odd_titlepage'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -140,15 +138,13 @@ $result_trees{'setchapternewpage_on_odd_titlepage'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -181,7 +177,6 @@ $result_errors{'setchapternewpage_on_odd_titlepage'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'multiple @setchapternewpage',
     'type' => 'warning'
   }
diff --git 
a/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage_set_headings.pl 
b/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage_set_headings.pl
index 678a784759..3d97c4db7d 100644
--- 
a/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage_set_headings.pl
+++ 
b/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage_set_headings.pl
@@ -41,8 +41,7 @@ 
$result_trees{'setchapternewpage_on_odd_titlepage_set_headings'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -80,8 +79,7 @@ 
$result_trees{'setchapternewpage_on_odd_titlepage_set_headings'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -140,15 +138,13 @@ 
$result_trees{'setchapternewpage_on_odd_titlepage_set_headings'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -186,8 +182,7 @@ 
$result_trees{'setchapternewpage_on_odd_titlepage_set_headings'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
@@ -223,7 +218,6 @@ 
$result_errors{'setchapternewpage_on_odd_titlepage_set_headings'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'multiple @setchapternewpage',
     'type' => 'warning'
   }
diff --git a/tp/t/results/latex_tests/settitle_and_headings.pl 
b/tp/t/results/latex_tests/settitle_and_headings.pl
index bf248ad668..fc08e922e5 100644
--- a/tp/t/results/latex_tests/settitle_and_headings.pl
+++ b/tp/t/results/latex_tests/settitle_and_headings.pl
@@ -42,8 +42,7 @@ $result_trees{'settitle_and_headings'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -81,8 +80,7 @@ $result_trees{'settitle_and_headings'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -184,8 +182,7 @@ $result_trees{'settitle_and_headings'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
diff --git a/tp/t/results/latex_tests/shorttitlepage.pl 
b/tp/t/results/latex_tests/shorttitlepage.pl
index cde85f3b6c..ffeb4193d5 100644
--- a/tp/t/results/latex_tests/shorttitlepage.pl
+++ b/tp/t/results/latex_tests/shorttitlepage.pl
@@ -42,8 +42,7 @@ $result_trees{'shorttitlepage'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -86,8 +85,7 @@ $result_trees{'shorttitlepage'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -123,8 +121,7 @@ $result_trees{'shorttitlepage'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -156,8 +153,7 @@ $result_trees{'shorttitlepage'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -204,8 +200,7 @@ $result_trees{'shorttitlepage'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     }
   ],
diff --git a/tp/t/results/latex_tests/three_setchapternewpage_on_odd_off.pl 
b/tp/t/results/latex_tests/three_setchapternewpage_on_odd_off.pl
index 83af8037e9..c210302bd6 100644
--- a/tp/t/results/latex_tests/three_setchapternewpage_on_odd_off.pl
+++ b/tp/t/results/latex_tests/three_setchapternewpage_on_odd_off.pl
@@ -41,8 +41,7 @@ $result_trees{'three_setchapternewpage_on_odd_off'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -80,8 +79,7 @@ $result_trees{'three_setchapternewpage_on_odd_off'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -119,8 +117,7 @@ $result_trees{'three_setchapternewpage_on_odd_off'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -151,7 +148,6 @@ $result_errors{'three_setchapternewpage_on_odd_off'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'multiple @setchapternewpage',
     'type' => 'warning'
   },
@@ -160,7 +156,6 @@ $result_errors{'three_setchapternewpage_on_odd_off'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'multiple @setchapternewpage',
     'type' => 'warning'
   }
diff --git a/tp/t/results/latex_tests/titlepage_and_headings.pl 
b/tp/t/results/latex_tests/titlepage_and_headings.pl
index 5f7b95f89b..d933ec51c0 100644
--- a/tp/t/results/latex_tests/titlepage_and_headings.pl
+++ b/tp/t/results/latex_tests/titlepage_and_headings.pl
@@ -62,15 +62,13 @@ $result_trees{'titlepage_and_headings'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
diff --git a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl 
b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl
index ddd5b632e5..febff69d60 100644
--- a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl
+++ b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl
@@ -41,8 +41,7 @@ $result_trees{'titlepage_and_setchapternewpage_odd'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -101,15 +100,13 @@ $result_trees{'titlepage_and_setchapternewpage_odd'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
diff --git a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl 
b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl
index 31b014fb74..9f0acb89f2 100644
--- a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl
+++ b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl
@@ -41,8 +41,7 @@ $result_trees{'titlepage_and_setchapternewpage_on'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -101,15 +100,13 @@ $result_trees{'titlepage_and_setchapternewpage_on'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
diff --git a/tp/t/results/latex_tests/titlepage_classical.pl 
b/tp/t/results/latex_tests/titlepage_classical.pl
index 6bef92115d..12352c73a5 100644
--- a/tp/t/results/latex_tests/titlepage_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_classical.pl
@@ -62,15 +62,13 @@ $result_trees{'titlepage_classical'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -117,8 +115,7 @@ $result_trees{'titlepage_classical'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   }
                 },
                 {
@@ -146,8 +143,7 @@ $result_trees{'titlepage_classical'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 },
                 {
@@ -175,8 +171,7 @@ $result_trees{'titlepage_classical'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 8,
-                    'macro' => ''
+                    'line_nr' => 8
                   }
                 },
                 {
@@ -207,8 +202,7 @@ $result_trees{'titlepage_classical'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 },
                 {
@@ -239,8 +233,7 @@ $result_trees{'titlepage_classical'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 },
                 {
@@ -299,8 +292,7 @@ $result_trees{'titlepage_classical'} = {
                   'cmdname' => 'insertcopying',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 16,
-                    'macro' => ''
+                    'line_nr' => 16
                   }
                 },
                 {
@@ -331,15 +323,13 @@ $result_trees{'titlepage_classical'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 17,
-                    'macro' => ''
+                    'line_nr' => 17
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -382,8 +372,7 @@ $result_trees{'titlepage_classical'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 19,
-        'macro' => ''
+        'line_nr' => 19
       }
     },
     {
@@ -419,8 +408,7 @@ $result_trees{'titlepage_classical'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 20,
-        'macro' => ''
+        'line_nr' => 20
       }
     },
     {
@@ -452,8 +440,7 @@ $result_trees{'titlepage_classical'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 22,
-        'macro' => ''
+        'line_nr' => 22
       }
     },
     {
@@ -505,8 +492,7 @@ $result_trees{'titlepage_classical'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 23,
-        'macro' => ''
+        'line_nr' => 23
       }
     }
   ],
diff --git a/tp/t/results/latex_tests/titlepage_in_top_node.pl 
b/tp/t/results/latex_tests/titlepage_in_top_node.pl
index 6d3e1db9db..8c3dea596a 100644
--- a/tp/t/results/latex_tests/titlepage_in_top_node.pl
+++ b/tp/t/results/latex_tests/titlepage_in_top_node.pl
@@ -44,8 +44,7 @@ $result_trees{'titlepage_in_top_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -125,8 +124,7 @@ $result_trees{'titlepage_in_top_node'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -157,15 +155,13 @@ $result_trees{'titlepage_in_top_node'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -182,8 +178,7 @@ $result_trees{'titlepage_in_top_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -215,8 +210,7 @@ $result_trees{'titlepage_in_top_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -263,8 +257,7 @@ $result_trees{'titlepage_in_top_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     }
   ],
diff --git a/tp/t/results/latex_tests/titlepage_long_title.pl 
b/tp/t/results/latex_tests/titlepage_long_title.pl
index 55c5531bb0..c694c545c7 100644
--- a/tp/t/results/latex_tests/titlepage_long_title.pl
+++ b/tp/t/results/latex_tests/titlepage_long_title.pl
@@ -56,8 +56,7 @@ $result_trees{'titlepage_long_title'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   }
                 },
                 {
@@ -93,15 +92,13 @@ $result_trees{'titlepage_long_title'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -144,8 +141,7 @@ $result_trees{'titlepage_long_title'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -181,8 +177,7 @@ $result_trees{'titlepage_long_title'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -214,8 +209,7 @@ $result_trees{'titlepage_long_title'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -262,8 +256,7 @@ $result_trees{'titlepage_long_title'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     }
   ],
diff --git a/tp/t/results/latex_tests/titlepage_no_author.pl 
b/tp/t/results/latex_tests/titlepage_no_author.pl
index 69866d0010..fc707cbdbb 100644
--- a/tp/t/results/latex_tests/titlepage_no_author.pl
+++ b/tp/t/results/latex_tests/titlepage_no_author.pl
@@ -50,8 +50,7 @@ $result_trees{'titlepage_no_author'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   }
                 },
                 {
@@ -82,15 +81,13 @@ $result_trees{'titlepage_no_author'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -133,8 +130,7 @@ $result_trees{'titlepage_no_author'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -170,8 +166,7 @@ $result_trees{'titlepage_no_author'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -203,8 +198,7 @@ $result_trees{'titlepage_no_author'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -251,8 +245,7 @@ $result_trees{'titlepage_no_author'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     }
   ],
diff --git a/tp/t/results/latex_tests/titlepage_no_title.pl 
b/tp/t/results/latex_tests/titlepage_no_title.pl
index 5f8884db80..de7e7f6c38 100644
--- a/tp/t/results/latex_tests/titlepage_no_title.pl
+++ b/tp/t/results/latex_tests/titlepage_no_title.pl
@@ -39,8 +39,7 @@ $result_trees{'titlepage_no_title'} = {
                   'cmdname' => 'titlefont',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   }
                 },
                 {
@@ -80,8 +79,7 @@ $result_trees{'titlepage_no_title'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 },
                 {
@@ -112,15 +110,13 @@ $result_trees{'titlepage_no_title'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -163,8 +159,7 @@ $result_trees{'titlepage_no_title'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -200,8 +195,7 @@ $result_trees{'titlepage_no_title'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -233,8 +227,7 @@ $result_trees{'titlepage_no_title'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -281,8 +274,7 @@ $result_trees{'titlepage_no_title'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     }
   ],
diff --git a/tp/t/results/latex_tests/titlepage_with_commands_classical.pl 
b/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
index 0c7cefc4b0..84844d11d7 100644
--- a/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
@@ -62,15 +62,13 @@ $result_trees{'titlepage_with_commands_classical'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -123,8 +121,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   }
                 },
                 {
@@ -158,8 +155,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 },
                 {
@@ -193,8 +189,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 8,
-                    'macro' => ''
+                    'line_nr' => 8
                   }
                 },
                 {
@@ -231,8 +226,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 },
                 {
@@ -304,8 +298,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                                       ],
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 15,
-                                        'macro' => ''
+                                        'line_nr' => 15
                                       },
                                       'type' => 'balanced_braces'
                                     },
@@ -317,8 +310,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                                       ],
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 15,
-                                        'macro' => ''
+                                        'line_nr' => 15
                                       },
                                       'type' => 'balanced_braces'
                                     },
@@ -354,15 +346,13 @@ $result_trees{'titlepage_with_commands_classical'} = {
                                       },
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 16,
-                                        'macro' => ''
+                                        'line_nr' => 16
                                       }
                                     }
                                   ],
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 14,
-                                    'macro' => ''
+                                    'line_nr' => 14
                                   }
                                 }
                               ],
@@ -372,8 +362,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                           'cmdname' => 'footnote',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 10,
-                            'macro' => ''
+                            'line_nr' => 10
                           }
                         }
                       ],
@@ -397,8 +386,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 },
                 {
@@ -452,8 +440,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                   'cmdname' => 'insertcopying',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 22,
-                    'macro' => ''
+                    'line_nr' => 22
                   }
                 },
                 {
@@ -484,15 +471,13 @@ $result_trees{'titlepage_with_commands_classical'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 23,
-                    'macro' => ''
+                    'line_nr' => 23
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -535,8 +520,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
@@ -572,8 +556,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 26,
-        'macro' => ''
+        'line_nr' => 26
       }
     },
     {
@@ -605,8 +588,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 28,
-        'macro' => ''
+        'line_nr' => 28
       }
     },
     {
@@ -658,8 +640,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 29,
-        'macro' => ''
+        'line_nr' => 29
       }
     }
   ],
@@ -817,7 +798,6 @@ $result_errors{'titlepage_with_commands_classical'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => '@footnote should not appear on @author line',
     'type' => 'warning'
   },
@@ -826,7 +806,6 @@ $result_errors{'titlepage_with_commands_classical'} = [
 ',
     'file_name' => '',
     'line_nr' => 14,
-    'macro' => '',
     'text' => '@displaymath should not appear on @author line',
     'type' => 'warning'
   }
diff --git a/tp/t/results/latex_tests/top_no_sectioning_command.pl 
b/tp/t/results/latex_tests/top_no_sectioning_command.pl
index 539caaa009..0adb023d5f 100644
--- a/tp/t/results/latex_tests/top_no_sectioning_command.pl
+++ b/tp/t/results/latex_tests/top_no_sectioning_command.pl
@@ -51,8 +51,7 @@ $result_trees{'top_no_sectioning_command'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -84,8 +83,7 @@ $result_trees{'top_no_sectioning_command'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -136,8 +134,7 @@ $result_trees{'top_no_sectioning_command'} = {
               'cmdname' => 'pxref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -158,8 +155,7 @@ $result_trees{'top_no_sectioning_command'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     }
   ],
diff --git a/tp/t/results/latex_tests/two_setchapternewpage_odd_on.pl 
b/tp/t/results/latex_tests/two_setchapternewpage_odd_on.pl
index d52ec64e3c..33560f7cc5 100644
--- a/tp/t/results/latex_tests/two_setchapternewpage_odd_on.pl
+++ b/tp/t/results/latex_tests/two_setchapternewpage_odd_on.pl
@@ -41,8 +41,7 @@ $result_trees{'two_setchapternewpage_odd_on'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -80,8 +79,7 @@ $result_trees{'two_setchapternewpage_odd_on'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -109,7 +107,6 @@ $result_errors{'two_setchapternewpage_odd_on'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'multiple @setchapternewpage',
     'type' => 'warning'
   }
diff --git a/tp/t/results/latex_tests/two_setchapternewpage_on_odd.pl 
b/tp/t/results/latex_tests/two_setchapternewpage_on_odd.pl
index bcc7a79a96..05da06a9d1 100644
--- a/tp/t/results/latex_tests/two_setchapternewpage_on_odd.pl
+++ b/tp/t/results/latex_tests/two_setchapternewpage_on_odd.pl
@@ -41,8 +41,7 @@ $result_trees{'two_setchapternewpage_on_odd'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -80,8 +79,7 @@ $result_trees{'two_setchapternewpage_on_odd'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -109,7 +107,6 @@ $result_errors{'two_setchapternewpage_on_odd'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'multiple @setchapternewpage',
     'type' => 'warning'
   }
diff --git a/tp/t/results/latex_tests/vbar_in_index.pl 
b/tp/t/results/latex_tests/vbar_in_index.pl
index 7be125ad7b..7229ab20e2 100644
--- a/tp/t/results/latex_tests/vbar_in_index.pl
+++ b/tp/t/results/latex_tests/vbar_in_index.pl
@@ -44,8 +44,7 @@ $result_trees{'vbar_in_index'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           },
           'type' => 'index_entry_command'
         },
@@ -81,8 +80,7 @@ $result_trees{'vbar_in_index'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           },
           'type' => 'index_entry_command'
         }
@@ -106,7 +104,6 @@ $result_errors{'vbar_in_index'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -115,7 +112,6 @@ $result_errors{'vbar_in_index'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/latex_tests/verb.pl b/tp/t/results/latex_tests/verb.pl
index bfee629501..4030c1c226 100644
--- a/tp/t/results/latex_tests/verb.pl
+++ b/tp/t/results/latex_tests/verb.pl
@@ -32,8 +32,7 @@ $result_trees{'verb'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -68,8 +67,7 @@ $result_trees{'verb'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -109,8 +107,7 @@ $result_trees{'verb'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -145,8 +142,7 @@ $result_trees{'verb'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -208,7 +204,6 @@ $result_converted_errors{'latex_text'}->{'verb'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => '\\verb delimiter `%\' (for LaTeX) used in text `a%|!:@b\'',
     'type' => 'warning'
   }
@@ -221,7 +216,6 @@ $result_converted_errors{'file_latex'}->{'verb'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => '\\verb delimiter `%\' (for LaTeX) used in text `a%|!:@b\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/latex_tests/verbatim_in_smallformat.pl 
b/tp/t/results/latex_tests/verbatim_in_smallformat.pl
index 0e1c601ca4..43460600e9 100644
--- a/tp/t/results/latex_tests/verbatim_in_smallformat.pl
+++ b/tp/t/results/latex_tests/verbatim_in_smallformat.pl
@@ -73,15 +73,13 @@ $result_trees{'verbatim_in_smallformat'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -112,15 +110,13 @@ $result_trees{'verbatim_in_smallformat'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/layout/navigation.pl 
b/tp/t/results/layout/navigation.pl
index 8825a97213..71f07bc021 100644
--- a/tp/t/results/layout/navigation.pl
+++ b/tp/t/results/layout/navigation.pl
@@ -59,8 +59,7 @@ $result_trees{'navigation'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -144,8 +143,7 @@ $result_trees{'navigation'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -177,15 +175,13 @@ $result_trees{'navigation'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -202,8 +198,7 @@ $result_trees{'navigation'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -235,8 +230,7 @@ $result_trees{'navigation'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -320,8 +314,7 @@ $result_trees{'navigation'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               },
               'type' => 'menu_entry'
             },
@@ -353,15 +346,13 @@ $result_trees{'navigation'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -380,8 +371,7 @@ $result_trees{'navigation'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -413,8 +403,7 @@ $result_trees{'navigation'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -684,8 +673,7 @@ $result_trees{'navigation'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               },
               'type' => 'menu_entry'
             },
@@ -717,15 +705,13 @@ $result_trees{'navigation'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 47,
-            'macro' => ''
+            'line_nr' => 47
           }
         },
         {
@@ -744,8 +730,7 @@ $result_trees{'navigation'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -777,8 +762,7 @@ $result_trees{'navigation'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 51,
-        'macro' => ''
+        'line_nr' => 51
       }
     },
     {
@@ -816,8 +800,7 @@ $result_trees{'navigation'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 54,
-            'macro' => ''
+            'line_nr' => 54
           }
         },
         {
@@ -836,8 +819,7 @@ $result_trees{'navigation'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 52,
-        'macro' => ''
+        'line_nr' => 52
       }
     },
     {
diff --git a/tp/t/results/layout/navigation_chapter.pl 
b/tp/t/results/layout/navigation_chapter.pl
index 3ac8485cd9..0a03586d23 100644
--- a/tp/t/results/layout/navigation_chapter.pl
+++ b/tp/t/results/layout/navigation_chapter.pl
@@ -59,8 +59,7 @@ $result_trees{'navigation_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -144,8 +143,7 @@ $result_trees{'navigation_chapter'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -177,15 +175,13 @@ $result_trees{'navigation_chapter'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -202,8 +198,7 @@ $result_trees{'navigation_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -235,8 +230,7 @@ $result_trees{'navigation_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -320,8 +314,7 @@ $result_trees{'navigation_chapter'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               },
               'type' => 'menu_entry'
             },
@@ -353,15 +346,13 @@ $result_trees{'navigation_chapter'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -380,8 +371,7 @@ $result_trees{'navigation_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -413,8 +403,7 @@ $result_trees{'navigation_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -684,8 +673,7 @@ $result_trees{'navigation_chapter'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               },
               'type' => 'menu_entry'
             },
@@ -717,15 +705,13 @@ $result_trees{'navigation_chapter'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 47,
-            'macro' => ''
+            'line_nr' => 47
           }
         },
         {
@@ -744,8 +730,7 @@ $result_trees{'navigation_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -777,8 +762,7 @@ $result_trees{'navigation_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 51,
-        'macro' => ''
+        'line_nr' => 51
       }
     },
     {
@@ -816,8 +800,7 @@ $result_trees{'navigation_chapter'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 54,
-            'macro' => ''
+            'line_nr' => 54
           }
         },
         {
@@ -836,8 +819,7 @@ $result_trees{'navigation_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 52,
-        'macro' => ''
+        'line_nr' => 52
       }
     },
     {
diff --git a/tp/t/results/layout/navigation_chapter_no_header.pl 
b/tp/t/results/layout/navigation_chapter_no_header.pl
index 610323e5f8..273890d8b4 100644
--- a/tp/t/results/layout/navigation_chapter_no_header.pl
+++ b/tp/t/results/layout/navigation_chapter_no_header.pl
@@ -59,8 +59,7 @@ $result_trees{'navigation_chapter_no_header'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -144,8 +143,7 @@ $result_trees{'navigation_chapter_no_header'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -177,15 +175,13 @@ $result_trees{'navigation_chapter_no_header'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -202,8 +198,7 @@ $result_trees{'navigation_chapter_no_header'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -235,8 +230,7 @@ $result_trees{'navigation_chapter_no_header'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -320,8 +314,7 @@ $result_trees{'navigation_chapter_no_header'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               },
               'type' => 'menu_entry'
             },
@@ -353,15 +346,13 @@ $result_trees{'navigation_chapter_no_header'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -380,8 +371,7 @@ $result_trees{'navigation_chapter_no_header'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -413,8 +403,7 @@ $result_trees{'navigation_chapter_no_header'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -684,8 +673,7 @@ $result_trees{'navigation_chapter_no_header'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               },
               'type' => 'menu_entry'
             },
@@ -717,15 +705,13 @@ $result_trees{'navigation_chapter_no_header'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 47,
-            'macro' => ''
+            'line_nr' => 47
           }
         },
         {
@@ -744,8 +730,7 @@ $result_trees{'navigation_chapter_no_header'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -777,8 +762,7 @@ $result_trees{'navigation_chapter_no_header'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 51,
-        'macro' => ''
+        'line_nr' => 51
       }
     },
     {
@@ -816,8 +800,7 @@ $result_trees{'navigation_chapter_no_header'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 54,
-            'macro' => ''
+            'line_nr' => 54
           }
         },
         {
@@ -836,8 +819,7 @@ $result_trees{'navigation_chapter_no_header'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 52,
-        'macro' => ''
+        'line_nr' => 52
       }
     },
     {
diff --git a/tp/t/results/layout/navigation_chapter_no_header_vertical.pl 
b/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
index 341353da04..babe2f7490 100644
--- a/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
@@ -59,8 +59,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -144,8 +143,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -177,15 +175,13 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -202,8 +198,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -235,8 +230,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -320,8 +314,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               },
               'type' => 'menu_entry'
             },
@@ -353,15 +346,13 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -380,8 +371,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -413,8 +403,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -684,8 +673,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               },
               'type' => 'menu_entry'
             },
@@ -717,15 +705,13 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 47,
-            'macro' => ''
+            'line_nr' => 47
           }
         },
         {
@@ -744,8 +730,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -777,8 +762,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 51,
-        'macro' => ''
+        'line_nr' => 51
       }
     },
     {
@@ -816,8 +800,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 54,
-            'macro' => ''
+            'line_nr' => 54
           }
         },
         {
@@ -836,8 +819,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 52,
-        'macro' => ''
+        'line_nr' => 52
       }
     },
     {
diff --git a/tp/t/results/layout/navigation_chapter_vertical.pl 
b/tp/t/results/layout/navigation_chapter_vertical.pl
index e7561b61f6..d0585ad69e 100644
--- a/tp/t/results/layout/navigation_chapter_vertical.pl
+++ b/tp/t/results/layout/navigation_chapter_vertical.pl
@@ -59,8 +59,7 @@ $result_trees{'navigation_chapter_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -144,8 +143,7 @@ $result_trees{'navigation_chapter_vertical'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -177,15 +175,13 @@ $result_trees{'navigation_chapter_vertical'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -202,8 +198,7 @@ $result_trees{'navigation_chapter_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -235,8 +230,7 @@ $result_trees{'navigation_chapter_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -320,8 +314,7 @@ $result_trees{'navigation_chapter_vertical'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               },
               'type' => 'menu_entry'
             },
@@ -353,15 +346,13 @@ $result_trees{'navigation_chapter_vertical'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -380,8 +371,7 @@ $result_trees{'navigation_chapter_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -413,8 +403,7 @@ $result_trees{'navigation_chapter_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -684,8 +673,7 @@ $result_trees{'navigation_chapter_vertical'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               },
               'type' => 'menu_entry'
             },
@@ -717,15 +705,13 @@ $result_trees{'navigation_chapter_vertical'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 47,
-            'macro' => ''
+            'line_nr' => 47
           }
         },
         {
@@ -744,8 +730,7 @@ $result_trees{'navigation_chapter_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -777,8 +762,7 @@ $result_trees{'navigation_chapter_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 51,
-        'macro' => ''
+        'line_nr' => 51
       }
     },
     {
@@ -816,8 +800,7 @@ $result_trees{'navigation_chapter_vertical'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 54,
-            'macro' => ''
+            'line_nr' => 54
           }
         },
         {
@@ -836,8 +819,7 @@ $result_trees{'navigation_chapter_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 52,
-        'macro' => ''
+        'line_nr' => 52
       }
     },
     {
diff --git a/tp/t/results/layout/navigation_no_header.pl 
b/tp/t/results/layout/navigation_no_header.pl
index 5b6bd26931..041ef6c253 100644
--- a/tp/t/results/layout/navigation_no_header.pl
+++ b/tp/t/results/layout/navigation_no_header.pl
@@ -59,8 +59,7 @@ $result_trees{'navigation_no_header'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -144,8 +143,7 @@ $result_trees{'navigation_no_header'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -177,15 +175,13 @@ $result_trees{'navigation_no_header'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -202,8 +198,7 @@ $result_trees{'navigation_no_header'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -235,8 +230,7 @@ $result_trees{'navigation_no_header'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -320,8 +314,7 @@ $result_trees{'navigation_no_header'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               },
               'type' => 'menu_entry'
             },
@@ -353,15 +346,13 @@ $result_trees{'navigation_no_header'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -380,8 +371,7 @@ $result_trees{'navigation_no_header'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -413,8 +403,7 @@ $result_trees{'navigation_no_header'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -684,8 +673,7 @@ $result_trees{'navigation_no_header'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               },
               'type' => 'menu_entry'
             },
@@ -717,15 +705,13 @@ $result_trees{'navigation_no_header'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 47,
-            'macro' => ''
+            'line_nr' => 47
           }
         },
         {
@@ -744,8 +730,7 @@ $result_trees{'navigation_no_header'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -777,8 +762,7 @@ $result_trees{'navigation_no_header'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 51,
-        'macro' => ''
+        'line_nr' => 51
       }
     },
     {
@@ -816,8 +800,7 @@ $result_trees{'navigation_no_header'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 54,
-            'macro' => ''
+            'line_nr' => 54
           }
         },
         {
@@ -836,8 +819,7 @@ $result_trees{'navigation_no_header'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 52,
-        'macro' => ''
+        'line_nr' => 52
       }
     },
     {
diff --git a/tp/t/results/layout/navigation_no_header_vertical.pl 
b/tp/t/results/layout/navigation_no_header_vertical.pl
index 5ce1e45eb1..8d9d8cbb64 100644
--- a/tp/t/results/layout/navigation_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_no_header_vertical.pl
@@ -59,8 +59,7 @@ $result_trees{'navigation_no_header_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -144,8 +143,7 @@ $result_trees{'navigation_no_header_vertical'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -177,15 +175,13 @@ $result_trees{'navigation_no_header_vertical'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -202,8 +198,7 @@ $result_trees{'navigation_no_header_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -235,8 +230,7 @@ $result_trees{'navigation_no_header_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -320,8 +314,7 @@ $result_trees{'navigation_no_header_vertical'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               },
               'type' => 'menu_entry'
             },
@@ -353,15 +346,13 @@ $result_trees{'navigation_no_header_vertical'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -380,8 +371,7 @@ $result_trees{'navigation_no_header_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -413,8 +403,7 @@ $result_trees{'navigation_no_header_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -684,8 +673,7 @@ $result_trees{'navigation_no_header_vertical'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               },
               'type' => 'menu_entry'
             },
@@ -717,15 +705,13 @@ $result_trees{'navigation_no_header_vertical'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 47,
-            'macro' => ''
+            'line_nr' => 47
           }
         },
         {
@@ -744,8 +730,7 @@ $result_trees{'navigation_no_header_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -777,8 +762,7 @@ $result_trees{'navigation_no_header_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 51,
-        'macro' => ''
+        'line_nr' => 51
       }
     },
     {
@@ -816,8 +800,7 @@ $result_trees{'navigation_no_header_vertical'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 54,
-            'macro' => ''
+            'line_nr' => 54
           }
         },
         {
@@ -836,8 +819,7 @@ $result_trees{'navigation_no_header_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 52,
-        'macro' => ''
+        'line_nr' => 52
       }
     },
     {
diff --git a/tp/t/results/layout/navigation_node.pl 
b/tp/t/results/layout/navigation_node.pl
index c9577138ba..ea6f367ef0 100644
--- a/tp/t/results/layout/navigation_node.pl
+++ b/tp/t/results/layout/navigation_node.pl
@@ -59,8 +59,7 @@ $result_trees{'navigation_node'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -144,8 +143,7 @@ $result_trees{'navigation_node'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -177,15 +175,13 @@ $result_trees{'navigation_node'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -202,8 +198,7 @@ $result_trees{'navigation_node'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -235,8 +230,7 @@ $result_trees{'navigation_node'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -320,8 +314,7 @@ $result_trees{'navigation_node'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               },
               'type' => 'menu_entry'
             },
@@ -353,15 +346,13 @@ $result_trees{'navigation_node'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -380,8 +371,7 @@ $result_trees{'navigation_node'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -413,8 +403,7 @@ $result_trees{'navigation_node'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -684,8 +673,7 @@ $result_trees{'navigation_node'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               },
               'type' => 'menu_entry'
             },
@@ -717,15 +705,13 @@ $result_trees{'navigation_node'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 47,
-            'macro' => ''
+            'line_nr' => 47
           }
         },
         {
@@ -744,8 +730,7 @@ $result_trees{'navigation_node'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -777,8 +762,7 @@ $result_trees{'navigation_node'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 51,
-        'macro' => ''
+        'line_nr' => 51
       }
     },
     {
@@ -816,8 +800,7 @@ $result_trees{'navigation_node'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 54,
-            'macro' => ''
+            'line_nr' => 54
           }
         },
         {
@@ -836,8 +819,7 @@ $result_trees{'navigation_node'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 52,
-        'macro' => ''
+        'line_nr' => 52
       }
     },
     {
diff --git a/tp/t/results/layout/navigation_node_no_header.pl 
b/tp/t/results/layout/navigation_node_no_header.pl
index ced8b03e84..8156e89903 100644
--- a/tp/t/results/layout/navigation_node_no_header.pl
+++ b/tp/t/results/layout/navigation_node_no_header.pl
@@ -59,8 +59,7 @@ $result_trees{'navigation_node_no_header'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -144,8 +143,7 @@ $result_trees{'navigation_node_no_header'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -177,15 +175,13 @@ $result_trees{'navigation_node_no_header'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -202,8 +198,7 @@ $result_trees{'navigation_node_no_header'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -235,8 +230,7 @@ $result_trees{'navigation_node_no_header'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -320,8 +314,7 @@ $result_trees{'navigation_node_no_header'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               },
               'type' => 'menu_entry'
             },
@@ -353,15 +346,13 @@ $result_trees{'navigation_node_no_header'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -380,8 +371,7 @@ $result_trees{'navigation_node_no_header'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -413,8 +403,7 @@ $result_trees{'navigation_node_no_header'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -684,8 +673,7 @@ $result_trees{'navigation_node_no_header'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               },
               'type' => 'menu_entry'
             },
@@ -717,15 +705,13 @@ $result_trees{'navigation_node_no_header'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 47,
-            'macro' => ''
+            'line_nr' => 47
           }
         },
         {
@@ -744,8 +730,7 @@ $result_trees{'navigation_node_no_header'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -777,8 +762,7 @@ $result_trees{'navigation_node_no_header'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 51,
-        'macro' => ''
+        'line_nr' => 51
       }
     },
     {
@@ -816,8 +800,7 @@ $result_trees{'navigation_node_no_header'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 54,
-            'macro' => ''
+            'line_nr' => 54
           }
         },
         {
@@ -836,8 +819,7 @@ $result_trees{'navigation_node_no_header'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 52,
-        'macro' => ''
+        'line_nr' => 52
       }
     },
     {
diff --git a/tp/t/results/layout/navigation_node_no_header_vertical.pl 
b/tp/t/results/layout/navigation_node_no_header_vertical.pl
index 51a1f98edb..43cb8d7146 100644
--- a/tp/t/results/layout/navigation_node_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_node_no_header_vertical.pl
@@ -59,8 +59,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -144,8 +143,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -177,15 +175,13 @@ $result_trees{'navigation_node_no_header_vertical'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -202,8 +198,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -235,8 +230,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -320,8 +314,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               },
               'type' => 'menu_entry'
             },
@@ -353,15 +346,13 @@ $result_trees{'navigation_node_no_header_vertical'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -380,8 +371,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -413,8 +403,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -684,8 +673,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               },
               'type' => 'menu_entry'
             },
@@ -717,15 +705,13 @@ $result_trees{'navigation_node_no_header_vertical'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 47,
-            'macro' => ''
+            'line_nr' => 47
           }
         },
         {
@@ -744,8 +730,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -777,8 +762,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 51,
-        'macro' => ''
+        'line_nr' => 51
       }
     },
     {
@@ -816,8 +800,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 54,
-            'macro' => ''
+            'line_nr' => 54
           }
         },
         {
@@ -836,8 +819,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 52,
-        'macro' => ''
+        'line_nr' => 52
       }
     },
     {
diff --git a/tp/t/results/layout/navigation_node_vertical.pl 
b/tp/t/results/layout/navigation_node_vertical.pl
index f33ec9e94a..9858555b91 100644
--- a/tp/t/results/layout/navigation_node_vertical.pl
+++ b/tp/t/results/layout/navigation_node_vertical.pl
@@ -59,8 +59,7 @@ $result_trees{'navigation_node_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -144,8 +143,7 @@ $result_trees{'navigation_node_vertical'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -177,15 +175,13 @@ $result_trees{'navigation_node_vertical'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -202,8 +198,7 @@ $result_trees{'navigation_node_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -235,8 +230,7 @@ $result_trees{'navigation_node_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -320,8 +314,7 @@ $result_trees{'navigation_node_vertical'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               },
               'type' => 'menu_entry'
             },
@@ -353,15 +346,13 @@ $result_trees{'navigation_node_vertical'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -380,8 +371,7 @@ $result_trees{'navigation_node_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -413,8 +403,7 @@ $result_trees{'navigation_node_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -684,8 +673,7 @@ $result_trees{'navigation_node_vertical'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               },
               'type' => 'menu_entry'
             },
@@ -717,15 +705,13 @@ $result_trees{'navigation_node_vertical'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 47,
-            'macro' => ''
+            'line_nr' => 47
           }
         },
         {
@@ -744,8 +730,7 @@ $result_trees{'navigation_node_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -777,8 +762,7 @@ $result_trees{'navigation_node_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 51,
-        'macro' => ''
+        'line_nr' => 51
       }
     },
     {
@@ -816,8 +800,7 @@ $result_trees{'navigation_node_vertical'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 54,
-            'macro' => ''
+            'line_nr' => 54
           }
         },
         {
@@ -836,8 +819,7 @@ $result_trees{'navigation_node_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 52,
-        'macro' => ''
+        'line_nr' => 52
       }
     },
     {
diff --git a/tp/t/results/layout/navigation_section.pl 
b/tp/t/results/layout/navigation_section.pl
index 9bf78db191..463cdc9af7 100644
--- a/tp/t/results/layout/navigation_section.pl
+++ b/tp/t/results/layout/navigation_section.pl
@@ -59,8 +59,7 @@ $result_trees{'navigation_section'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -144,8 +143,7 @@ $result_trees{'navigation_section'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -177,15 +175,13 @@ $result_trees{'navigation_section'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -202,8 +198,7 @@ $result_trees{'navigation_section'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -235,8 +230,7 @@ $result_trees{'navigation_section'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -320,8 +314,7 @@ $result_trees{'navigation_section'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               },
               'type' => 'menu_entry'
             },
@@ -353,15 +346,13 @@ $result_trees{'navigation_section'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -380,8 +371,7 @@ $result_trees{'navigation_section'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -413,8 +403,7 @@ $result_trees{'navigation_section'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -684,8 +673,7 @@ $result_trees{'navigation_section'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               },
               'type' => 'menu_entry'
             },
@@ -717,15 +705,13 @@ $result_trees{'navigation_section'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 47,
-            'macro' => ''
+            'line_nr' => 47
           }
         },
         {
@@ -744,8 +730,7 @@ $result_trees{'navigation_section'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -777,8 +762,7 @@ $result_trees{'navigation_section'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 51,
-        'macro' => ''
+        'line_nr' => 51
       }
     },
     {
@@ -816,8 +800,7 @@ $result_trees{'navigation_section'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 54,
-            'macro' => ''
+            'line_nr' => 54
           }
         },
         {
@@ -836,8 +819,7 @@ $result_trees{'navigation_section'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 52,
-        'macro' => ''
+        'line_nr' => 52
       }
     },
     {
diff --git a/tp/t/results/layout/navigation_section_no_header.pl 
b/tp/t/results/layout/navigation_section_no_header.pl
index ef7496f856..4f2d66ab55 100644
--- a/tp/t/results/layout/navigation_section_no_header.pl
+++ b/tp/t/results/layout/navigation_section_no_header.pl
@@ -59,8 +59,7 @@ $result_trees{'navigation_section_no_header'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -144,8 +143,7 @@ $result_trees{'navigation_section_no_header'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -177,15 +175,13 @@ $result_trees{'navigation_section_no_header'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -202,8 +198,7 @@ $result_trees{'navigation_section_no_header'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -235,8 +230,7 @@ $result_trees{'navigation_section_no_header'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -320,8 +314,7 @@ $result_trees{'navigation_section_no_header'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               },
               'type' => 'menu_entry'
             },
@@ -353,15 +346,13 @@ $result_trees{'navigation_section_no_header'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -380,8 +371,7 @@ $result_trees{'navigation_section_no_header'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -413,8 +403,7 @@ $result_trees{'navigation_section_no_header'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -684,8 +673,7 @@ $result_trees{'navigation_section_no_header'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               },
               'type' => 'menu_entry'
             },
@@ -717,15 +705,13 @@ $result_trees{'navigation_section_no_header'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 47,
-            'macro' => ''
+            'line_nr' => 47
           }
         },
         {
@@ -744,8 +730,7 @@ $result_trees{'navigation_section_no_header'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -777,8 +762,7 @@ $result_trees{'navigation_section_no_header'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 51,
-        'macro' => ''
+        'line_nr' => 51
       }
     },
     {
@@ -816,8 +800,7 @@ $result_trees{'navigation_section_no_header'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 54,
-            'macro' => ''
+            'line_nr' => 54
           }
         },
         {
@@ -836,8 +819,7 @@ $result_trees{'navigation_section_no_header'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 52,
-        'macro' => ''
+        'line_nr' => 52
       }
     },
     {
diff --git a/tp/t/results/layout/navigation_section_no_header_vertical.pl 
b/tp/t/results/layout/navigation_section_no_header_vertical.pl
index 8f9fdf62df..2ca9f46975 100644
--- a/tp/t/results/layout/navigation_section_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_section_no_header_vertical.pl
@@ -59,8 +59,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -144,8 +143,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -177,15 +175,13 @@ $result_trees{'navigation_section_no_header_vertical'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -202,8 +198,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -235,8 +230,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -320,8 +314,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               },
               'type' => 'menu_entry'
             },
@@ -353,15 +346,13 @@ $result_trees{'navigation_section_no_header_vertical'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -380,8 +371,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -413,8 +403,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -684,8 +673,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               },
               'type' => 'menu_entry'
             },
@@ -717,15 +705,13 @@ $result_trees{'navigation_section_no_header_vertical'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 47,
-            'macro' => ''
+            'line_nr' => 47
           }
         },
         {
@@ -744,8 +730,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -777,8 +762,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 51,
-        'macro' => ''
+        'line_nr' => 51
       }
     },
     {
@@ -816,8 +800,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 54,
-            'macro' => ''
+            'line_nr' => 54
           }
         },
         {
@@ -836,8 +819,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 52,
-        'macro' => ''
+        'line_nr' => 52
       }
     },
     {
diff --git a/tp/t/results/layout/navigation_section_vertical.pl 
b/tp/t/results/layout/navigation_section_vertical.pl
index 45035b4a38..d373552ff9 100644
--- a/tp/t/results/layout/navigation_section_vertical.pl
+++ b/tp/t/results/layout/navigation_section_vertical.pl
@@ -59,8 +59,7 @@ $result_trees{'navigation_section_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -144,8 +143,7 @@ $result_trees{'navigation_section_vertical'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -177,15 +175,13 @@ $result_trees{'navigation_section_vertical'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -202,8 +198,7 @@ $result_trees{'navigation_section_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -235,8 +230,7 @@ $result_trees{'navigation_section_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -320,8 +314,7 @@ $result_trees{'navigation_section_vertical'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               },
               'type' => 'menu_entry'
             },
@@ -353,15 +346,13 @@ $result_trees{'navigation_section_vertical'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -380,8 +371,7 @@ $result_trees{'navigation_section_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -413,8 +403,7 @@ $result_trees{'navigation_section_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -684,8 +673,7 @@ $result_trees{'navigation_section_vertical'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               },
               'type' => 'menu_entry'
             },
@@ -717,15 +705,13 @@ $result_trees{'navigation_section_vertical'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 47,
-            'macro' => ''
+            'line_nr' => 47
           }
         },
         {
@@ -744,8 +730,7 @@ $result_trees{'navigation_section_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -777,8 +762,7 @@ $result_trees{'navigation_section_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 51,
-        'macro' => ''
+        'line_nr' => 51
       }
     },
     {
@@ -816,8 +800,7 @@ $result_trees{'navigation_section_vertical'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 54,
-            'macro' => ''
+            'line_nr' => 54
           }
         },
         {
@@ -836,8 +819,7 @@ $result_trees{'navigation_section_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 52,
-        'macro' => ''
+        'line_nr' => 52
       }
     },
     {
diff --git a/tp/t/results/layout/navigation_test_misc_file_collision.pl 
b/tp/t/results/layout/navigation_test_misc_file_collision.pl
index 3390b6e7b5..fdd45635a4 100644
--- a/tp/t/results/layout/navigation_test_misc_file_collision.pl
+++ b/tp/t/results/layout/navigation_test_misc_file_collision.pl
@@ -59,8 +59,7 @@ $result_trees{'navigation_test_misc_file_collision'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -144,8 +143,7 @@ $result_trees{'navigation_test_misc_file_collision'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -177,15 +175,13 @@ $result_trees{'navigation_test_misc_file_collision'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -202,8 +198,7 @@ $result_trees{'navigation_test_misc_file_collision'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -235,8 +230,7 @@ $result_trees{'navigation_test_misc_file_collision'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -320,8 +314,7 @@ $result_trees{'navigation_test_misc_file_collision'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               },
               'type' => 'menu_entry'
             },
@@ -353,15 +346,13 @@ $result_trees{'navigation_test_misc_file_collision'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -380,8 +371,7 @@ $result_trees{'navigation_test_misc_file_collision'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -413,8 +403,7 @@ $result_trees{'navigation_test_misc_file_collision'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -684,8 +673,7 @@ $result_trees{'navigation_test_misc_file_collision'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               },
               'type' => 'menu_entry'
             },
@@ -717,15 +705,13 @@ $result_trees{'navigation_test_misc_file_collision'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 47,
-            'macro' => ''
+            'line_nr' => 47
           }
         },
         {
@@ -744,8 +730,7 @@ $result_trees{'navigation_test_misc_file_collision'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -777,8 +762,7 @@ $result_trees{'navigation_test_misc_file_collision'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 51,
-        'macro' => ''
+        'line_nr' => 51
       }
     },
     {
@@ -816,8 +800,7 @@ $result_trees{'navigation_test_misc_file_collision'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 54,
-            'macro' => ''
+            'line_nr' => 54
           }
         },
         {
@@ -836,8 +819,7 @@ $result_trees{'navigation_test_misc_file_collision'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 52,
-        'macro' => ''
+        'line_nr' => 52
       }
     },
     {
diff --git a/tp/t/results/layout/navigation_vertical.pl 
b/tp/t/results/layout/navigation_vertical.pl
index d5a0bbde7b..58fbda27f8 100644
--- a/tp/t/results/layout/navigation_vertical.pl
+++ b/tp/t/results/layout/navigation_vertical.pl
@@ -59,8 +59,7 @@ $result_trees{'navigation_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -144,8 +143,7 @@ $result_trees{'navigation_vertical'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -177,15 +175,13 @@ $result_trees{'navigation_vertical'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -202,8 +198,7 @@ $result_trees{'navigation_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -235,8 +230,7 @@ $result_trees{'navigation_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -320,8 +314,7 @@ $result_trees{'navigation_vertical'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               },
               'type' => 'menu_entry'
             },
@@ -353,15 +346,13 @@ $result_trees{'navigation_vertical'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -380,8 +371,7 @@ $result_trees{'navigation_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -413,8 +403,7 @@ $result_trees{'navigation_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -684,8 +673,7 @@ $result_trees{'navigation_vertical'} = {
               ],
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               },
               'type' => 'menu_entry'
             },
@@ -717,15 +705,13 @@ $result_trees{'navigation_vertical'} = {
               },
               'source_info' => {
                 'file_name' => 'navigation.texi',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             }
           ],
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 47,
-            'macro' => ''
+            'line_nr' => 47
           }
         },
         {
@@ -744,8 +730,7 @@ $result_trees{'navigation_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -777,8 +762,7 @@ $result_trees{'navigation_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 51,
-        'macro' => ''
+        'line_nr' => 51
       }
     },
     {
@@ -816,8 +800,7 @@ $result_trees{'navigation_vertical'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'navigation.texi',
-            'line_nr' => 54,
-            'macro' => ''
+            'line_nr' => 54
           }
         },
         {
@@ -836,8 +819,7 @@ $result_trees{'navigation_vertical'} = {
       },
       'source_info' => {
         'file_name' => 'navigation.texi',
-        'line_nr' => 52,
-        'macro' => ''
+        'line_nr' => 52
       }
     },
     {
diff --git a/tp/t/results/layout/no_monolithic.pl 
b/tp/t/results/layout/no_monolithic.pl
index 91201ce051..222f30bbd6 100644
--- a/tp/t/results/layout/no_monolithic.pl
+++ b/tp/t/results/layout/no_monolithic.pl
@@ -59,8 +59,7 @@ $result_trees{'no_monolithic'} = {
       },
       'source_info' => {
         'file_name' => 'no_monolithic.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -111,8 +110,7 @@ $result_trees{'no_monolithic'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => 'no_monolithic.texi',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -160,8 +158,7 @@ $result_trees{'no_monolithic'} = {
           },
           'source_info' => {
             'file_name' => 'no_monolithic.texi',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           },
           'type' => 'index_entry_command'
         },
@@ -227,8 +224,7 @@ $result_trees{'no_monolithic'} = {
               ],
               'source_info' => {
                 'file_name' => 'no_monolithic.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -260,15 +256,13 @@ $result_trees{'no_monolithic'} = {
               },
               'source_info' => {
                 'file_name' => 'no_monolithic.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => 'no_monolithic.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -285,8 +279,7 @@ $result_trees{'no_monolithic'} = {
       },
       'source_info' => {
         'file_name' => 'no_monolithic.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -319,8 +312,7 @@ $result_trees{'no_monolithic'} = {
       },
       'source_info' => {
         'file_name' => 'no_monolithic.texi',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -372,8 +364,7 @@ $result_trees{'no_monolithic'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'no_monolithic.texi',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         },
         {
@@ -387,8 +378,7 @@ $result_trees{'no_monolithic'} = {
           'cmdname' => 'shortcontents',
           'source_info' => {
             'file_name' => 'no_monolithic.texi',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
@@ -426,8 +416,7 @@ $result_trees{'no_monolithic'} = {
           },
           'source_info' => {
             'file_name' => 'no_monolithic.texi',
-            'line_nr' => 22,
-            'macro' => ''
+            'line_nr' => 22
           }
         }
       ],
@@ -441,8 +430,7 @@ $result_trees{'no_monolithic'} = {
       },
       'source_info' => {
         'file_name' => 'no_monolithic.texi',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
diff --git a/tp/t/results/layout/no_monolithic_only_toc_out.pl 
b/tp/t/results/layout/no_monolithic_only_toc_out.pl
index 66fdfec7f2..794b1d55a2 100644
--- a/tp/t/results/layout/no_monolithic_only_toc_out.pl
+++ b/tp/t/results/layout/no_monolithic_only_toc_out.pl
@@ -59,8 +59,7 @@ $result_trees{'no_monolithic_only_toc_out'} = {
       },
       'source_info' => {
         'file_name' => 'no_monolithic.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -111,8 +110,7 @@ $result_trees{'no_monolithic_only_toc_out'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => 'no_monolithic.texi',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -160,8 +158,7 @@ $result_trees{'no_monolithic_only_toc_out'} = {
           },
           'source_info' => {
             'file_name' => 'no_monolithic.texi',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           },
           'type' => 'index_entry_command'
         },
@@ -227,8 +224,7 @@ $result_trees{'no_monolithic_only_toc_out'} = {
               ],
               'source_info' => {
                 'file_name' => 'no_monolithic.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -260,15 +256,13 @@ $result_trees{'no_monolithic_only_toc_out'} = {
               },
               'source_info' => {
                 'file_name' => 'no_monolithic.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => 'no_monolithic.texi',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -285,8 +279,7 @@ $result_trees{'no_monolithic_only_toc_out'} = {
       },
       'source_info' => {
         'file_name' => 'no_monolithic.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -319,8 +312,7 @@ $result_trees{'no_monolithic_only_toc_out'} = {
       },
       'source_info' => {
         'file_name' => 'no_monolithic.texi',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -372,8 +364,7 @@ $result_trees{'no_monolithic_only_toc_out'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'no_monolithic.texi',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         },
         {
@@ -387,8 +378,7 @@ $result_trees{'no_monolithic_only_toc_out'} = {
           'cmdname' => 'shortcontents',
           'source_info' => {
             'file_name' => 'no_monolithic.texi',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
@@ -426,8 +416,7 @@ $result_trees{'no_monolithic_only_toc_out'} = {
           },
           'source_info' => {
             'file_name' => 'no_monolithic.texi',
-            'line_nr' => 22,
-            'macro' => ''
+            'line_nr' => 22
           }
         }
       ],
@@ -441,8 +430,7 @@ $result_trees{'no_monolithic_only_toc_out'} = {
       },
       'source_info' => {
         'file_name' => 'no_monolithic.texi',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
diff --git a/tp/t/results/linemacro/api_doc_with_linemacro.pl 
b/tp/t/results/linemacro/api_doc_with_linemacro.pl
index 829f67b818..8fbffb5b14 100644
--- a/tp/t/results/linemacro/api_doc_with_linemacro.pl
+++ b/tp/t/results/linemacro/api_doc_with_linemacro.pl
@@ -59,8 +59,7 @@ $result_trees{'api_doc_with_linemacro'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -70,8 +69,7 @@ $result_trees{'api_doc_with_linemacro'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -124,8 +122,7 @@ $result_trees{'api_doc_with_linemacro'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -135,8 +132,7 @@ $result_trees{'api_doc_with_linemacro'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -185,8 +181,7 @@ $result_trees{'api_doc_with_linemacro'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
@@ -196,8 +191,7 @@ $result_trees{'api_doc_with_linemacro'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -334,8 +328,7 @@ $result_trees{'api_doc_with_linemacro'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     },
                     {
@@ -375,8 +368,7 @@ $result_trees{'api_doc_with_linemacro'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     },
                     {
@@ -416,8 +408,7 @@ $result_trees{'api_doc_with_linemacro'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     },
                     {
@@ -451,8 +442,7 @@ $result_trees{'api_doc_with_linemacro'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               },
               'type' => 'def_line'
             },
@@ -821,8 +811,7 @@ $result_trees{'api_doc_with_linemacro'} = {
                               'cmdname' => 'var',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             },
                             {
@@ -1291,8 +1280,7 @@ $result_trees{'api_doc_with_linemacro'} = {
                               'cmdname' => 'var',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 33,
-                                'macro' => ''
+                                'line_nr' => 33
                               }
                             },
                             {
@@ -1312,8 +1300,7 @@ $result_trees{'api_doc_with_linemacro'} = {
                               'cmdname' => 'var',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 33,
-                                'macro' => ''
+                                'line_nr' => 33
                               }
                             },
                             {
@@ -1359,15 +1346,13 @@ $result_trees{'api_doc_with_linemacro'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 35,
-                        'macro' => ''
+                        'line_nr' => 35
                       }
                     }
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 18,
-                    'macro' => ''
+                    'line_nr' => 18
                   }
                 },
                 {
@@ -1406,15 +1391,13 @@ $result_trees{'api_doc_with_linemacro'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 37,
-                'macro' => ''
+                'line_nr' => 37
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           }
         }
       ],
diff --git a/tp/t/results/linemacro/arobase_brace_in_linemacro_call.pl 
b/tp/t/results/linemacro/arobase_brace_in_linemacro_call.pl
index 4a79378c8b..3c40a20d33 100644
--- a/tp/t/results/linemacro/arobase_brace_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/arobase_brace_in_linemacro_call.pl
@@ -64,8 +64,7 @@ $result_trees{'arobase_brace_in_linemacro_call'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -75,8 +74,7 @@ $result_trees{'arobase_brace_in_linemacro_call'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/linemacro/begin_conditional_in_linemacro.pl 
b/tp/t/results/linemacro/begin_conditional_in_linemacro.pl
index e671d91a4f..c9eec00f7c 100644
--- a/tp/t/results/linemacro/begin_conditional_in_linemacro.pl
+++ b/tp/t/results/linemacro/begin_conditional_in_linemacro.pl
@@ -55,8 +55,7 @@ $result_trees{'begin_conditional_in_linemacro'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -66,8 +65,7 @@ $result_trees{'begin_conditional_in_linemacro'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -171,8 +169,7 @@ $result_trees{'begin_conditional_in_linemacro'} = {
                         },
                         'source_info' => {
                           'file_name' => '',
-                          'line_nr' => 8,
-                          'macro' => ''
+                          'line_nr' => 8
                         }
                       }
                     ],
@@ -315,8 +312,7 @@ $result_trees{'begin_conditional_in_linemacro'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 13,
-                      'macro' => ''
+                      'line_nr' => 13
                     }
                   },
                   'position' => 11,
diff --git a/tp/t/results/linemacro/block_begin_end_in_linemacro_call.pl 
b/tp/t/results/linemacro/block_begin_end_in_linemacro_call.pl
index c9754c2e77..8a2a8f804b 100644
--- a/tp/t/results/linemacro/block_begin_end_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/block_begin_end_in_linemacro_call.pl
@@ -55,8 +55,7 @@ $result_trees{'block_begin_end_in_linemacro_call'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -66,8 +65,7 @@ $result_trees{'block_begin_end_in_linemacro_call'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -184,8 +182,7 @@ in quotation
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
@@ -307,8 +304,7 @@ in quotation
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -459,8 +455,7 @@ in quotation
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           ],
@@ -581,8 +576,7 @@ ignored ',
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 28,
-                    'macro' => ''
+                    'line_nr' => 28
                   }
                 }
               ],
@@ -711,8 +705,7 @@ args \\e\\|\\f\\|
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 35,
-                    'macro' => ''
+                    'line_nr' => 35
                   }
                 }
               ],
@@ -988,15 +981,13 @@ args \\e\\|\\f\\|
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 39,
-                'macro' => ''
+                'line_nr' => 39
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 37,
-            'macro' => ''
+            'line_nr' => 37
           }
         },
         {
diff --git a/tp/t/results/linemacro/blockitem_no_item.pl 
b/tp/t/results/linemacro/blockitem_no_item.pl
index 5076b32bba..fe4cfe6101 100644
--- a/tp/t/results/linemacro/blockitem_no_item.pl
+++ b/tp/t/results/linemacro/blockitem_no_item.pl
@@ -63,8 +63,7 @@ $result_trees{'blockitem_no_item'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -74,8 +73,7 @@ $result_trees{'blockitem_no_item'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -223,8 +221,7 @@ $result_trees{'blockitem_no_item'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
@@ -256,7 +253,6 @@ $result_errors{'blockitem_no_item'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@itemize has text but no @item',
     'type' => 'warning'
   }
diff --git a/tp/t/results/linemacro/brace_command_not_closed.pl 
b/tp/t/results/linemacro/brace_command_not_closed.pl
index 7b995a012f..143649a421 100644
--- a/tp/t/results/linemacro/brace_command_not_closed.pl
+++ b/tp/t/results/linemacro/brace_command_not_closed.pl
@@ -63,8 +63,7 @@ $result_trees{'brace_command_not_closed'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -74,8 +73,7 @@ $result_trees{'brace_command_not_closed'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -185,7 +183,6 @@ $result_errors{'brace_command_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => '@mycommand missing closing brace',
     'type' => 'error'
   },
diff --git a/tp/t/results/linemacro/braces_after_text.pl 
b/tp/t/results/linemacro/braces_after_text.pl
index 1e5c1fd091..e3129ed476 100644
--- a/tp/t/results/linemacro/braces_after_text.pl
+++ b/tp/t/results/linemacro/braces_after_text.pl
@@ -63,8 +63,7 @@ $result_trees{'braces_after_text'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -74,8 +73,7 @@ $result_trees{'braces_after_text'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -280,15 +278,13 @@ $result_trees{'braces_after_text'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
diff --git a/tp/t/results/linemacro/call_macro_in_linemacro_body.pl 
b/tp/t/results/linemacro/call_macro_in_linemacro_body.pl
index 81f06363df..e0cbf8e84c 100644
--- a/tp/t/results/linemacro/call_macro_in_linemacro_body.pl
+++ b/tp/t/results/linemacro/call_macro_in_linemacro_body.pl
@@ -69,8 +69,7 @@ $result_trees{'call_macro_in_linemacro_body'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -80,8 +79,7 @@ $result_trees{'call_macro_in_linemacro_body'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -149,8 +147,7 @@ $result_trees{'call_macro_in_linemacro_body'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
@@ -160,8 +157,7 @@ $result_trees{'call_macro_in_linemacro_body'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
diff --git a/tp/t/results/linemacro/call_macro_in_linemacro_call.pl 
b/tp/t/results/linemacro/call_macro_in_linemacro_call.pl
index 90dfc354a3..08c65dad14 100644
--- a/tp/t/results/linemacro/call_macro_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/call_macro_in_linemacro_call.pl
@@ -64,8 +64,7 @@ $result_trees{'call_macro_in_linemacro_call'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -75,8 +74,7 @@ $result_trees{'call_macro_in_linemacro_call'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -144,8 +142,7 @@ $result_trees{'call_macro_in_linemacro_call'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
@@ -155,8 +152,7 @@ $result_trees{'call_macro_in_linemacro_call'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -462,8 +458,7 @@ $result_trees{'call_macro_in_linemacro_call'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             }
           ],
diff --git a/tp/t/results/linemacro/comment_at_end_of_linemacro_call.pl 
b/tp/t/results/linemacro/comment_at_end_of_linemacro_call.pl
index 416ae0ea19..b80f1c190c 100644
--- a/tp/t/results/linemacro/comment_at_end_of_linemacro_call.pl
+++ b/tp/t/results/linemacro/comment_at_end_of_linemacro_call.pl
@@ -64,8 +64,7 @@ $result_trees{'comment_at_end_of_linemacro_call'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -75,8 +74,7 @@ $result_trees{'comment_at_end_of_linemacro_call'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -168,8 +166,7 @@ $result_trees{'comment_at_end_of_linemacro_call'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
diff --git a/tp/t/results/linemacro/comment_in_linemacro_call.pl 
b/tp/t/results/linemacro/comment_in_linemacro_call.pl
index 1ac5695309..8cfce8bebe 100644
--- a/tp/t/results/linemacro/comment_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/comment_in_linemacro_call.pl
@@ -64,8 +64,7 @@ $result_trees{'comment_in_linemacro_call'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -75,8 +74,7 @@ $result_trees{'comment_in_linemacro_call'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/linemacro/comment_in_one_argument_linemacro_call.pl 
b/tp/t/results/linemacro/comment_in_one_argument_linemacro_call.pl
index cc94865a0d..d20e178982 100644
--- a/tp/t/results/linemacro/comment_in_one_argument_linemacro_call.pl
+++ b/tp/t/results/linemacro/comment_in_one_argument_linemacro_call.pl
@@ -55,8 +55,7 @@ $result_trees{'comment_in_one_argument_linemacro_call'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -66,8 +65,7 @@ $result_trees{'comment_in_one_argument_linemacro_call'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git 
a/tp/t/results/linemacro/comment_on_linemacro_call_macro_expansion.pl 
b/tp/t/results/linemacro/comment_on_linemacro_call_macro_expansion.pl
index c02f071578..1749b04297 100644
--- a/tp/t/results/linemacro/comment_on_linemacro_call_macro_expansion.pl
+++ b/tp/t/results/linemacro/comment_on_linemacro_call_macro_expansion.pl
@@ -64,8 +64,7 @@ $result_trees{'comment_on_linemacro_call_macro_expansion'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -75,8 +74,7 @@ $result_trees{'comment_on_linemacro_call_macro_expansion'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -135,8 +133,7 @@ $result_trees{'comment_on_linemacro_call_macro_expansion'} 
= {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
@@ -146,8 +143,7 @@ $result_trees{'comment_on_linemacro_call_macro_expansion'} 
= {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
diff --git a/tp/t/results/linemacro/comment_on_linemacro_call_out_of_braces.pl 
b/tp/t/results/linemacro/comment_on_linemacro_call_out_of_braces.pl
index b01f1683d5..53ac273c79 100644
--- a/tp/t/results/linemacro/comment_on_linemacro_call_out_of_braces.pl
+++ b/tp/t/results/linemacro/comment_on_linemacro_call_out_of_braces.pl
@@ -73,8 +73,7 @@ $result_trees{'comment_on_linemacro_call_out_of_braces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -84,8 +83,7 @@ $result_trees{'comment_on_linemacro_call_out_of_braces'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/linemacro/empty_last_argument.pl 
b/tp/t/results/linemacro/empty_last_argument.pl
index 29271f553c..9bcb02dcd8 100644
--- a/tp/t/results/linemacro/empty_last_argument.pl
+++ b/tp/t/results/linemacro/empty_last_argument.pl
@@ -39,8 +39,7 @@ $result_trees{'empty_last_argument'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -98,8 +97,7 @@ $result_trees{'empty_last_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -109,8 +107,7 @@ $result_trees{'empty_last_argument'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -602,15 +599,13 @@ $result_trees{'empty_last_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         }
       ],
diff --git a/tp/t/results/linemacro/end_conditional_in_linemacro.pl 
b/tp/t/results/linemacro/end_conditional_in_linemacro.pl
index ea15768eca..787652555f 100644
--- a/tp/t/results/linemacro/end_conditional_in_linemacro.pl
+++ b/tp/t/results/linemacro/end_conditional_in_linemacro.pl
@@ -55,8 +55,7 @@ $result_trees{'end_conditional_in_linemacro'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -66,8 +65,7 @@ $result_trees{'end_conditional_in_linemacro'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -99,8 +97,7 @@ $result_trees{'end_conditional_in_linemacro'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 5,
-                  'macro' => ''
+                  'line_nr' => 5
                 }
               },
               'position' => 1,
@@ -256,8 +253,7 @@ $result_trees{'end_conditional_in_linemacro'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 11,
-                      'macro' => ''
+                      'line_nr' => 11
                     }
                   }
                 ],
@@ -268,8 +264,7 @@ $result_trees{'end_conditional_in_linemacro'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 9,
-                  'macro' => ''
+                  'line_nr' => 9
                 }
               },
               'position' => 1,
@@ -314,7 +309,6 @@ $result_errors{'end_conditional_in_linemacro'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/linemacro/last_argument_with_braces.pl 
b/tp/t/results/linemacro/last_argument_with_braces.pl
index 382dee0b0c..7706290adf 100644
--- a/tp/t/results/linemacro/last_argument_with_braces.pl
+++ b/tp/t/results/linemacro/last_argument_with_braces.pl
@@ -64,8 +64,7 @@ $result_trees{'last_argument_with_braces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -75,8 +74,7 @@ $result_trees{'last_argument_with_braces'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -901,15 +899,13 @@ $result_trees{'last_argument_with_braces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         }
       ],
diff --git a/tp/t/results/linemacro/missing_formal_arg.pl 
b/tp/t/results/linemacro/missing_formal_arg.pl
index a48a18c2b9..970db4d310 100644
--- a/tp/t/results/linemacro/missing_formal_arg.pl
+++ b/tp/t/results/linemacro/missing_formal_arg.pl
@@ -63,8 +63,7 @@ $result_trees{'missing_formal_arg'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -77,8 +76,7 @@ $result_trees{'missing_formal_arg'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -124,7 +122,6 @@ $result_errors{'missing_formal_arg'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'bad or empty @linemacro formal argument: ',
     'type' => 'error'
   },
@@ -133,7 +130,6 @@ $result_errors{'missing_formal_arg'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'unknown command `mymacro\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/linemacro/nested_linemacro_calls.pl 
b/tp/t/results/linemacro/nested_linemacro_calls.pl
index 1c86b81305..3074abe8b2 100644
--- a/tp/t/results/linemacro/nested_linemacro_calls.pl
+++ b/tp/t/results/linemacro/nested_linemacro_calls.pl
@@ -59,8 +59,7 @@ $result_trees{'nested_linemacro_calls'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -70,8 +69,7 @@ $result_trees{'nested_linemacro_calls'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -138,8 +136,7 @@ $result_trees{'nested_linemacro_calls'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
@@ -149,8 +146,7 @@ $result_trees{'nested_linemacro_calls'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -547,15 +543,13 @@ $result_trees{'nested_linemacro_calls'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         }
       ],
@@ -647,7 +641,6 @@ $result_errors{'nested_linemacro_calls'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/linemacro/newline_and_continuation_in_brace.pl 
b/tp/t/results/linemacro/newline_and_continuation_in_brace.pl
index b9e768cbb2..ee30ca3f6e 100644
--- a/tp/t/results/linemacro/newline_and_continuation_in_brace.pl
+++ b/tp/t/results/linemacro/newline_and_continuation_in_brace.pl
@@ -68,8 +68,7 @@ $result_trees{'newline_and_continuation_in_brace'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -79,8 +78,7 @@ $result_trees{'newline_and_continuation_in_brace'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -366,15 +364,13 @@ $result_trees{'newline_and_continuation_in_brace'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         }
       ],
diff --git a/tp/t/results/linemacro/no_arguments.pl 
b/tp/t/results/linemacro/no_arguments.pl
index b2ddfc58dc..d689178c90 100644
--- a/tp/t/results/linemacro/no_arguments.pl
+++ b/tp/t/results/linemacro/no_arguments.pl
@@ -51,8 +51,7 @@ $result_trees{'no_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'no_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/linemacro/paragraph_no_paragraph.pl 
b/tp/t/results/linemacro/paragraph_no_paragraph.pl
index 0ab871d5ed..557c5c4b2b 100644
--- a/tp/t/results/linemacro/paragraph_no_paragraph.pl
+++ b/tp/t/results/linemacro/paragraph_no_paragraph.pl
@@ -63,8 +63,7 @@ $result_trees{'paragraph_no_paragraph'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -74,8 +73,7 @@ $result_trees{'paragraph_no_paragraph'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/linemacro/protected_spaces_on_line.pl 
b/tp/t/results/linemacro/protected_spaces_on_line.pl
index 9cc78b816f..11eac65dba 100644
--- a/tp/t/results/linemacro/protected_spaces_on_line.pl
+++ b/tp/t/results/linemacro/protected_spaces_on_line.pl
@@ -69,8 +69,7 @@ $result_trees{'protected_spaces_on_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -80,8 +79,7 @@ $result_trees{'protected_spaces_on_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/linemacro/protection_of_end_of_line_by_command.pl 
b/tp/t/results/linemacro/protection_of_end_of_line_by_command.pl
index 75ba133dac..e1631a8f70 100644
--- a/tp/t/results/linemacro/protection_of_end_of_line_by_command.pl
+++ b/tp/t/results/linemacro/protection_of_end_of_line_by_command.pl
@@ -55,8 +55,7 @@ $result_trees{'protection_of_end_of_line_by_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -66,8 +65,7 @@ $result_trees{'protection_of_end_of_line_by_command'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/linemacro/recursive_linemacro_in_body.pl 
b/tp/t/results/linemacro/recursive_linemacro_in_body.pl
index e670472771..3e028e72f8 100644
--- a/tp/t/results/linemacro/recursive_linemacro_in_body.pl
+++ b/tp/t/results/linemacro/recursive_linemacro_in_body.pl
@@ -59,8 +59,7 @@ $result_trees{'recursive_linemacro_in_body'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -70,8 +69,7 @@ $result_trees{'recursive_linemacro_in_body'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/linemacro/recursive_linemacro_in_call.pl 
b/tp/t/results/linemacro/recursive_linemacro_in_call.pl
index 98c0c24ba3..11f87ff427 100644
--- a/tp/t/results/linemacro/recursive_linemacro_in_call.pl
+++ b/tp/t/results/linemacro/recursive_linemacro_in_call.pl
@@ -59,8 +59,7 @@ $result_trees{'recursive_linemacro_in_call'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -70,8 +69,7 @@ $result_trees{'recursive_linemacro_in_call'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/linemacro/simple_nested_linemacro_calls.pl 
b/tp/t/results/linemacro/simple_nested_linemacro_calls.pl
index 3e370608b5..29150f308e 100644
--- a/tp/t/results/linemacro/simple_nested_linemacro_calls.pl
+++ b/tp/t/results/linemacro/simple_nested_linemacro_calls.pl
@@ -88,8 +88,7 @@ $result_trees{'simple_nested_linemacro_calls'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -99,8 +98,7 @@ $result_trees{'simple_nested_linemacro_calls'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -167,8 +165,7 @@ $result_trees{'simple_nested_linemacro_calls'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
@@ -178,8 +175,7 @@ $result_trees{'simple_nested_linemacro_calls'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -574,15 +570,13 @@ $result_trees{'simple_nested_linemacro_calls'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           }
         }
       ],
@@ -597,8 +591,7 @@ $result_trees{'simple_nested_linemacro_calls'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
diff --git a/tp/t/results/linemacro/spaces_after_command_in_call.pl 
b/tp/t/results/linemacro/spaces_after_command_in_call.pl
index e3d92deb68..0e5a6ada7b 100644
--- a/tp/t/results/linemacro/spaces_after_command_in_call.pl
+++ b/tp/t/results/linemacro/spaces_after_command_in_call.pl
@@ -73,8 +73,7 @@ $result_trees{'spaces_after_command_in_call'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -84,8 +83,7 @@ $result_trees{'spaces_after_command_in_call'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git 
a/tp/t/results/linemacro/spaces_after_macro_linemacro_commands_in_call.pl 
b/tp/t/results/linemacro/spaces_after_macro_linemacro_commands_in_call.pl
index 490a2d85d2..88a52afe60 100644
--- a/tp/t/results/linemacro/spaces_after_macro_linemacro_commands_in_call.pl
+++ b/tp/t/results/linemacro/spaces_after_macro_linemacro_commands_in_call.pl
@@ -73,8 +73,7 @@ 
$result_trees{'spaces_after_macro_linemacro_commands_in_call'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -84,8 +83,7 @@ 
$result_trees{'spaces_after_macro_linemacro_commands_in_call'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -139,8 +137,7 @@ 
$result_trees{'spaces_after_macro_linemacro_commands_in_call'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
@@ -150,8 +147,7 @@ 
$result_trees{'spaces_after_macro_linemacro_commands_in_call'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -209,8 +205,7 @@ 
$result_trees{'spaces_after_macro_linemacro_commands_in_call'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             }
           ],
@@ -220,8 +215,7 @@ 
$result_trees{'spaces_after_macro_linemacro_commands_in_call'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
diff --git a/tp/t/results/linemacro/spaces_after_unknown_command_in_call.pl 
b/tp/t/results/linemacro/spaces_after_unknown_command_in_call.pl
index e7555b07d0..fdff22ae8a 100644
--- a/tp/t/results/linemacro/spaces_after_unknown_command_in_call.pl
+++ b/tp/t/results/linemacro/spaces_after_unknown_command_in_call.pl
@@ -73,8 +73,7 @@ $result_trees{'spaces_after_unknown_command_in_call'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -84,8 +83,7 @@ $result_trees{'spaces_after_unknown_command_in_call'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/linemacro/spaces_in_args.pl 
b/tp/t/results/linemacro/spaces_in_args.pl
index f3039cb796..9a22895af8 100644
--- a/tp/t/results/linemacro/spaces_in_args.pl
+++ b/tp/t/results/linemacro/spaces_in_args.pl
@@ -73,8 +73,7 @@ $result_trees{'spaces_in_args'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -84,8 +83,7 @@ $result_trees{'spaces_in_args'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/linemacro/spaces_in_call.pl 
b/tp/t/results/linemacro/spaces_in_call.pl
index d126fccea8..4e7f57d5b4 100644
--- a/tp/t/results/linemacro/spaces_in_call.pl
+++ b/tp/t/results/linemacro/spaces_in_call.pl
@@ -73,8 +73,7 @@ $result_trees{'spaces_in_call'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -84,8 +83,7 @@ $result_trees{'spaces_in_call'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/linemacro/text_arguments.pl 
b/tp/t/results/linemacro/text_arguments.pl
index 7f65d5f3e5..a6ceb8def1 100644
--- a/tp/t/results/linemacro/text_arguments.pl
+++ b/tp/t/results/linemacro/text_arguments.pl
@@ -63,8 +63,7 @@ $result_trees{'text_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -74,8 +73,7 @@ $result_trees{'text_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/linemacro/verb_in_linemacro_call.pl 
b/tp/t/results/linemacro/verb_in_linemacro_call.pl
index 0e8d140c56..26ffdaf7a1 100644
--- a/tp/t/results/linemacro/verb_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/verb_in_linemacro_call.pl
@@ -82,8 +82,7 @@ $result_trees{'verb_in_linemacro_call'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -93,8 +92,7 @@ $result_trees{'verb_in_linemacro_call'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -365,15 +363,13 @@ $result_trees{'verb_in_linemacro_call'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         }
       ],
diff --git a/tp/t/results/linemacro/verb_not_closed.pl 
b/tp/t/results/linemacro/verb_not_closed.pl
index 55a72b678c..9bfcf40258 100644
--- a/tp/t/results/linemacro/verb_not_closed.pl
+++ b/tp/t/results/linemacro/verb_not_closed.pl
@@ -63,8 +63,7 @@ $result_trees{'verb_not_closed'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -74,8 +73,7 @@ $result_trees{'verb_not_closed'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -185,7 +183,6 @@ $result_errors{'verb_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => '@mycommand missing closing brace',
     'type' => 'error'
   },
diff --git a/tp/t/results/linemacro/verb_with_arobase_in_linemacro_call.pl 
b/tp/t/results/linemacro/verb_with_arobase_in_linemacro_call.pl
index 90303b8e0d..a450318bc6 100644
--- a/tp/t/results/linemacro/verb_with_arobase_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/verb_with_arobase_in_linemacro_call.pl
@@ -63,8 +63,7 @@ $result_trees{'verb_with_arobase_in_linemacro_call'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -74,8 +73,7 @@ $result_trees{'verb_with_arobase_in_linemacro_call'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -179,7 +177,6 @@ $result_errors{'verb_with_arobase_in_linemacro_call'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@mycommand missing closing brace',
     'type' => 'error'
   }
diff --git a/tp/t/results/linemacro/verb_with_brace_in_linemacro_call.pl 
b/tp/t/results/linemacro/verb_with_brace_in_linemacro_call.pl
index d3001ca196..470e3c306f 100644
--- a/tp/t/results/linemacro/verb_with_brace_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/verb_with_brace_in_linemacro_call.pl
@@ -63,8 +63,7 @@ $result_trees{'verb_with_brace_in_linemacro_call'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -74,8 +73,7 @@ $result_trees{'verb_with_brace_in_linemacro_call'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/macro/arg_body_expansion_order.pl 
b/tp/t/results/macro/arg_body_expansion_order.pl
index 24a6b54070..386a777082 100644
--- a/tp/t/results/macro/arg_body_expansion_order.pl
+++ b/tp/t/results/macro/arg_body_expansion_order.pl
@@ -56,8 +56,7 @@ $result_trees{'arg_body_expansion_order'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -67,8 +66,7 @@ $result_trees{'arg_body_expansion_order'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -142,8 +140,7 @@ $result_trees{'arg_body_expansion_order'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
@@ -153,8 +150,7 @@ $result_trees{'arg_body_expansion_order'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
diff --git a/tp/t/results/macro/arg_not_closed.pl 
b/tp/t/results/macro/arg_not_closed.pl
index ce356c90d0..c3483e2ecf 100644
--- a/tp/t/results/macro/arg_not_closed.pl
+++ b/tp/t/results/macro/arg_not_closed.pl
@@ -55,8 +55,7 @@ $result_trees{'arg_not_closed'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -66,8 +65,7 @@ $result_trees{'arg_not_closed'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -143,7 +141,6 @@ $result_errors{'arg_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@foo missing closing brace',
     'type' => 'error'
   }
diff --git a/tp/t/results/macro/arobase_brace_in_macro_call.pl 
b/tp/t/results/macro/arobase_brace_in_macro_call.pl
index 4a1ac326d0..639e171f05 100644
--- a/tp/t/results/macro/arobase_brace_in_macro_call.pl
+++ b/tp/t/results/macro/arobase_brace_in_macro_call.pl
@@ -64,8 +64,7 @@ $result_trees{'arobase_brace_in_macro_call'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -75,8 +74,7 @@ $result_trees{'arobase_brace_in_macro_call'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -252,7 +250,6 @@ $result_errors{'arobase_brace_in_macro_call'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/macro/backslash_in_arg.pl 
b/tp/t/results/macro/backslash_in_arg.pl
index 9a22b1c16a..f55ea027a8 100644
--- a/tp/t/results/macro/backslash_in_arg.pl
+++ b/tp/t/results/macro/backslash_in_arg.pl
@@ -39,8 +39,7 @@ $result_trees{'backslash_in_arg'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -113,8 +112,7 @@ $result_trees{'backslash_in_arg'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -124,8 +122,7 @@ $result_trees{'backslash_in_arg'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -446,8 +443,7 @@ $result_trees{'backslash_in_arg'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           }
         }
       ],
@@ -463,8 +459,7 @@ $result_trees{'backslash_in_arg'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
diff --git a/tp/t/results/macro/bad_argument.pl 
b/tp/t/results/macro/bad_argument.pl
index 9707b8c8e3..1e9d0947b9 100644
--- a/tp/t/results/macro/bad_argument.pl
+++ b/tp/t/results/macro/bad_argument.pl
@@ -45,8 +45,7 @@ $result_trees{'bad_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -59,8 +58,7 @@ $result_trees{'bad_argument'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -110,8 +108,7 @@ $result_trees{'bad_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -124,8 +121,7 @@ $result_trees{'bad_argument'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -179,8 +175,7 @@ $result_trees{'bad_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
@@ -193,8 +188,7 @@ $result_trees{'bad_argument'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -238,8 +232,7 @@ $result_trees{'bad_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
@@ -252,8 +245,7 @@ $result_trees{'bad_argument'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         }
       ],
@@ -292,7 +284,6 @@ $result_errors{'bad_argument'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@macro requires a name',
     'type' => 'error'
   },
@@ -301,7 +292,6 @@ $result_errors{'bad_argument'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'bad syntax for @rmacro argument: aaa',
     'type' => 'error'
   },
@@ -310,7 +300,6 @@ $result_errors{'bad_argument'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'bad syntax for @macro argument: more  ',
     'type' => 'error'
   },
@@ -319,7 +308,6 @@ $result_errors{'bad_argument'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => '@macro requires a name',
     'type' => 'error'
   }
diff --git a/tp/t/results/macro/bad_formal_arg.pl 
b/tp/t/results/macro/bad_formal_arg.pl
index 09fec5ecb0..8574e4584e 100644
--- a/tp/t/results/macro/bad_formal_arg.pl
+++ b/tp/t/results/macro/bad_formal_arg.pl
@@ -64,8 +64,7 @@ $result_trees{'bad_formal_arg'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -78,8 +77,7 @@ $result_trees{'bad_formal_arg'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -137,8 +135,7 @@ $result_trees{'bad_formal_arg'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
@@ -151,8 +148,7 @@ $result_trees{'bad_formal_arg'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -221,8 +217,7 @@ $result_trees{'bad_formal_arg'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
@@ -235,8 +230,7 @@ $result_trees{'bad_formal_arg'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         }
       ],
@@ -275,7 +269,6 @@ $result_errors{'bad_formal_arg'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'bad or empty @macro formal argument: ',
     'type' => 'error'
   },
@@ -284,7 +277,6 @@ $result_errors{'bad_formal_arg'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'bad or empty @macro formal argument: in 2arg',
     'type' => 'error'
   },
@@ -293,7 +285,6 @@ $result_errors{'bad_formal_arg'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => 'bad or empty @macro formal argument: :::',
     'type' => 'error'
   }
diff --git a/tp/t/results/macro/bad_macro_name_with_underscore.pl 
b/tp/t/results/macro/bad_macro_name_with_underscore.pl
index c31b1deaf9..35a8940f6b 100644
--- a/tp/t/results/macro/bad_macro_name_with_underscore.pl
+++ b/tp/t/results/macro/bad_macro_name_with_underscore.pl
@@ -59,8 +59,7 @@ $result_trees{'bad_macro_name_with_underscore'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -70,8 +69,7 @@ $result_trees{'bad_macro_name_with_underscore'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/macro/bib_example.pl 
b/tp/t/results/macro/bib_example.pl
index 78c7142d9a..4779384247 100644
--- a/tp/t/results/macro/bib_example.pl
+++ b/tp/t/results/macro/bib_example.pl
@@ -231,8 +231,7 @@ $result_trees{'bib_example'} = {
               },
               'source_info' => {
                 'file_name' => 'bib-example.texi',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -267,8 +266,7 @@ $result_trees{'bib_example'} = {
                     },
                     'source_info' => {
                       'file_name' => 'bib-example.texi',
-                      'line_nr' => 25,
-                      'macro' => ''
+                      'line_nr' => 25
                     }
                   },
                   'position' => 1,
@@ -1786,8 +1784,7 @@ $result_trees{'bib_example'} = {
                   },
                   'source_info' => {
                     'file_name' => 'my-bib-macros.texi',
-                    'line_nr' => 164,
-                    'macro' => ''
+                    'line_nr' => 164
                   }
                 }
               ],
@@ -1797,8 +1794,7 @@ $result_trees{'bib_example'} = {
               },
               'source_info' => {
                 'file_name' => 'my-bib-macros.texi',
-                'line_nr' => 162,
-                'macro' => ''
+                'line_nr' => 162
               }
             },
             {
@@ -1873,8 +1869,7 @@ $result_trees{'bib_example'} = {
                   },
                   'source_info' => {
                     'file_name' => 'my-bib-macros.texi',
-                    'line_nr' => 171,
-                    'macro' => ''
+                    'line_nr' => 171
                   }
                 }
               ],
@@ -1884,8 +1879,7 @@ $result_trees{'bib_example'} = {
               },
               'source_info' => {
                 'file_name' => 'my-bib-macros.texi',
-                'line_nr' => 169,
-                'macro' => ''
+                'line_nr' => 169
               }
             },
             {
@@ -1984,8 +1978,7 @@ $result_trees{'bib_example'} = {
                   },
                   'source_info' => {
                     'file_name' => 'my-bib-macros.texi',
-                    'line_nr' => 182,
-                    'macro' => ''
+                    'line_nr' => 182
                   }
                 }
               ],
@@ -1995,8 +1988,7 @@ $result_trees{'bib_example'} = {
               },
               'source_info' => {
                 'file_name' => 'my-bib-macros.texi',
-                'line_nr' => 176,
-                'macro' => ''
+                'line_nr' => 176
               }
             },
             {
@@ -2095,8 +2087,7 @@ $result_trees{'bib_example'} = {
                   },
                   'source_info' => {
                     'file_name' => 'my-bib-macros.texi',
-                    'line_nr' => 193,
-                    'macro' => ''
+                    'line_nr' => 193
                   }
                 }
               ],
@@ -2106,8 +2097,7 @@ $result_trees{'bib_example'} = {
               },
               'source_info' => {
                 'file_name' => 'my-bib-macros.texi',
-                'line_nr' => 187,
-                'macro' => ''
+                'line_nr' => 187
               }
             },
             {
@@ -2216,8 +2206,7 @@ $result_trees{'bib_example'} = {
                   },
                   'source_info' => {
                     'file_name' => 'my-bib-macros.texi',
-                    'line_nr' => 207,
-                    'macro' => ''
+                    'line_nr' => 207
                   }
                 }
               ],
@@ -2227,8 +2216,7 @@ $result_trees{'bib_example'} = {
               },
               'source_info' => {
                 'file_name' => 'my-bib-macros.texi',
-                'line_nr' => 198,
-                'macro' => ''
+                'line_nr' => 198
               }
             },
             {
@@ -2286,8 +2274,7 @@ $result_trees{'bib_example'} = {
                   },
                   'source_info' => {
                     'file_name' => 'my-bib-macros.texi',
-                    'line_nr' => 211,
-                    'macro' => ''
+                    'line_nr' => 211
                   }
                 }
               ],
@@ -2297,8 +2284,7 @@ $result_trees{'bib_example'} = {
               },
               'source_info' => {
                 'file_name' => 'my-bib-macros.texi',
-                'line_nr' => 209,
-                'macro' => ''
+                'line_nr' => 209
               }
             },
             {
@@ -2432,8 +2418,7 @@ $result_trees{'bib_example'} = {
                   },
                   'source_info' => {
                     'file_name' => 'my-bib-macros.texi',
-                    'line_nr' => 230,
-                    'macro' => ''
+                    'line_nr' => 230
                   }
                 }
               ],
@@ -2443,8 +2428,7 @@ $result_trees{'bib_example'} = {
               },
               'source_info' => {
                 'file_name' => 'my-bib-macros.texi',
-                'line_nr' => 215,
-                'macro' => ''
+                'line_nr' => 215
               }
             },
             {
@@ -2684,8 +2668,7 @@ $result_trees{'bib_example'} = {
       },
       'source_info' => {
         'file_name' => 'bib-example.texi',
-        'line_nr' => 30,
-        'macro' => ''
+        'line_nr' => 30
       }
     },
     {
@@ -2769,8 +2752,7 @@ $result_trees{'bib_example'} = {
               ],
               'source_info' => {
                 'file_name' => 'bib-example.texi',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               },
               'type' => 'menu_entry'
             },
@@ -2866,8 +2848,7 @@ $result_trees{'bib_example'} = {
               ],
               'source_info' => {
                 'file_name' => 'bib-example.texi',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               },
               'type' => 'menu_entry'
             },
@@ -2914,15 +2895,13 @@ $result_trees{'bib_example'} = {
               },
               'source_info' => {
                 'file_name' => 'bib-example.texi',
-                'line_nr' => 37,
-                'macro' => ''
+                'line_nr' => 37
               }
             }
           ],
           'source_info' => {
             'file_name' => 'bib-example.texi',
-            'line_nr' => 33,
-            'macro' => ''
+            'line_nr' => 33
           }
         },
         {
@@ -2939,8 +2918,7 @@ $result_trees{'bib_example'} = {
       },
       'source_info' => {
         'file_name' => 'bib-example.texi',
-        'line_nr' => 31,
-        'macro' => ''
+        'line_nr' => 31
       }
     },
     {
@@ -2972,8 +2950,7 @@ $result_trees{'bib_example'} = {
       },
       'source_info' => {
         'file_name' => 'bib-example.texi',
-        'line_nr' => 39,
-        'macro' => ''
+        'line_nr' => 39
       }
     },
     {
@@ -3366,8 +3343,7 @@ $result_trees{'bib_example'} = {
       },
       'source_info' => {
         'file_name' => 'bib-example.texi',
-        'line_nr' => 40,
-        'macro' => ''
+        'line_nr' => 40
       }
     },
     {
@@ -3452,8 +3428,7 @@ $result_trees{'bib_example'} = {
       },
       'source_info' => {
         'file_name' => 'bib-example.texi',
-        'line_nr' => 46,
-        'macro' => ''
+        'line_nr' => 46
       }
     },
     {
@@ -3493,8 +3468,7 @@ $result_trees{'bib_example'} = {
                   'cmdname' => 'w',
                   'source_info' => {
                     'file_name' => 'bib-example.texi',
-                    'line_nr' => 49,
-                    'macro' => ''
+                    'line_nr' => 49
                   },
                   'type' => 'command_as_argument'
                 }
@@ -3921,8 +3895,7 @@ $result_trees{'bib_example'} = {
               },
               'source_info' => {
                 'file_name' => 'bib-example.texi',
-                'line_nr' => 55,
-                'macro' => ''
+                'line_nr' => 55
               }
             }
           ],
@@ -3936,8 +3909,7 @@ $result_trees{'bib_example'} = {
           },
           'source_info' => {
             'file_name' => 'bib-example.texi',
-            'line_nr' => 49,
-            'macro' => ''
+            'line_nr' => 49
           }
         },
         {
@@ -3956,8 +3928,7 @@ $result_trees{'bib_example'} = {
       },
       'source_info' => {
         'file_name' => 'bib-example.texi',
-        'line_nr' => 47,
-        'macro' => ''
+        'line_nr' => 47
       }
     },
     {
diff --git a/tp/t/results/macro/bye_in_macro.pl 
b/tp/t/results/macro/bye_in_macro.pl
index 81bf0549c6..bb51d9cdce 100644
--- a/tp/t/results/macro/bye_in_macro.pl
+++ b/tp/t/results/macro/bye_in_macro.pl
@@ -66,8 +66,7 @@ $result_trees{'bye_in_macro'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -77,8 +76,7 @@ $result_trees{'bye_in_macro'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git 
a/tp/t/results/macro/closing_brace_in_macro_call_in_ignored_inline.pl 
b/tp/t/results/macro/closing_brace_in_macro_call_in_ignored_inline.pl
index 9ea3b5530b..ed3d220141 100644
--- a/tp/t/results/macro/closing_brace_in_macro_call_in_ignored_inline.pl
+++ b/tp/t/results/macro/closing_brace_in_macro_call_in_ignored_inline.pl
@@ -51,8 +51,7 @@ 
$result_trees{'closing_brace_in_macro_call_in_ignored_inline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ 
$result_trees{'closing_brace_in_macro_call_in_ignored_inline'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -124,8 +122,7 @@ 
$result_trees{'closing_brace_in_macro_call_in_ignored_inline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'source_marks' => [
                 {
@@ -182,8 +179,7 @@ after
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
@@ -222,7 +218,6 @@ 
$result_errors{'closing_brace_in_macro_call_in_ignored_inline'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@inlinefmt missing closing brace',
     'type' => 'error'
   }
diff --git a/tp/t/results/macro/complete_macro_for_end.pl 
b/tp/t/results/macro/complete_macro_for_end.pl
index 946ada1053..2cbc6bfbb3 100644
--- a/tp/t/results/macro/complete_macro_for_end.pl
+++ b/tp/t/results/macro/complete_macro_for_end.pl
@@ -51,8 +51,7 @@ $result_trees{'complete_macro_for_end'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'complete_macro_for_end'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -143,8 +141,7 @@ $result_trees{'complete_macro_for_end'} = {
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
diff --git a/tp/t/results/macro/complex_argument.pl 
b/tp/t/results/macro/complex_argument.pl
index 46af4437f8..f009d32df1 100644
--- a/tp/t/results/macro/complex_argument.pl
+++ b/tp/t/results/macro/complex_argument.pl
@@ -55,8 +55,7 @@ $result_trees{'complex_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -66,8 +65,7 @@ $result_trees{'complex_argument'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -132,8 +130,7 @@ $result_trees{'complex_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
@@ -143,8 +140,7 @@ $result_trees{'complex_argument'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -207,8 +203,7 @@ $result_trees{'complex_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
@@ -218,8 +213,7 @@ $result_trees{'complex_argument'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           }
         },
         {
@@ -984,7 +978,6 @@ $result_errors{'complex_argument'} = [
 ',
     'file_name' => '',
     'line_nr' => 35,
-    'macro' => '',
     'text' => 'use @comma{} instead of \\, in macro arg',
     'type' => 'warning'
   },
diff --git a/tp/t/results/macro/cpp_directives_after_macros.pl 
b/tp/t/results/macro/cpp_directives_after_macros.pl
index e7b7528159..24e47291aa 100644
--- a/tp/t/results/macro/cpp_directives_after_macros.pl
+++ b/tp/t/results/macro/cpp_directives_after_macros.pl
@@ -63,8 +63,7 @@ $result_trees{'cpp_directives_after_macros'} = {
                   },
                   'source_info' => {
                     'file_name' => 'cpp_directives_after_macros.texi',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 }
               ],
@@ -74,8 +73,7 @@ $result_trees{'cpp_directives_after_macros'} = {
               },
               'source_info' => {
                 'file_name' => 'cpp_directives_after_macros.texi',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -125,8 +123,7 @@ $result_trees{'cpp_directives_after_macros'} = {
                   },
                   'source_info' => {
                     'file_name' => 'cpp_directives_after_macros.texi',
-                    'line_nr' => 8,
-                    'macro' => ''
+                    'line_nr' => 8
                   }
                 }
               ],
@@ -136,8 +133,7 @@ $result_trees{'cpp_directives_after_macros'} = {
               },
               'source_info' => {
                 'file_name' => 'cpp_directives_after_macros.texi',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -294,7 +290,6 @@ $result_errors{'cpp_directives_after_macros'} = [
 ',
     'file_name' => 'a_test_after_spaces',
     'line_nr' => 102,
-    'macro' => '',
     'text' => 'unknown command `unknown1\'',
     'type' => 'error'
   },
@@ -303,7 +298,6 @@ $result_errors{'cpp_directives_after_macros'} = [
 ',
     'file_name' => 'a_test_after_spaces',
     'line_nr' => 106,
-    'macro' => '',
     'text' => 'unknown command `unknown2\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/macro/cpp_directives_in_macro.pl 
b/tp/t/results/macro/cpp_directives_in_macro.pl
index c71fa85732..aac7421cbf 100644
--- a/tp/t/results/macro/cpp_directives_in_macro.pl
+++ b/tp/t/results/macro/cpp_directives_in_macro.pl
@@ -67,8 +67,7 @@ $result_trees{'cpp_directives_in_macro'} = {
                   },
                   'source_info' => {
                     'file_name' => 'cpp_directives_in_macro.texi',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 }
               ],
@@ -78,8 +77,7 @@ $result_trees{'cpp_directives_in_macro'} = {
               },
               'source_info' => {
                 'file_name' => 'cpp_directives_in_macro.texi',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -215,7 +213,6 @@ $result_errors{'cpp_directives_in_macro'} = [
 ',
     'file_name' => 'cpp_directives_in_macro.texi',
     'line_nr' => 12,
-    'macro' => '',
     'text' => 'unknown command `unknownout\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/macro/cpp_directives_line_value_macro.pl 
b/tp/t/results/macro/cpp_directives_line_value_macro.pl
index 6932c75e9f..246ad0a81f 100644
--- a/tp/t/results/macro/cpp_directives_line_value_macro.pl
+++ b/tp/t/results/macro/cpp_directives_line_value_macro.pl
@@ -63,8 +63,7 @@ $result_trees{'cpp_directives_line_value_macro'} = {
                   },
                   'source_info' => {
                     'file_name' => 'cpp_directives_line_value_macro.texi',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 }
               ],
@@ -74,8 +73,7 @@ $result_trees{'cpp_directives_line_value_macro'} = {
               },
               'source_info' => {
                 'file_name' => 'cpp_directives_line_value_macro.texi',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -169,8 +167,7 @@ $result_trees{'cpp_directives_line_value_macro'} = {
               },
               'source_info' => {
                 'file_name' => 'cpp_directives_line_value_macro.texi',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
@@ -180,8 +177,7 @@ $result_trees{'cpp_directives_line_value_macro'} = {
           },
           'source_info' => {
             'file_name' => 'cpp_directives_line_value_macro.texi',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -276,8 +272,7 @@ $result_trees{'cpp_directives_line_value_macro'} = {
               },
               'source_info' => {
                 'file_name' => 'cpp_directives_line_value_macro.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
@@ -287,8 +282,7 @@ $result_trees{'cpp_directives_line_value_macro'} = {
           },
           'source_info' => {
             'file_name' => 'cpp_directives_line_value_macro.texi',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           }
         },
         {
@@ -466,7 +460,6 @@ $result_errors{'cpp_directives_line_value_macro'} = [
 ',
     'file_name' => 'cpp_directives_line_value_macro.texi',
     'line_nr' => 24,
-    'macro' => '',
     'text' => 'unknown command `unknown\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/macro/definfoenclose_replaced_by_macro.pl 
b/tp/t/results/macro/definfoenclose_replaced_by_macro.pl
index e0418d571c..04d93a8d69 100644
--- a/tp/t/results/macro/definfoenclose_replaced_by_macro.pl
+++ b/tp/t/results/macro/definfoenclose_replaced_by_macro.pl
@@ -41,8 +41,7 @@ $result_trees{'definfoenclose_replaced_by_macro'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -96,8 +95,7 @@ $result_trees{'definfoenclose_replaced_by_macro'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -107,8 +105,7 @@ $result_trees{'definfoenclose_replaced_by_macro'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -185,7 +182,6 @@ $result_errors{'definfoenclose_replaced_by_macro'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@definfoenclose is obsolete',
     'type' => 'warning'
   }
diff --git a/tp/t/results/macro/double_macro_definition.pl 
b/tp/t/results/macro/double_macro_definition.pl
index 7721338d26..f861e3db9f 100644
--- a/tp/t/results/macro/double_macro_definition.pl
+++ b/tp/t/results/macro/double_macro_definition.pl
@@ -46,8 +46,7 @@ $result_trees{'double_macro_definition'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -57,8 +56,7 @@ $result_trees{'double_macro_definition'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -103,8 +101,7 @@ $result_trees{'double_macro_definition'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -114,8 +111,7 @@ $result_trees{'double_macro_definition'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         }
       ],
@@ -142,7 +138,6 @@ $result_errors{'double_macro_definition'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'macro `foo\' previously defined',
     'type' => 'warning'
   },
@@ -151,7 +146,6 @@ $result_errors{'double_macro_definition'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'here is the previous definition of `foo\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/macro/double_recursive_macro_call.pl 
b/tp/t/results/macro/double_recursive_macro_call.pl
index e5fbd8603f..016ee94f19 100644
--- a/tp/t/results/macro/double_recursive_macro_call.pl
+++ b/tp/t/results/macro/double_recursive_macro_call.pl
@@ -60,8 +60,7 @@ $result_trees{'double_recursive_macro_call'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -71,8 +70,7 @@ $result_trees{'double_recursive_macro_call'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -126,8 +124,7 @@ $result_trees{'double_recursive_macro_call'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
@@ -137,8 +134,7 @@ $result_trees{'double_recursive_macro_call'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
diff --git a/tp/t/results/macro/empty_end.pl b/tp/t/results/macro/empty_end.pl
index f0ce81efce..539fe336f9 100644
--- a/tp/t/results/macro/empty_end.pl
+++ b/tp/t/results/macro/empty_end.pl
@@ -49,8 +49,7 @@ $result_trees{'empty_end'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -60,8 +59,7 @@ $result_trees{'empty_end'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/macro/empty_macro_argument.pl 
b/tp/t/results/macro/empty_macro_argument.pl
index e4b58e3897..ad57fa3e26 100644
--- a/tp/t/results/macro/empty_macro_argument.pl
+++ b/tp/t/results/macro/empty_macro_argument.pl
@@ -51,8 +51,7 @@ $result_trees{'empty_macro_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'empty_macro_argument'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -241,8 +239,7 @@ $result_trees{'empty_macro_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
@@ -252,8 +249,7 @@ $result_trees{'empty_macro_argument'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -411,7 +407,6 @@ $result_errors{'empty_macro_argument'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'macro `mymacro\' declared without argument called with an 
argument',
     'type' => 'error'
   }
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 daeb4d46d0..5d0aa1a183 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
@@ -46,8 +46,7 @@ $result_trees{'empty_macro_in_text_no_arg'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -57,8 +56,7 @@ $result_trees{'empty_macro_in_text_no_arg'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -141,8 +139,7 @@ $result_trees{'empty_macro_in_text_no_arg'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -152,8 +149,7 @@ $result_trees{'empty_macro_in_text_no_arg'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
diff --git a/tp/t/results/macro/empty_macro_no_arg.pl 
b/tp/t/results/macro/empty_macro_no_arg.pl
index d4b7486459..e3d1caac45 100644
--- a/tp/t/results/macro/empty_macro_no_arg.pl
+++ b/tp/t/results/macro/empty_macro_no_arg.pl
@@ -46,8 +46,7 @@ $result_trees{'empty_macro_no_arg'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -57,8 +56,7 @@ $result_trees{'empty_macro_no_arg'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/macro/expand_two_same.pl 
b/tp/t/results/macro/expand_two_same.pl
index 0ab6cd19f9..da16da2f73 100644
--- a/tp/t/results/macro/expand_two_same.pl
+++ b/tp/t/results/macro/expand_two_same.pl
@@ -60,8 +60,7 @@ $result_trees{'expand_two_same'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -71,8 +70,7 @@ $result_trees{'expand_two_same'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/macro/expansion_order.pl 
b/tp/t/results/macro/expansion_order.pl
index 0a5c7f4f56..2dfa9929ea 100644
--- a/tp/t/results/macro/expansion_order.pl
+++ b/tp/t/results/macro/expansion_order.pl
@@ -55,8 +55,7 @@ $result_trees{'expansion_order'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -66,8 +65,7 @@ $result_trees{'expansion_order'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -122,8 +120,7 @@ $result_trees{'expansion_order'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
@@ -133,8 +130,7 @@ $result_trees{'expansion_order'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
diff --git a/tp/t/results/macro/form_feeds.pl b/tp/t/results/macro/form_feeds.pl
index d1447c3549..9eadfafdcc 100644
--- a/tp/t/results/macro/form_feeds.pl
+++ b/tp/t/results/macro/form_feeds.pl
@@ -59,8 +59,7 @@ $result_trees{'form_feeds'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -70,8 +69,7 @@ $result_trees{'form_feeds'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -125,8 +123,7 @@ $result_trees{'form_feeds'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -136,8 +133,7 @@ $result_trees{'form_feeds'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
diff --git a/tp/t/results/macro/glossary.pl b/tp/t/results/macro/glossary.pl
index 8a9c43fcdc..4e2659e5f9 100644
--- a/tp/t/results/macro/glossary.pl
+++ b/tp/t/results/macro/glossary.pl
@@ -59,8 +59,7 @@ $result_trees{'glossary'} = {
               },
               'source_info' => {
                 'file_name' => 'glossary.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -110,8 +109,7 @@ $result_trees{'glossary'} = {
                   },
                   'source_info' => {
                     'file_name' => 'glossary.texi',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
@@ -121,8 +119,7 @@ $result_trees{'glossary'} = {
               },
               'source_info' => {
                 'file_name' => 'glossary.texi',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -182,8 +179,7 @@ $result_trees{'glossary'} = {
                   },
                   'source_info' => {
                     'file_name' => 'glossary.texi',
-                    'line_nr' => 13,
-                    'macro' => ''
+                    'line_nr' => 13
                   }
                 }
               ],
@@ -193,8 +189,7 @@ $result_trees{'glossary'} = {
               },
               'source_info' => {
                 'file_name' => 'glossary.texi',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -336,8 +331,7 @@ $result_trees{'glossary'} = {
                   },
                   'source_info' => {
                     'file_name' => 'glossary.texi',
-                    'line_nr' => 33,
-                    'macro' => ''
+                    'line_nr' => 33
                   }
                 }
               ],
@@ -347,8 +341,7 @@ $result_trees{'glossary'} = {
               },
               'source_info' => {
                 'file_name' => 'glossary.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -391,8 +384,7 @@ $result_trees{'glossary'} = {
       },
       'source_info' => {
         'file_name' => 'glossary.texi',
-        'line_nr' => 35,
-        'macro' => ''
+        'line_nr' => 35
       }
     },
     {
@@ -476,8 +468,7 @@ $result_trees{'glossary'} = {
               ],
               'source_info' => {
                 'file_name' => 'glossary.texi',
-                'line_nr' => 39,
-                'macro' => ''
+                'line_nr' => 39
               },
               'type' => 'menu_entry'
             },
@@ -509,15 +500,13 @@ $result_trees{'glossary'} = {
               },
               'source_info' => {
                 'file_name' => 'glossary.texi',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               }
             }
           ],
           'source_info' => {
             'file_name' => 'glossary.texi',
-            'line_nr' => 38,
-            'macro' => ''
+            'line_nr' => 38
           }
         },
         {
@@ -1427,8 +1416,7 @@ $result_trees{'glossary'} = {
       },
       'source_info' => {
         'file_name' => 'glossary.texi',
-        'line_nr' => 36,
-        'macro' => ''
+        'line_nr' => 36
       }
     },
     {
@@ -1460,8 +1448,7 @@ $result_trees{'glossary'} = {
       },
       'source_info' => {
         'file_name' => 'glossary.texi',
-        'line_nr' => 45,
-        'macro' => ''
+        'line_nr' => 45
       }
     },
     {
@@ -1596,8 +1583,7 @@ $result_trees{'glossary'} = {
       },
       'source_info' => {
         'file_name' => 'glossary.texi',
-        'line_nr' => 46,
-        'macro' => ''
+        'line_nr' => 46
       }
     }
   ],
@@ -1824,7 +1810,6 @@ $result_errors{'glossary'} = [
 ',
     'file_name' => 'glossary.texi',
     'line_nr' => 42,
-    'macro' => '',
     'text' => 'use @comma{} instead of \\, in macro arg',
     'type' => 'warning'
   },
diff --git a/tp/t/results/macro/ifclear_in_macro.pl 
b/tp/t/results/macro/ifclear_in_macro.pl
index 58435b2e47..64ac037aae 100644
--- a/tp/t/results/macro/ifclear_in_macro.pl
+++ b/tp/t/results/macro/ifclear_in_macro.pl
@@ -65,8 +65,7 @@ $result_trees{'ifclear_in_macro'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -76,8 +75,7 @@ $result_trees{'ifclear_in_macro'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
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 e64e083c39..4a05d8cb32 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
@@ -51,8 +51,7 @@ $result_trees{'ifset_and_end_isef_in_macro'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'ifset_and_end_isef_in_macro'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -113,8 +111,7 @@ $result_trees{'ifset_and_end_isef_in_macro'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -124,8 +121,7 @@ $result_trees{'ifset_and_end_isef_in_macro'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -229,7 +225,6 @@ $result_errors{'ifset_and_end_isef_in_macro'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'no matching `@end ifset\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/macro/ifset_in_macro.pl 
b/tp/t/results/macro/ifset_in_macro.pl
index 987c4a4a6a..44238e51de 100644
--- a/tp/t/results/macro/ifset_in_macro.pl
+++ b/tp/t/results/macro/ifset_in_macro.pl
@@ -65,8 +65,7 @@ $result_trees{'ifset_in_macro'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -76,8 +75,7 @@ $result_trees{'ifset_in_macro'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/macro/ifset_in_macro_set.pl 
b/tp/t/results/macro/ifset_in_macro_set.pl
index 57418f242d..66616e8b79 100644
--- a/tp/t/results/macro/ifset_in_macro_set.pl
+++ b/tp/t/results/macro/ifset_in_macro_set.pl
@@ -65,8 +65,7 @@ $result_trees{'ifset_in_macro_set'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -76,8 +75,7 @@ $result_trees{'ifset_in_macro_set'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/macro/ignored_macro_definition.pl 
b/tp/t/results/macro/ignored_macro_definition.pl
index ce622beb4d..a0935e69d4 100644
--- a/tp/t/results/macro/ignored_macro_definition.pl
+++ b/tp/t/results/macro/ignored_macro_definition.pl
@@ -51,8 +51,7 @@ $result_trees{'ignored_macro_definition'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'ignored_macro_definition'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -109,8 +107,7 @@ in inlinefmt tex
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
diff --git a/tp/t/results/macro/implicit_quoting_one_arg.pl 
b/tp/t/results/macro/implicit_quoting_one_arg.pl
index 77d584f256..01321ca6c6 100644
--- a/tp/t/results/macro/implicit_quoting_one_arg.pl
+++ b/tp/t/results/macro/implicit_quoting_one_arg.pl
@@ -60,8 +60,7 @@ $result_trees{'implicit_quoting_one_arg'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -71,8 +70,7 @@ $result_trees{'implicit_quoting_one_arg'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
diff --git a/tp/t/results/macro/implicit_quoting_recursion.pl 
b/tp/t/results/macro/implicit_quoting_recursion.pl
index 41b0267ec5..a06da28db3 100644
--- a/tp/t/results/macro/implicit_quoting_recursion.pl
+++ b/tp/t/results/macro/implicit_quoting_recursion.pl
@@ -59,8 +59,7 @@ $result_trees{'implicit_quoting_recursion'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -70,8 +69,7 @@ $result_trees{'implicit_quoting_recursion'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
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 e927d98495..5cce7d4e75 100644
--- a/tp/t/results/macro/include_after_empty_line_arg.pl
+++ b/tp/t/results/macro/include_after_empty_line_arg.pl
@@ -55,8 +55,7 @@ $result_trees{'include_after_empty_line_arg'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -66,8 +65,7 @@ $result_trees{'include_after_empty_line_arg'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -153,8 +151,7 @@ $result_trees{'include_after_empty_line_arg'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 6,
-                      'macro' => ''
+                      'line_nr' => 6
                     }
                   },
                   'position' => 1,
diff --git a/tp/t/results/macro/leading_spaces_no_ignore.pl 
b/tp/t/results/macro/leading_spaces_no_ignore.pl
index d973811df6..d2aeeec37f 100644
--- a/tp/t/results/macro/leading_spaces_no_ignore.pl
+++ b/tp/t/results/macro/leading_spaces_no_ignore.pl
@@ -56,8 +56,7 @@ $result_trees{'leading_spaces_no_ignore'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -67,8 +66,7 @@ $result_trees{'leading_spaces_no_ignore'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/macro/line_after_recursive_call.pl 
b/tp/t/results/macro/line_after_recursive_call.pl
index 0cd0cce26d..f857abae28 100644
--- a/tp/t/results/macro/line_after_recursive_call.pl
+++ b/tp/t/results/macro/line_after_recursive_call.pl
@@ -61,8 +61,7 @@ $result_trees{'line_after_recursive_call'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -72,8 +71,7 @@ $result_trees{'line_after_recursive_call'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           },
           'source_marks' => [
             {
diff --git a/tp/t/results/macro/line_end_accent_command_macro_call.pl 
b/tp/t/results/macro/line_end_accent_command_macro_call.pl
index 2c23c786b9..17c722324d 100644
--- a/tp/t/results/macro/line_end_accent_command_macro_call.pl
+++ b/tp/t/results/macro/line_end_accent_command_macro_call.pl
@@ -51,8 +51,7 @@ $result_trees{'line_end_accent_command_macro_call'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'line_end_accent_command_macro_call'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -200,8 +198,7 @@ $result_trees{'line_end_accent_command_macro_call'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
@@ -211,8 +208,7 @@ $result_trees{'line_end_accent_command_macro_call'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -346,7 +342,6 @@ $result_errors{'line_end_accent_command_macro_call'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'command `@ringaccent\' must not be followed by new line',
     'type' => 'warning'
   },
@@ -355,7 +350,6 @@ $result_errors{'line_end_accent_command_macro_call'} = [
 ',
     'file_name' => '',
     'line_nr' => 12,
-    'macro' => '',
     'text' => 'command `@ringaccent\' must not be followed by new line',
     'type' => 'warning'
   }
diff --git a/tp/t/results/macro/macro_after_paragraph.pl 
b/tp/t/results/macro/macro_after_paragraph.pl
index a06c1f8614..3cc79dfd87 100644
--- a/tp/t/results/macro/macro_after_paragraph.pl
+++ b/tp/t/results/macro/macro_after_paragraph.pl
@@ -56,8 +56,7 @@ $result_trees{'macro_after_paragraph'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -67,8 +66,7 @@ $result_trees{'macro_after_paragraph'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/macro/macro_alias_definfoenclose_defindex.pl 
b/tp/t/results/macro/macro_alias_definfoenclose_defindex.pl
index 512c6b0b0c..3a170f228e 100644
--- a/tp/t/results/macro/macro_alias_definfoenclose_defindex.pl
+++ b/tp/t/results/macro/macro_alias_definfoenclose_defindex.pl
@@ -39,8 +39,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -76,8 +75,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -110,8 +108,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -184,8 +181,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
@@ -195,8 +191,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           },
           'source_marks' => [
             {
@@ -276,8 +271,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           }
         },
         {
@@ -303,8 +297,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               },
               'type' => 'definfoenclose_command'
             },
@@ -351,8 +344,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         },
         {
@@ -374,8 +366,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -420,8 +411,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           }
         },
         {
@@ -457,8 +447,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           },
           'type' => 'index_entry_command'
         },
@@ -499,8 +488,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 21,
-            'macro' => ''
+            'line_nr' => 21
           }
         },
         {
@@ -526,8 +514,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               },
               'type' => 'definfoenclose_command'
             },
@@ -589,8 +576,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             }
           ],
@@ -600,8 +586,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 24,
-            'macro' => ''
+            'line_nr' => 24
           },
           'source_marks' => [
             {
@@ -682,8 +667,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 29,
-            'macro' => ''
+            'line_nr' => 29
           }
         },
         {
@@ -719,8 +703,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 30,
-            'macro' => ''
+            'line_nr' => 30
           },
           'type' => 'index_entry_command'
         },
@@ -775,8 +758,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             }
           ],
@@ -786,8 +768,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 32,
-            'macro' => ''
+            'line_nr' => 32
           },
           'source_marks' => [
             {
@@ -869,8 +850,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 37,
-            'macro' => ''
+            'line_nr' => 37
           }
         },
         {
@@ -892,8 +872,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               }
             },
             {
@@ -940,8 +919,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 40,
-            'macro' => ''
+            'line_nr' => 40
           }
         },
         {
@@ -967,8 +945,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 41,
-                'macro' => ''
+                'line_nr' => 41
               },
               'type' => 'definfoenclose_command'
             },
@@ -1014,8 +991,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 43,
-            'macro' => ''
+            'line_nr' => 43
           }
         },
         {
@@ -1051,8 +1027,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 44,
-            'macro' => ''
+            'line_nr' => 44
           },
           'type' => 'index_entry_command'
         },
@@ -1092,8 +1067,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 46,
-            'macro' => ''
+            'line_nr' => 46
           }
         },
         {
@@ -1115,8 +1089,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               }
             },
             {
@@ -1177,8 +1150,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 51,
-                'macro' => ''
+                'line_nr' => 51
               }
             }
           ],
@@ -1188,8 +1160,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 49,
-            'macro' => ''
+            'line_nr' => 49
           },
           'source_marks' => [
             {
@@ -1267,8 +1238,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 54,
-            'macro' => ''
+            'line_nr' => 54
           }
         }
       ],
@@ -1282,8 +1252,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
@@ -1485,7 +1454,6 @@ $result_errors{'macro_alias_definfoenclose_defindex'} = [
 ',
     'file_name' => '',
     'line_nr' => 12,
-    'macro' => '',
     'text' => '@definfoenclose is obsolete',
     'type' => 'warning'
   },
@@ -1494,7 +1462,6 @@ $result_errors{'macro_alias_definfoenclose_defindex'} = [
 ',
     'file_name' => '',
     'line_nr' => 21,
-    'macro' => '',
     'text' => '@definfoenclose is obsolete',
     'type' => 'warning'
   },
@@ -1503,7 +1470,6 @@ $result_errors{'macro_alias_definfoenclose_defindex'} = [
 ',
     'file_name' => '',
     'line_nr' => 40,
-    'macro' => '',
     'text' => '@definfoenclose is obsolete',
     'type' => 'warning'
   }
diff --git a/tp/t/results/macro/macro_before_specific_line_command_args.pl 
b/tp/t/results/macro/macro_before_specific_line_command_args.pl
index 40cddf989e..f8e9a886e7 100644
--- a/tp/t/results/macro/macro_before_specific_line_command_args.pl
+++ b/tp/t/results/macro/macro_before_specific_line_command_args.pl
@@ -51,8 +51,7 @@ $result_trees{'macro_before_specific_line_command_args'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'macro_before_specific_line_command_args'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -128,8 +126,7 @@ $result_trees{'macro_before_specific_line_command_args'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
diff --git a/tp/t/results/macro/macro_call_empty_middle_arg.pl 
b/tp/t/results/macro/macro_call_empty_middle_arg.pl
index 7ab9de706c..581896f1df 100644
--- a/tp/t/results/macro/macro_call_empty_middle_arg.pl
+++ b/tp/t/results/macro/macro_call_empty_middle_arg.pl
@@ -73,8 +73,7 @@ $result_trees{'macro_call_empty_middle_arg'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -84,8 +83,7 @@ $result_trees{'macro_call_empty_middle_arg'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/macro/macro_call_empty_two_arg.pl 
b/tp/t/results/macro/macro_call_empty_two_arg.pl
index d9651d910b..c9adde531b 100644
--- a/tp/t/results/macro/macro_call_empty_two_arg.pl
+++ b/tp/t/results/macro/macro_call_empty_two_arg.pl
@@ -64,8 +64,7 @@ $result_trees{'macro_call_empty_two_arg'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -75,8 +74,7 @@ $result_trees{'macro_call_empty_two_arg'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/macro/macro_call_in_ignored_inlinefmtifelse.pl 
b/tp/t/results/macro/macro_call_in_ignored_inlinefmtifelse.pl
index 73cb85e262..dd87edfb0d 100644
--- a/tp/t/results/macro/macro_call_in_ignored_inlinefmtifelse.pl
+++ b/tp/t/results/macro/macro_call_in_ignored_inlinefmtifelse.pl
@@ -51,8 +51,7 @@ $result_trees{'macro_call_in_ignored_inlinefmtifelse'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'macro_call_in_ignored_inlinefmtifelse'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -103,8 +101,7 @@ $result_trees{'macro_call_in_ignored_inlinefmtifelse'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
diff --git a/tp/t/results/macro/macro_call_in_inlinefmtifelse_format.pl 
b/tp/t/results/macro/macro_call_in_inlinefmtifelse_format.pl
index ec3540bcc5..34a864a5ef 100644
--- a/tp/t/results/macro/macro_call_in_inlinefmtifelse_format.pl
+++ b/tp/t/results/macro/macro_call_in_inlinefmtifelse_format.pl
@@ -51,8 +51,7 @@ $result_trees{'macro_call_in_inlinefmtifelse_format'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'macro_call_in_inlinefmtifelse_format'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -143,8 +141,7 @@ $result_trees{'macro_call_in_inlinefmtifelse_format'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
diff --git a/tp/t/results/macro/macro_call_in_node_manual.pl 
b/tp/t/results/macro/macro_call_in_node_manual.pl
index 6e70d4d4cc..52f3048f51 100644
--- a/tp/t/results/macro/macro_call_in_node_manual.pl
+++ b/tp/t/results/macro/macro_call_in_node_manual.pl
@@ -51,8 +51,7 @@ $result_trees{'macro_call_in_node_manual'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'macro_call_in_node_manual'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -113,8 +111,7 @@ $result_trees{'macro_call_in_node_manual'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -124,8 +121,7 @@ $result_trees{'macro_call_in_node_manual'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -175,8 +171,7 @@ $result_trees{'macro_call_in_node_manual'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
@@ -186,8 +181,7 @@ $result_trees{'macro_call_in_node_manual'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -237,8 +231,7 @@ $result_trees{'macro_call_in_node_manual'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
@@ -248,8 +241,7 @@ $result_trees{'macro_call_in_node_manual'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -299,8 +291,7 @@ $result_trees{'macro_call_in_node_manual'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             }
           ],
@@ -310,8 +301,7 @@ $result_trees{'macro_call_in_node_manual'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -361,8 +351,7 @@ $result_trees{'macro_call_in_node_manual'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             }
           ],
@@ -372,8 +361,7 @@ $result_trees{'macro_call_in_node_manual'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 21,
-            'macro' => ''
+            'line_nr' => 21
           }
         },
         {
@@ -467,8 +455,7 @@ $result_trees{'macro_call_in_node_manual'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               },
               'type' => 'menu_entry'
             },
@@ -546,8 +533,7 @@ $result_trees{'macro_call_in_node_manual'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               },
               'type' => 'menu_entry'
             },
@@ -634,8 +620,7 @@ $result_trees{'macro_call_in_node_manual'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               },
               'type' => 'menu_entry'
             },
@@ -736,8 +721,7 @@ $result_trees{'macro_call_in_node_manual'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               },
               'type' => 'menu_entry'
             },
@@ -828,8 +812,7 @@ $result_trees{'macro_call_in_node_manual'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               },
               'type' => 'menu_entry'
             },
@@ -887,8 +870,7 @@ $result_trees{'macro_call_in_node_manual'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 31,
-                        'macro' => ''
+                        'line_nr' => 31
                       },
                       'source_marks' => [
                         {
@@ -956,8 +938,7 @@ $result_trees{'macro_call_in_node_manual'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               },
               'type' => 'menu_entry'
             },
@@ -1048,8 +1029,7 @@ $result_trees{'macro_call_in_node_manual'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               },
               'type' => 'menu_entry'
             },
@@ -1140,8 +1120,7 @@ $result_trees{'macro_call_in_node_manual'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               },
               'type' => 'menu_entry'
             },
@@ -1173,15 +1152,13 @@ $result_trees{'macro_call_in_node_manual'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           }
         }
       ],
diff --git a/tp/t/results/macro/macro_end_call_in_ignored_inlinefmt.pl 
b/tp/t/results/macro/macro_end_call_in_ignored_inlinefmt.pl
index 3659bd590e..44c810cc2d 100644
--- a/tp/t/results/macro/macro_end_call_in_ignored_inlinefmt.pl
+++ b/tp/t/results/macro/macro_end_call_in_ignored_inlinefmt.pl
@@ -51,8 +51,7 @@ $result_trees{'macro_end_call_in_ignored_inlinefmt'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'macro_end_call_in_ignored_inlinefmt'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse.pl 
b/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse.pl
index e82c3b4e6e..6507a1dabc 100644
--- a/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse.pl
+++ b/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse.pl
@@ -51,8 +51,7 @@ $result_trees{'macro_end_call_in_ignored_inlinefmtifelse'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'macro_end_call_in_ignored_inlinefmtifelse'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git 
a/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse_else.pl 
b/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse_else.pl
index be22186ac5..856451e1f6 100644
--- a/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse_else.pl
+++ b/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse_else.pl
@@ -51,8 +51,7 @@ 
$result_trees{'macro_end_call_in_ignored_inlinefmtifelse_else'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ 
$result_trees{'macro_end_call_in_ignored_inlinefmtifelse_else'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -143,8 +141,7 @@ 
$result_trees{'macro_end_call_in_ignored_inlinefmtifelse_else'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
diff --git a/tp/t/results/macro/macro_end_call_in_ignored_inlineraw.pl 
b/tp/t/results/macro/macro_end_call_in_ignored_inlineraw.pl
index 480e4c47fa..916739976f 100644
--- a/tp/t/results/macro/macro_end_call_in_ignored_inlineraw.pl
+++ b/tp/t/results/macro/macro_end_call_in_ignored_inlineraw.pl
@@ -51,8 +51,7 @@ $result_trees{'macro_end_call_in_ignored_inlineraw'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'macro_end_call_in_ignored_inlineraw'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/macro/macro_end_call_in_ignored_raw.pl 
b/tp/t/results/macro/macro_end_call_in_ignored_raw.pl
index ff9db9c2d8..5e08c7c8cb 100644
--- a/tp/t/results/macro/macro_end_call_in_ignored_raw.pl
+++ b/tp/t/results/macro/macro_end_call_in_ignored_raw.pl
@@ -56,8 +56,7 @@ $result_trees{'macro_end_call_in_ignored_raw'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -67,8 +66,7 @@ $result_trees{'macro_end_call_in_ignored_raw'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -159,8 +157,7 @@ $result_trees{'macro_end_call_in_ignored_raw'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
diff --git a/tp/t/results/macro/macro_expands_to_empty.pl 
b/tp/t/results/macro/macro_expands_to_empty.pl
index 99c4e808a4..1b1d7a4185 100644
--- a/tp/t/results/macro/macro_expands_to_empty.pl
+++ b/tp/t/results/macro/macro_expands_to_empty.pl
@@ -55,8 +55,7 @@ $result_trees{'macro_expands_to_empty'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -66,8 +65,7 @@ $result_trees{'macro_expands_to_empty'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/macro/macro_expansion.pl 
b/tp/t/results/macro/macro_expansion.pl
index 493a3596fa..3f8218410d 100644
--- a/tp/t/results/macro/macro_expansion.pl
+++ b/tp/t/results/macro/macro_expansion.pl
@@ -79,8 +79,7 @@ $result_trees{'macro_expansion'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -90,8 +89,7 @@ $result_trees{'macro_expansion'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -905,7 +903,6 @@ $result_errors{'macro_expansion'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => '@macroone defined with zero or more than one argument should be 
invoked with {}',
     'type' => 'warning'
   },
@@ -932,7 +929,6 @@ $result_errors{'macro_expansion'} = [
 ',
     'file_name' => '',
     'line_nr' => 17,
-    'macro' => '',
     'text' => 'use @comma{} instead of \\, in macro arg',
     'type' => 'warning'
   },
diff --git a/tp/t/results/macro/macro_expansion_end_in_conditional_end.pl 
b/tp/t/results/macro/macro_expansion_end_in_conditional_end.pl
index 5d7bb2756e..636b55b6c3 100644
--- a/tp/t/results/macro/macro_expansion_end_in_conditional_end.pl
+++ b/tp/t/results/macro/macro_expansion_end_in_conditional_end.pl
@@ -61,8 +61,7 @@ $result_trees{'macro_expansion_end_in_conditional_end'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -72,8 +71,7 @@ $result_trees{'macro_expansion_end_in_conditional_end'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/macro/macro_expansion_end_in_conditional_line.pl 
b/tp/t/results/macro/macro_expansion_end_in_conditional_line.pl
index ad5936cf8e..26da5124fb 100644
--- a/tp/t/results/macro/macro_expansion_end_in_conditional_line.pl
+++ b/tp/t/results/macro/macro_expansion_end_in_conditional_line.pl
@@ -51,8 +51,7 @@ $result_trees{'macro_expansion_end_in_conditional_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'macro_expansion_end_in_conditional_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -189,8 +187,7 @@ $result_trees{'macro_expansion_end_in_conditional_line'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 9,
-                      'macro' => ''
+                      'line_nr' => 9
                     }
                   },
                   'position' => 8,
diff --git a/tp/t/results/macro/macro_expansion_end_in_ignored_ifset_content.pl 
b/tp/t/results/macro/macro_expansion_end_in_ignored_ifset_content.pl
index d144f61d17..16050e9ef1 100644
--- a/tp/t/results/macro/macro_expansion_end_in_ignored_ifset_content.pl
+++ b/tp/t/results/macro/macro_expansion_end_in_ignored_ifset_content.pl
@@ -56,8 +56,7 @@ $result_trees{'macro_expansion_end_in_ignored_ifset_content'} 
= {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -67,8 +66,7 @@ $result_trees{'macro_expansion_end_in_ignored_ifset_content'} 
= {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -156,8 +154,7 @@ 
$result_trees{'macro_expansion_end_in_ignored_ifset_content'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 7,
-                      'macro' => ''
+                      'line_nr' => 7
                     }
                   }
                 ],
diff --git 
a/tp/t/results/macro/macro_expansion_end_in_ignored_nested_conditional.pl 
b/tp/t/results/macro/macro_expansion_end_in_ignored_nested_conditional.pl
index 2bbe8e3844..5571479aa2 100644
--- a/tp/t/results/macro/macro_expansion_end_in_ignored_nested_conditional.pl
+++ b/tp/t/results/macro/macro_expansion_end_in_ignored_nested_conditional.pl
@@ -61,8 +61,7 @@ 
$result_trees{'macro_expansion_end_in_ignored_nested_conditional'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -72,8 +71,7 @@ 
$result_trees{'macro_expansion_end_in_ignored_nested_conditional'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -168,8 +166,7 @@ 
$result_trees{'macro_expansion_end_in_ignored_nested_conditional'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 8,
-                                'macro' => ''
+                                'line_nr' => 8
                               }
                             }
                           ]
@@ -207,8 +204,7 @@ 
$result_trees{'macro_expansion_end_in_ignored_nested_conditional'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 9,
-                      'macro' => ''
+                      'line_nr' => 9
                     }
                   }
                 ],
diff --git 
a/tp/t/results/macro/macro_expansion_end_in_ignored_nested_different_conditional.pl
 
b/tp/t/results/macro/macro_expansion_end_in_ignored_nested_different_conditional.pl
index 53511f9198..c6d4c1c11d 100644
--- 
a/tp/t/results/macro/macro_expansion_end_in_ignored_nested_different_conditional.pl
+++ 
b/tp/t/results/macro/macro_expansion_end_in_ignored_nested_different_conditional.pl
@@ -61,8 +61,7 @@ 
$result_trees{'macro_expansion_end_in_ignored_nested_different_conditional'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -72,8 +71,7 @@ 
$result_trees{'macro_expansion_end_in_ignored_nested_different_conditional'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -166,8 +164,7 @@ 
$result_trees{'macro_expansion_end_in_ignored_nested_different_conditional'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 8,
-                      'macro' => ''
+                      'line_nr' => 8
                     }
                   }
                 ],
@@ -215,7 +212,6 @@ 
$result_errors{'macro_expansion_end_in_ignored_nested_different_conditional'} =
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'unmatched `@end ifclear\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/macro/macro_expansion_in_multitable_prototype.pl 
b/tp/t/results/macro/macro_expansion_in_multitable_prototype.pl
index 2bf1902ea8..71a982f222 100644
--- a/tp/t/results/macro/macro_expansion_in_multitable_prototype.pl
+++ b/tp/t/results/macro/macro_expansion_in_multitable_prototype.pl
@@ -51,8 +51,7 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -117,8 +115,7 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -128,8 +125,7 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -174,8 +170,7 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   },
                   'type' => 'bracketed_arg'
                 },
@@ -215,8 +210,7 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   },
                   'type' => 'bracketed_arg'
                 },
@@ -242,8 +236,7 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = {
                       'cmdname' => 'emph',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -277,8 +270,7 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   },
                   'type' => 'bracketed_arg'
                 },
@@ -338,8 +330,7 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   },
                   'source_marks' => [
                     {
@@ -385,8 +376,7 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   },
                   'source_marks' => [
                     {
@@ -434,8 +424,7 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     },
                     {
@@ -459,8 +448,7 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     },
                     {
@@ -484,8 +472,7 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     },
                     {
@@ -509,8 +496,7 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     },
                     {
@@ -535,8 +521,7 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     }
                   ],
@@ -576,8 +561,7 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
@@ -591,8 +575,7 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         }
       ],
diff --git a/tp/t/results/macro/macro_for_dot_in_menu_not_separator.pl 
b/tp/t/results/macro/macro_for_dot_in_menu_not_separator.pl
index ba179a8849..adab340fe6 100644
--- a/tp/t/results/macro/macro_for_dot_in_menu_not_separator.pl
+++ b/tp/t/results/macro/macro_for_dot_in_menu_not_separator.pl
@@ -51,8 +51,7 @@ $result_trees{'macro_for_dot_in_menu_not_separator'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'macro_for_dot_in_menu_not_separator'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -190,8 +188,7 @@ $result_trees{'macro_for_dot_in_menu_not_separator'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -223,15 +220,13 @@ $result_trees{'macro_for_dot_in_menu_not_separator'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
diff --git a/tp/t/results/macro/macro_for_end.pl 
b/tp/t/results/macro/macro_for_end.pl
index df7bd77b3a..47aab7f983 100644
--- a/tp/t/results/macro/macro_for_end.pl
+++ b/tp/t/results/macro/macro_for_end.pl
@@ -51,8 +51,7 @@ $result_trees{'macro_for_end'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'macro_for_end'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -148,8 +146,7 @@ $result_trees{'macro_for_end'} = {
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
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 3bc54d611d..c36a67bab3 100644
--- a/tp/t/results/macro/macro_for_ignored_line_command.pl
+++ b/tp/t/results/macro/macro_for_ignored_line_command.pl
@@ -51,8 +51,7 @@ $result_trees{'macro_for_ignored_line_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'macro_for_ignored_line_command'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/macro/macro_for_verb.pl 
b/tp/t/results/macro/macro_for_verb.pl
index 94518dd350..42e9b970a8 100644
--- a/tp/t/results/macro/macro_for_verb.pl
+++ b/tp/t/results/macro/macro_for_verb.pl
@@ -51,8 +51,7 @@ $result_trees{'macro_for_verb'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'macro_for_verb'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/macro/macro_imbricated_with_beginning_command_name.pl 
b/tp/t/results/macro/macro_imbricated_with_beginning_command_name.pl
index 3226b876bd..d409e01118 100644
--- a/tp/t/results/macro/macro_imbricated_with_beginning_command_name.pl
+++ b/tp/t/results/macro/macro_imbricated_with_beginning_command_name.pl
@@ -61,8 +61,7 @@ $result_trees{'macro_imbricated_with_beginning_command_name'} 
= {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -72,8 +71,7 @@ $result_trees{'macro_imbricated_with_beginning_command_name'} 
= {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -106,7 +104,6 @@ 
$result_errors{'macro_imbricated_with_beginning_command_name'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'unmatched `@end macro\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/macro/macro_in_accent.pl 
b/tp/t/results/macro/macro_in_accent.pl
index f89582b9ed..31a4b5519b 100644
--- a/tp/t/results/macro/macro_in_accent.pl
+++ b/tp/t/results/macro/macro_in_accent.pl
@@ -51,8 +51,7 @@ $result_trees{'macro_in_accent'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'macro_in_accent'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -113,8 +111,7 @@ $result_trees{'macro_in_accent'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -124,8 +121,7 @@ $result_trees{'macro_in_accent'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -173,8 +169,7 @@ $result_trees{'macro_in_accent'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'source_marks' => [
                 {
@@ -225,8 +220,7 @@ $result_trees{'macro_in_accent'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'source_marks' => [
                 {
@@ -277,8 +271,7 @@ $result_trees{'macro_in_accent'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'source_marks' => [
                 {
@@ -330,8 +323,7 @@ $result_trees{'macro_in_accent'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -408,8 +400,7 @@ $result_trees{'macro_in_accent'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               },
               'source_marks' => [
                 {
diff --git a/tp/t/results/macro/macro_in_brace_command.pl 
b/tp/t/results/macro/macro_in_brace_command.pl
index 377fc8db81..7daf31f5b3 100644
--- a/tp/t/results/macro/macro_in_brace_command.pl
+++ b/tp/t/results/macro/macro_in_brace_command.pl
@@ -51,8 +51,7 @@ $result_trees{'macro_in_brace_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'macro_in_brace_command'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -113,8 +111,7 @@ $result_trees{'macro_in_brace_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -124,8 +121,7 @@ $result_trees{'macro_in_brace_command'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -141,8 +137,7 @@ $result_trees{'macro_in_brace_command'} = {
                   'cmdname' => 'bullet',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   },
                   'type' => 'command_as_argument'
                 }
@@ -242,8 +237,7 @@ $result_trees{'macro_in_brace_command'} = {
                       'cmdname' => 'email',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     },
                     {
@@ -263,8 +257,7 @@ $result_trees{'macro_in_brace_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -295,8 +288,7 @@ $result_trees{'macro_in_brace_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
@@ -310,8 +302,7 @@ $result_trees{'macro_in_brace_command'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         }
       ],
diff --git a/tp/t/results/macro/macro_in_def_delimiters.pl 
b/tp/t/results/macro/macro_in_def_delimiters.pl
index 299ccf173b..5311928fd3 100644
--- a/tp/t/results/macro/macro_in_def_delimiters.pl
+++ b/tp/t/results/macro/macro_in_def_delimiters.pl
@@ -51,8 +51,7 @@ $result_trees{'macro_in_def_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'macro_in_def_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -456,8 +454,7 @@ $result_trees{'macro_in_def_delimiters'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'def_line'
             }
@@ -469,8 +466,7 @@ $result_trees{'macro_in_def_delimiters'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
@@ -499,7 +495,6 @@ $result_errors{'macro_in_def_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   },
@@ -508,7 +503,6 @@ $result_errors{'macro_in_def_delimiters'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'no matching `@end deffn\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/macro/macro_in_empty_menu_comment.pl 
b/tp/t/results/macro/macro_in_empty_menu_comment.pl
index 9d8890a750..75a9adbe9e 100644
--- a/tp/t/results/macro/macro_in_empty_menu_comment.pl
+++ b/tp/t/results/macro/macro_in_empty_menu_comment.pl
@@ -51,8 +51,7 @@ $result_trees{'macro_in_empty_menu_comment'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'macro_in_empty_menu_comment'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -153,8 +151,7 @@ $result_trees{'macro_in_empty_menu_comment'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -186,15 +183,13 @@ $result_trees{'macro_in_empty_menu_comment'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
diff --git a/tp/t/results/macro/macro_in_empty_multitable_empty_before_item.pl 
b/tp/t/results/macro/macro_in_empty_multitable_empty_before_item.pl
index fcec674a8d..4e6698d32a 100644
--- a/tp/t/results/macro/macro_in_empty_multitable_empty_before_item.pl
+++ b/tp/t/results/macro/macro_in_empty_multitable_empty_before_item.pl
@@ -46,8 +46,7 @@ $result_trees{'macro_in_empty_multitable_empty_before_item'} 
= {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -57,8 +56,7 @@ $result_trees{'macro_in_empty_multitable_empty_before_item'} 
= {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -102,8 +100,7 @@ 
$result_trees{'macro_in_empty_multitable_empty_before_item'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 }
               ],
@@ -166,8 +163,7 @@ 
$result_trees{'macro_in_empty_multitable_empty_before_item'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -182,8 +178,7 @@ 
$result_trees{'macro_in_empty_multitable_empty_before_item'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         }
       ],
diff --git a/tp/t/results/macro/macro_in_empty_table_empty_before_item.pl 
b/tp/t/results/macro/macro_in_empty_table_empty_before_item.pl
index c38b1b170d..6a6cb4bf2f 100644
--- a/tp/t/results/macro/macro_in_empty_table_empty_before_item.pl
+++ b/tp/t/results/macro/macro_in_empty_table_empty_before_item.pl
@@ -46,8 +46,7 @@ $result_trees{'macro_in_empty_table_empty_before_item'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -57,8 +56,7 @@ $result_trees{'macro_in_empty_table_empty_before_item'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -74,8 +72,7 @@ $result_trees{'macro_in_empty_table_empty_before_item'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   },
                   'type' => 'command_as_argument'
                 }
@@ -145,8 +142,7 @@ $result_trees{'macro_in_empty_table_empty_before_item'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -160,8 +156,7 @@ $result_trees{'macro_in_empty_table_empty_before_item'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         }
       ],
diff --git a/tp/t/results/macro/macro_in_empty_text.pl 
b/tp/t/results/macro/macro_in_empty_text.pl
index 252627264f..e616bf65e1 100644
--- a/tp/t/results/macro/macro_in_empty_text.pl
+++ b/tp/t/results/macro/macro_in_empty_text.pl
@@ -51,8 +51,7 @@ $result_trees{'macro_in_empty_text'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'macro_in_empty_text'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -151,15 +149,13 @@ $result_trees{'macro_in_empty_text'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
diff --git a/tp/t/results/macro/macro_in_end_argument.pl 
b/tp/t/results/macro/macro_in_end_argument.pl
index 270eb78276..41a68f5b51 100644
--- a/tp/t/results/macro/macro_in_end_argument.pl
+++ b/tp/t/results/macro/macro_in_end_argument.pl
@@ -51,8 +51,7 @@ $result_trees{'macro_in_end_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'macro_in_end_argument'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -140,15 +138,13 @@ $result_trees{'macro_in_end_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
diff --git a/tp/t/results/macro/macro_in_ifset.pl 
b/tp/t/results/macro/macro_in_ifset.pl
index ecd16213e8..35e8fdfc6f 100644
--- a/tp/t/results/macro/macro_in_ifset.pl
+++ b/tp/t/results/macro/macro_in_ifset.pl
@@ -55,8 +55,7 @@ $result_trees{'macro_in_ifset'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -66,8 +65,7 @@ $result_trees{'macro_in_ifset'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -131,8 +129,7 @@ $result_trees{'macro_in_ifset'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 8,
-                      'macro' => ''
+                      'line_nr' => 8
                     }
                   }
                 ],
@@ -143,8 +140,7 @@ $result_trees{'macro_in_ifset'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 5,
-                  'macro' => ''
+                  'line_nr' => 5
                 }
               },
               'position' => 1,
diff --git a/tp/t/results/macro/macro_in_ifset_end_in_arg.pl 
b/tp/t/results/macro/macro_in_ifset_end_in_arg.pl
index 2ea856ade1..e522c0af2c 100644
--- a/tp/t/results/macro/macro_in_ifset_end_in_arg.pl
+++ b/tp/t/results/macro/macro_in_ifset_end_in_arg.pl
@@ -55,8 +55,7 @@ $result_trees{'macro_in_ifset_end_in_arg'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -66,8 +65,7 @@ $result_trees{'macro_in_ifset_end_in_arg'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -126,8 +124,7 @@ $result_trees{'macro_in_ifset_end_in_arg'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 7,
-                      'macro' => ''
+                      'line_nr' => 7
                     }
                   }
                 ],
@@ -138,8 +135,7 @@ $result_trees{'macro_in_ifset_end_in_arg'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 5,
-                  'macro' => ''
+                  'line_nr' => 5
                 }
               },
               'position' => 1,
@@ -191,7 +187,6 @@ $result_errors{'macro_in_ifset_end_in_arg'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   },
@@ -200,7 +195,6 @@ $result_errors{'macro_in_ifset_end_in_arg'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => 'unmatched `@end ifset\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/macro/macro_in_index_commands.pl 
b/tp/t/results/macro/macro_in_index_commands.pl
index 3165845fd1..a8bca1c54e 100644
--- a/tp/t/results/macro/macro_in_index_commands.pl
+++ b/tp/t/results/macro/macro_in_index_commands.pl
@@ -51,8 +51,7 @@ $result_trees{'macro_in_index_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'macro_in_index_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -108,8 +106,7 @@ $result_trees{'macro_in_index_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -119,8 +116,7 @@ $result_trees{'macro_in_index_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -165,8 +161,7 @@ $result_trees{'macro_in_index_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
@@ -176,8 +171,7 @@ $result_trees{'macro_in_index_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -266,8 +260,7 @@ $result_trees{'macro_in_index_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           },
           'source_marks' => [
             {
@@ -377,8 +370,7 @@ $result_trees{'macro_in_index_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
@@ -388,8 +380,7 @@ $result_trees{'macro_in_index_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           }
         },
         {
@@ -460,8 +451,7 @@ $result_trees{'macro_in_index_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -518,8 +508,7 @@ $result_trees{'macro_in_index_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             }
           ],
@@ -529,8 +518,7 @@ $result_trees{'macro_in_index_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 22,
-            'macro' => ''
+            'line_nr' => 22
           }
         },
         {
@@ -580,8 +568,7 @@ $result_trees{'macro_in_index_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             }
           ],
@@ -591,8 +578,7 @@ $result_trees{'macro_in_index_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         },
         {
@@ -657,8 +643,7 @@ $result_trees{'macro_in_index_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 30,
-            'macro' => ''
+            'line_nr' => 30
           }
         },
         {
@@ -708,8 +693,7 @@ $result_trees{'macro_in_index_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             }
           ],
@@ -719,8 +703,7 @@ $result_trees{'macro_in_index_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 32,
-            'macro' => ''
+            'line_nr' => 32
           }
         },
         {
@@ -760,8 +743,7 @@ $result_trees{'macro_in_index_commands'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 36,
-        'macro' => ''
+        'line_nr' => 36
       }
     },
     {
@@ -991,8 +973,7 @@ $result_trees{'macro_in_index_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 41,
-            'macro' => ''
+            'line_nr' => 41
           },
           'type' => 'index_entry_command'
         },
@@ -1061,8 +1042,7 @@ $result_trees{'macro_in_index_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 43,
-            'macro' => ''
+            'line_nr' => 43
           },
           'type' => 'index_entry_command'
         },
@@ -1124,8 +1104,7 @@ $result_trees{'macro_in_index_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 44,
-            'macro' => ''
+            'line_nr' => 44
           },
           'type' => 'index_entry_command'
         },
@@ -1200,8 +1179,7 @@ $result_trees{'macro_in_index_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 47,
-            'macro' => ''
+            'line_nr' => 47
           }
         },
         {
@@ -1275,8 +1253,7 @@ $result_trees{'macro_in_index_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 50,
-            'macro' => ''
+            'line_nr' => 50
           }
         },
         {
@@ -1297,8 +1274,7 @@ $result_trees{'macro_in_index_commands'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 37,
-        'macro' => ''
+        'line_nr' => 37
       }
     }
   ],
@@ -1426,7 +1402,6 @@ $result_errors{'macro_in_index_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 50,
-    'macro' => '',
     'text' => 'printing an index `cp\' merged in another one, `fn\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/macro/macro_in_invalid_documentencoding.pl 
b/tp/t/results/macro/macro_in_invalid_documentencoding.pl
index 0b987d00cb..046fb2e7af 100644
--- a/tp/t/results/macro/macro_in_invalid_documentencoding.pl
+++ b/tp/t/results/macro/macro_in_invalid_documentencoding.pl
@@ -51,8 +51,7 @@ $result_trees{'macro_in_invalid_documentencoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'macro_in_invalid_documentencoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -121,8 +119,7 @@ $result_trees{'macro_in_invalid_documentencoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         }
       ],
@@ -147,7 +144,6 @@ $result_errors{'macro_in_invalid_documentencoding'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'encoding `badm\' is not a canonical texinfo encoding',
     'type' => 'warning'
   },
@@ -156,7 +152,6 @@ $result_errors{'macro_in_invalid_documentencoding'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'unhandled encoding name `badm\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/macro/macro_in_macro_arg.pl 
b/tp/t/results/macro/macro_in_macro_arg.pl
index 1d89148bf7..7721906100 100644
--- a/tp/t/results/macro/macro_in_macro_arg.pl
+++ b/tp/t/results/macro/macro_in_macro_arg.pl
@@ -56,8 +56,7 @@ $result_trees{'macro_in_macro_arg'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -67,8 +66,7 @@ $result_trees{'macro_in_macro_arg'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -122,8 +120,7 @@ $result_trees{'macro_in_macro_arg'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
@@ -133,8 +130,7 @@ $result_trees{'macro_in_macro_arg'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -197,8 +193,7 @@ $result_trees{'macro_in_macro_arg'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             }
           ],
@@ -208,8 +203,7 @@ $result_trees{'macro_in_macro_arg'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
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 c2add188f8..646c7822ef 100644
--- a/tp/t/results/macro/macro_in_macro_arg_simpler.pl
+++ b/tp/t/results/macro/macro_in_macro_arg_simpler.pl
@@ -51,8 +51,7 @@ $result_trees{'macro_in_macro_arg_simpler'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'macro_in_macro_arg_simpler'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -126,8 +124,7 @@ $result_trees{'macro_in_macro_arg_simpler'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
@@ -137,8 +134,7 @@ $result_trees{'macro_in_macro_arg_simpler'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
diff --git a/tp/t/results/macro/macro_in_menu.pl 
b/tp/t/results/macro/macro_in_menu.pl
index cdcc9b912e..01060fbbbe 100644
--- a/tp/t/results/macro/macro_in_menu.pl
+++ b/tp/t/results/macro/macro_in_menu.pl
@@ -56,8 +56,7 @@ $result_trees{'macro_in_menu'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -67,8 +66,7 @@ $result_trees{'macro_in_menu'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -118,8 +116,7 @@ $result_trees{'macro_in_menu'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
@@ -129,8 +126,7 @@ $result_trees{'macro_in_menu'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -180,8 +176,7 @@ $result_trees{'macro_in_menu'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
@@ -191,8 +186,7 @@ $result_trees{'macro_in_menu'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -242,8 +236,7 @@ $result_trees{'macro_in_menu'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
@@ -253,8 +246,7 @@ $result_trees{'macro_in_menu'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           }
         },
         {
@@ -304,8 +296,7 @@ $result_trees{'macro_in_menu'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             }
           ],
@@ -315,8 +306,7 @@ $result_trees{'macro_in_menu'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           }
         },
         {
@@ -366,8 +356,7 @@ $result_trees{'macro_in_menu'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             }
           ],
@@ -377,8 +366,7 @@ $result_trees{'macro_in_menu'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 22,
-            'macro' => ''
+            'line_nr' => 22
           }
         },
         {
@@ -495,8 +483,7 @@ $result_trees{'macro_in_menu'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               },
               'type' => 'menu_entry'
             },
@@ -632,8 +619,7 @@ $result_trees{'macro_in_menu'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               },
               'type' => 'menu_entry'
             },
@@ -712,8 +698,7 @@ $result_trees{'macro_in_menu'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               },
               'type' => 'menu_entry'
             },
@@ -833,8 +818,7 @@ $result_trees{'macro_in_menu'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               },
               'type' => 'menu_entry'
             },
@@ -918,8 +902,7 @@ $result_trees{'macro_in_menu'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               },
               'type' => 'menu_entry'
             },
@@ -951,15 +934,13 @@ $result_trees{'macro_in_menu'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         }
       ],
diff --git a/tp/t/results/macro/macro_in_menu_comment_closed_by_detailmenu.pl 
b/tp/t/results/macro/macro_in_menu_comment_closed_by_detailmenu.pl
index e871dd6c5c..81c436d599 100644
--- a/tp/t/results/macro/macro_in_menu_comment_closed_by_detailmenu.pl
+++ b/tp/t/results/macro/macro_in_menu_comment_closed_by_detailmenu.pl
@@ -51,8 +51,7 @@ $result_trees{'macro_in_menu_comment_closed_by_detailmenu'} = 
{
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'macro_in_menu_comment_closed_by_detailmenu'} = 
{
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -167,8 +165,7 @@ $result_trees{'macro_in_menu_comment_closed_by_detailmenu'} 
= {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   },
                   'type' => 'menu_entry'
                 },
@@ -200,15 +197,13 @@ 
$result_trees{'macro_in_menu_comment_closed_by_detailmenu'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 8,
-                    'macro' => ''
+                    'line_nr' => 8
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -239,15 +234,13 @@ 
$result_trees{'macro_in_menu_comment_closed_by_detailmenu'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
diff --git a/tp/t/results/macro/macro_in_menu_comment_like_entry.pl 
b/tp/t/results/macro/macro_in_menu_comment_like_entry.pl
index f85ebbeb96..3e96e32461 100644
--- a/tp/t/results/macro/macro_in_menu_comment_like_entry.pl
+++ b/tp/t/results/macro/macro_in_menu_comment_like_entry.pl
@@ -56,8 +56,7 @@ $result_trees{'macro_in_menu_comment_like_entry'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -67,8 +66,7 @@ $result_trees{'macro_in_menu_comment_like_entry'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -184,8 +182,7 @@ $result_trees{'macro_in_menu_comment_like_entry'} = {
                       'cmdname' => 'b',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       },
                       'source_marks' => [
                         {
@@ -258,15 +255,13 @@ $result_trees{'macro_in_menu_comment_like_entry'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         }
       ],
diff --git a/tp/t/results/macro/macro_in_menu_description.pl 
b/tp/t/results/macro/macro_in_menu_description.pl
index c011778cd5..95b5af59e3 100644
--- a/tp/t/results/macro/macro_in_menu_description.pl
+++ b/tp/t/results/macro/macro_in_menu_description.pl
@@ -51,8 +51,7 @@ $result_trees{'macro_in_menu_description'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'macro_in_menu_description'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -128,8 +126,7 @@ $result_trees{'macro_in_menu_description'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -199,15 +196,13 @@ $result_trees{'macro_in_menu_description'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
diff --git a/tp/t/results/macro/macro_in_misc_commands.pl 
b/tp/t/results/macro/macro_in_misc_commands.pl
index 1c0d98dfe2..4baefd1b66 100644
--- a/tp/t/results/macro/macro_in_misc_commands.pl
+++ b/tp/t/results/macro/macro_in_misc_commands.pl
@@ -51,8 +51,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -113,8 +111,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -124,8 +121,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -192,8 +188,7 @@ $result_trees{'macro_in_misc_commands'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -290,8 +285,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -374,8 +368,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             }
           ],
@@ -385,8 +378,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           }
         },
         {
@@ -431,8 +423,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             }
           ],
@@ -442,8 +433,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         },
         {
@@ -511,8 +501,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             }
           ],
@@ -641,8 +630,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               }
             }
           ],
@@ -652,8 +640,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 29,
-            'macro' => ''
+            'line_nr' => 29
           }
         },
         {
@@ -703,8 +690,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             }
           ],
@@ -714,8 +700,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 33,
-            'macro' => ''
+            'line_nr' => 33
           }
         },
         {
@@ -775,8 +760,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 37,
-            'macro' => ''
+            'line_nr' => 37
           },
           'source_marks' => [
             {
@@ -867,8 +851,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 39,
-            'macro' => ''
+            'line_nr' => 39
           }
         },
         {
@@ -921,8 +904,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 40,
-            'macro' => ''
+            'line_nr' => 40
           }
         },
         {
@@ -975,8 +957,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 41,
-            'macro' => ''
+            'line_nr' => 41
           }
         },
         {
@@ -1026,8 +1007,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 45,
-                'macro' => ''
+                'line_nr' => 45
               }
             }
           ],
@@ -1037,8 +1017,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 43,
-            'macro' => ''
+            'line_nr' => 43
           }
         },
         {
@@ -1103,8 +1082,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 47,
-            'macro' => ''
+            'line_nr' => 47
           }
         },
         {
@@ -1154,8 +1132,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 51,
-                'macro' => ''
+                'line_nr' => 51
               }
             }
           ],
@@ -1165,8 +1142,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 49,
-            'macro' => ''
+            'line_nr' => 49
           },
           'source_marks' => [
             {
@@ -1244,8 +1220,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 55,
-                'macro' => ''
+                'line_nr' => 55
               }
             }
           ],
@@ -1255,8 +1230,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 53,
-            'macro' => ''
+            'line_nr' => 53
           },
           'source_marks' => [
             {
@@ -1337,8 +1311,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             }
           ],
@@ -1372,8 +1345,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 60,
-                'macro' => ''
+                'line_nr' => 60
               },
               'type' => 'definfoenclose_command'
             },
@@ -1431,8 +1403,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               }
             }
           ],
@@ -1442,8 +1413,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 62,
-            'macro' => ''
+            'line_nr' => 62
           }
         },
         {
@@ -1505,8 +1475,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 65,
-            'macro' => ''
+            'line_nr' => 65
           }
         },
         {
@@ -1537,8 +1506,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 67,
-                'macro' => ''
+                'line_nr' => 67
               },
               'type' => 'definfoenclose_command'
             },
@@ -1596,8 +1564,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             }
           ],
@@ -1607,8 +1574,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 69,
-            'macro' => ''
+            'line_nr' => 69
           }
         },
         {
@@ -1653,8 +1619,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 74,
-                'macro' => ''
+                'line_nr' => 74
               }
             }
           ],
@@ -1664,8 +1629,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 72,
-            'macro' => ''
+            'line_nr' => 72
           }
         },
         {
@@ -1818,8 +1782,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 78,
-            'macro' => ''
+            'line_nr' => 78
           }
         },
         {
@@ -1912,8 +1875,7 @@ $result_trees{'macro_in_misc_commands'} = {
               'cmdname' => 'kbd',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 82,
-                'macro' => ''
+                'line_nr' => 82
               }
             },
             {
@@ -1970,8 +1932,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 86,
-                'macro' => ''
+                'line_nr' => 86
               }
             }
           ],
@@ -1981,8 +1942,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 84,
-            'macro' => ''
+            'line_nr' => 84
           }
         },
         {
@@ -2042,8 +2002,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 87,
-            'macro' => ''
+            'line_nr' => 87
           }
         },
         {
@@ -2070,8 +2029,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 89,
-                'macro' => ''
+                'line_nr' => 89
               }
             },
             {
@@ -2119,8 +2077,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 92,
-                    'macro' => ''
+                    'line_nr' => 92
                   }
                 },
                 {
@@ -2158,15 +2115,13 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 93,
-                'macro' => ''
+                'line_nr' => 93
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 91,
-            'macro' => ''
+            'line_nr' => 91
           }
         },
         {
@@ -2216,8 +2171,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 97,
-                'macro' => ''
+                'line_nr' => 97
               }
             }
           ],
@@ -2227,8 +2181,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 95,
-            'macro' => ''
+            'line_nr' => 95
           }
         },
         {
@@ -2273,8 +2226,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 100,
-                'macro' => ''
+                'line_nr' => 100
               }
             }
           ],
@@ -2284,8 +2236,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 98,
-            'macro' => ''
+            'line_nr' => 98
           }
         },
         {
@@ -2330,8 +2281,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 103,
-                'macro' => ''
+                'line_nr' => 103
               }
             }
           ],
@@ -2341,8 +2291,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 101,
-            'macro' => ''
+            'line_nr' => 101
           }
         },
         {
@@ -2387,8 +2336,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 106,
-                'macro' => ''
+                'line_nr' => 106
               }
             }
           ],
@@ -2398,8 +2346,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 104,
-            'macro' => ''
+            'line_nr' => 104
           }
         },
         {
@@ -2444,8 +2391,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 109,
-                'macro' => ''
+                'line_nr' => 109
               }
             }
           ],
@@ -2455,8 +2401,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 107,
-            'macro' => ''
+            'line_nr' => 107
           }
         },
         {
@@ -2521,8 +2466,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 111,
-            'macro' => ''
+            'line_nr' => 111
           }
         },
         {
@@ -2582,8 +2526,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 112,
-            'macro' => ''
+            'line_nr' => 112
           }
         },
         {
@@ -2643,8 +2586,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 113,
-            'macro' => ''
+            'line_nr' => 113
           }
         },
         {
@@ -2704,8 +2646,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 114,
-            'macro' => ''
+            'line_nr' => 114
           }
         },
         {
@@ -2765,8 +2706,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 115,
-            'macro' => ''
+            'line_nr' => 115
           }
         },
         {
@@ -2826,8 +2766,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 116,
-            'macro' => ''
+            'line_nr' => 116
           }
         },
         {
@@ -2877,8 +2816,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 120,
-                'macro' => ''
+                'line_nr' => 120
               }
             }
           ],
@@ -2888,8 +2826,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 118,
-            'macro' => ''
+            'line_nr' => 118
           }
         },
         {
@@ -2934,8 +2871,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 123,
-                'macro' => ''
+                'line_nr' => 123
               }
             }
           ],
@@ -2945,8 +2881,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 121,
-            'macro' => ''
+            'line_nr' => 121
           }
         },
         {
@@ -3006,8 +2941,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 124,
-            'macro' => ''
+            'line_nr' => 124
           }
         },
         {
@@ -3067,8 +3001,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 125,
-            'macro' => ''
+            'line_nr' => 125
           }
         },
         {
@@ -3118,8 +3051,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 129,
-                'macro' => ''
+                'line_nr' => 129
               }
             }
           ],
@@ -3129,8 +3061,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 127,
-            'macro' => ''
+            'line_nr' => 127
           }
         },
         {
@@ -3175,8 +3106,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 132,
-                'macro' => ''
+                'line_nr' => 132
               }
             }
           ],
@@ -3186,8 +3116,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 130,
-            'macro' => ''
+            'line_nr' => 130
           }
         },
         {
@@ -3247,8 +3176,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 133,
-            'macro' => ''
+            'line_nr' => 133
           }
         },
         {
@@ -3308,8 +3236,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 134,
-            'macro' => ''
+            'line_nr' => 134
           }
         },
         {
@@ -3369,8 +3296,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 139,
-                'macro' => ''
+                'line_nr' => 139
               }
             }
           ],
@@ -3380,8 +3306,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 137,
-            'macro' => ''
+            'line_nr' => 137
           }
         },
         {
@@ -3441,8 +3366,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 140,
-            'macro' => ''
+            'line_nr' => 140
           }
         },
         {
@@ -3497,8 +3421,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 144,
-                'macro' => ''
+                'line_nr' => 144
               }
             }
           ],
@@ -3508,8 +3431,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 142,
-            'macro' => ''
+            'line_nr' => 142
           }
         },
         {
@@ -3554,8 +3476,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 147,
-                'macro' => ''
+                'line_nr' => 147
               }
             }
           ],
@@ -3565,8 +3486,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 145,
-            'macro' => ''
+            'line_nr' => 145
           }
         },
         {
@@ -3626,8 +3546,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 148,
-            'macro' => ''
+            'line_nr' => 148
           }
         },
         {
@@ -3692,8 +3611,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 150,
-            'macro' => ''
+            'line_nr' => 150
           }
         },
         {
@@ -3743,8 +3661,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 154,
-                'macro' => ''
+                'line_nr' => 154
               }
             }
           ],
@@ -3754,8 +3671,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 152,
-            'macro' => ''
+            'line_nr' => 152
           }
         },
         {
@@ -3800,8 +3716,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 157,
-                'macro' => ''
+                'line_nr' => 157
               }
             }
           ],
@@ -3811,8 +3726,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 155,
-            'macro' => ''
+            'line_nr' => 155
           }
         },
         {
@@ -3857,8 +3771,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 160,
-                'macro' => ''
+                'line_nr' => 160
               }
             }
           ],
@@ -3868,8 +3781,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 158,
-            'macro' => ''
+            'line_nr' => 158
           }
         },
         {
@@ -4423,8 +4335,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 178,
-                'macro' => ''
+                'line_nr' => 178
               }
             }
           ],
@@ -4434,8 +4345,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 176,
-            'macro' => ''
+            'line_nr' => 176
           },
           'source_marks' => [
             {
@@ -4538,8 +4448,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 185,
-                'macro' => ''
+                'line_nr' => 185
               }
             }
           ],
@@ -4549,8 +4458,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 183,
-            'macro' => ''
+            'line_nr' => 183
           },
           'source_marks' => [
             {
@@ -4654,8 +4562,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 190,
-                'macro' => ''
+                'line_nr' => 190
               }
             }
           ],
@@ -4665,8 +4572,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 188,
-            'macro' => ''
+            'line_nr' => 188
           }
         },
         {
@@ -4726,8 +4632,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 191,
-            'macro' => ''
+            'line_nr' => 191
           }
         },
         {
@@ -4777,8 +4682,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 195,
-                'macro' => ''
+                'line_nr' => 195
               }
             }
           ],
@@ -4788,8 +4692,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 193,
-            'macro' => ''
+            'line_nr' => 193
           }
         },
         {
@@ -4811,8 +4714,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 197,
-            'macro' => ''
+            'line_nr' => 197
           }
         },
         {
@@ -4902,8 +4804,7 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 200,
-                'macro' => ''
+                'line_nr' => 200
               },
               'type' => 'menu_entry'
             },
@@ -4935,15 +4836,13 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 201,
-                'macro' => ''
+                'line_nr' => 201
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 199,
-            'macro' => ''
+            'line_nr' => 199
           }
         },
         {
@@ -4960,8 +4859,7 @@ $result_trees{'macro_in_misc_commands'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -5018,8 +4916,7 @@ $result_trees{'macro_in_misc_commands'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 203,
-        'macro' => ''
+        'line_nr' => 203
       }
     },
     {
@@ -5133,8 +5030,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 210,
-                'macro' => ''
+                'line_nr' => 210
               }
             }
           ],
@@ -5144,8 +5040,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 208,
-            'macro' => ''
+            'line_nr' => 208
           },
           'source_marks' => [
             {
@@ -5233,8 +5128,7 @@ $result_trees{'macro_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 215,
-                'macro' => ''
+                'line_nr' => 215
               }
             }
           ],
@@ -5244,8 +5138,7 @@ $result_trees{'macro_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 213,
-            'macro' => ''
+            'line_nr' => 213
           }
         },
         {
@@ -5283,8 +5176,7 @@ $result_trees{'macro_in_misc_commands'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 204,
-        'macro' => ''
+        'line_nr' => 204
       },
       'source_marks' => [
         {
@@ -5729,7 +5621,6 @@ $result_errors{'macro_in_misc_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 23,
-    'macro' => '',
     'text' => '@documentlanguage should only appear at the beginning of a 
line',
     'type' => 'warning'
   },
@@ -5738,7 +5629,6 @@ $result_errors{'macro_in_misc_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 39,
-    'macro' => '',
     'text' => 'bad argument to @headings: on line following headings atext',
     'type' => 'error'
   },
@@ -5747,7 +5637,6 @@ $result_errors{'macro_in_misc_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 58,
-    'macro' => '',
     'text' => '@definfoenclose is obsolete',
     'type' => 'warning'
   },
@@ -5756,7 +5645,6 @@ $result_errors{'macro_in_misc_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 58,
-    'macro' => '',
     'text' => '@definfoenclose should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -5765,7 +5653,6 @@ $result_errors{'macro_in_misc_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 65,
-    'macro' => '',
     'text' => '@definfoenclose is obsolete',
     'type' => 'warning'
   },
@@ -5774,7 +5661,6 @@ $result_errors{'macro_in_misc_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 78,
-    'macro' => '',
     'text' => '@definfoenclose is obsolete',
     'type' => 'warning'
   },
@@ -5783,7 +5669,6 @@ $result_errors{'macro_in_misc_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 125,
-    'macro' => '',
     'text' => 'multiple @footnotestyle',
     'type' => 'warning'
   },
diff --git a/tp/t/results/macro/macro_in_multitable_empty_before_item.pl 
b/tp/t/results/macro/macro_in_multitable_empty_before_item.pl
index a6825a87ef..f43a181e96 100644
--- a/tp/t/results/macro/macro_in_multitable_empty_before_item.pl
+++ b/tp/t/results/macro/macro_in_multitable_empty_before_item.pl
@@ -46,8 +46,7 @@ $result_trees{'macro_in_multitable_empty_before_item'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -57,8 +56,7 @@ $result_trees{'macro_in_multitable_empty_before_item'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -102,8 +100,7 @@ $result_trees{'macro_in_multitable_empty_before_item'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 }
               ],
@@ -168,8 +165,7 @@ $result_trees{'macro_in_multitable_empty_before_item'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -194,8 +190,7 @@ $result_trees{'macro_in_multitable_empty_before_item'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
@@ -235,8 +230,7 @@ $result_trees{'macro_in_multitable_empty_before_item'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -251,8 +245,7 @@ $result_trees{'macro_in_multitable_empty_before_item'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         }
       ],
diff --git a/tp/t/results/macro/macro_in_table_empty_before_item.pl 
b/tp/t/results/macro/macro_in_table_empty_before_item.pl
index d17ec1e80b..b687176253 100644
--- a/tp/t/results/macro/macro_in_table_empty_before_item.pl
+++ b/tp/t/results/macro/macro_in_table_empty_before_item.pl
@@ -46,8 +46,7 @@ $result_trees{'macro_in_table_empty_before_item'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -57,8 +56,7 @@ $result_trees{'macro_in_table_empty_before_item'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -74,8 +72,7 @@ $result_trees{'macro_in_table_empty_before_item'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   },
                   'type' => 'command_as_argument'
                 }
@@ -151,8 +148,7 @@ $result_trees{'macro_in_table_empty_before_item'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
@@ -189,8 +185,7 @@ $result_trees{'macro_in_table_empty_before_item'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -204,8 +199,7 @@ $result_trees{'macro_in_table_empty_before_item'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         }
       ],
diff --git a/tp/t/results/macro/macro_inlineifcond_end_in_empty_ignored.pl 
b/tp/t/results/macro/macro_inlineifcond_end_in_empty_ignored.pl
index 460ff1f42d..b72748ea0a 100644
--- a/tp/t/results/macro/macro_inlineifcond_end_in_empty_ignored.pl
+++ b/tp/t/results/macro/macro_inlineifcond_end_in_empty_ignored.pl
@@ -51,8 +51,7 @@ $result_trees{'macro_inlineifcond_end_in_empty_ignored'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'macro_inlineifcond_end_in_empty_ignored'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -123,8 +121,7 @@ $result_trees{'macro_inlineifcond_end_in_empty_ignored'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -196,8 +193,7 @@ $result_trees{'macro_inlineifcond_end_in_empty_ignored'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
diff --git a/tp/t/results/macro/macro_inlineifcond_end_in_empty_set.pl 
b/tp/t/results/macro/macro_inlineifcond_end_in_empty_set.pl
index d4b4750fb0..7d44816576 100644
--- a/tp/t/results/macro/macro_inlineifcond_end_in_empty_set.pl
+++ b/tp/t/results/macro/macro_inlineifcond_end_in_empty_set.pl
@@ -51,8 +51,7 @@ $result_trees{'macro_inlineifcond_end_in_empty_set'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'macro_inlineifcond_end_in_empty_set'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -123,8 +121,7 @@ $result_trees{'macro_inlineifcond_end_in_empty_set'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -196,8 +193,7 @@ $result_trees{'macro_inlineifcond_end_in_empty_set'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
diff --git a/tp/t/results/macro/macro_name_with_digit.pl 
b/tp/t/results/macro/macro_name_with_digit.pl
index b1696dea44..aaa625af57 100644
--- a/tp/t/results/macro/macro_name_with_digit.pl
+++ b/tp/t/results/macro/macro_name_with_digit.pl
@@ -51,8 +51,7 @@ $result_trees{'macro_name_with_digit'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'macro_name_with_digit'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -117,8 +115,7 @@ $result_trees{'macro_name_with_digit'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -128,8 +125,7 @@ $result_trees{'macro_name_with_digit'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
diff --git a/tp/t/results/macro/macro_name_with_hyphen.pl 
b/tp/t/results/macro/macro_name_with_hyphen.pl
index b36c22696f..0b970c424b 100644
--- a/tp/t/results/macro/macro_name_with_hyphen.pl
+++ b/tp/t/results/macro/macro_name_with_hyphen.pl
@@ -59,8 +59,7 @@ $result_trees{'macro_name_with_hyphen'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -70,8 +69,7 @@ $result_trees{'macro_name_with_hyphen'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
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 50c011a839..eee36c5607 100644
--- a/tp/t/results/macro/macro_no_arg_bad_expansion.pl
+++ b/tp/t/results/macro/macro_no_arg_bad_expansion.pl
@@ -51,8 +51,7 @@ $result_trees{'macro_no_arg_bad_expansion'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'macro_no_arg_bad_expansion'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/macro/macro_no_arg_expansion.pl 
b/tp/t/results/macro/macro_no_arg_expansion.pl
index 04866d49d1..0acb5f24ae 100644
--- a/tp/t/results/macro/macro_no_arg_expansion.pl
+++ b/tp/t/results/macro/macro_no_arg_expansion.pl
@@ -51,8 +51,7 @@ $result_trees{'macro_no_arg_expansion'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'macro_no_arg_expansion'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/macro/macro_no_argument.pl 
b/tp/t/results/macro/macro_no_argument.pl
index 09579b420d..7804c33d66 100644
--- a/tp/t/results/macro/macro_no_argument.pl
+++ b/tp/t/results/macro/macro_no_argument.pl
@@ -19,8 +19,7 @@ $result_trees{'macro_no_argument'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -41,7 +40,6 @@ $result_errors{'macro_no_argument'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@macro requires a name',
     'type' => 'error'
   },
@@ -50,7 +48,6 @@ $result_errors{'macro_no_argument'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'no matching `@end macro\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/macro/macro_not_closed.pl 
b/tp/t/results/macro/macro_not_closed.pl
index a06868d1fe..2e1ca2904c 100644
--- a/tp/t/results/macro/macro_not_closed.pl
+++ b/tp/t/results/macro/macro_not_closed.pl
@@ -30,8 +30,7 @@ $result_trees{'macro_not_closed'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -54,7 +53,6 @@ $result_errors{'macro_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'no matching `@end macro\'',
     'type' => 'error'
   }
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 c9ae7d8641..1464cfc4fe 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
@@ -55,8 +55,7 @@ $result_trees{'macro_one_arg_end_of_file'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -66,8 +65,7 @@ $result_trees{'macro_one_arg_end_of_file'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/macro/macro_replaced_by_definfoenclose.pl 
b/tp/t/results/macro/macro_replaced_by_definfoenclose.pl
index 9cfc83a42d..987edb30cd 100644
--- a/tp/t/results/macro/macro_replaced_by_definfoenclose.pl
+++ b/tp/t/results/macro/macro_replaced_by_definfoenclose.pl
@@ -55,8 +55,7 @@ $result_trees{'macro_replaced_by_definfoenclose'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -66,8 +65,7 @@ $result_trees{'macro_replaced_by_definfoenclose'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -107,8 +105,7 @@ $result_trees{'macro_replaced_by_definfoenclose'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -139,8 +136,7 @@ $result_trees{'macro_replaced_by_definfoenclose'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'definfoenclose_command'
             },
@@ -179,7 +175,6 @@ $result_errors{'macro_replaced_by_definfoenclose'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@definfoenclose is obsolete',
     'type' => 'warning'
   }
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 e909613931..7918429371 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
@@ -55,8 +55,7 @@ $result_trees{'macro_with_error_at_end_line_after_macro'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -66,8 +65,7 @@ $result_trees{'macro_with_error_at_end_line_after_macro'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/macro/macro_zero.pl b/tp/t/results/macro/macro_zero.pl
index f92c435fe8..4df0581296 100644
--- a/tp/t/results/macro/macro_zero.pl
+++ b/tp/t/results/macro/macro_zero.pl
@@ -51,8 +51,7 @@ $result_trees{'macro_zero'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'macro_zero'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/macro/nested_macro_call.pl 
b/tp/t/results/macro/nested_macro_call.pl
index 9bca7ba012..231b8982c3 100644
--- a/tp/t/results/macro/nested_macro_call.pl
+++ b/tp/t/results/macro/nested_macro_call.pl
@@ -51,8 +51,7 @@ $result_trees{'nested_macro_call'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'nested_macro_call'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -118,8 +116,7 @@ $result_trees{'nested_macro_call'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
@@ -129,8 +126,7 @@ $result_trees{'nested_macro_call'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
diff --git a/tp/t/results/macro/no_macrobody.pl 
b/tp/t/results/macro/no_macrobody.pl
index d91dcca53c..330c11f4d5 100644
--- a/tp/t/results/macro/no_macrobody.pl
+++ b/tp/t/results/macro/no_macrobody.pl
@@ -50,8 +50,7 @@ $result_trees{'no_macrobody'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -61,8 +60,7 @@ $result_trees{'no_macrobody'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/macro/non_ascii_in_macro_name.pl 
b/tp/t/results/macro/non_ascii_in_macro_name.pl
index ae7978781d..c5f76fa4a3 100644
--- a/tp/t/results/macro/non_ascii_in_macro_name.pl
+++ b/tp/t/results/macro/non_ascii_in_macro_name.pl
@@ -45,8 +45,7 @@ $result_trees{'non_ascii_in_macro_name'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -59,8 +58,7 @@ $result_trees{'non_ascii_in_macro_name'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -102,7 +100,6 @@ $result_errors{'non_ascii_in_macro_name'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'bad name for @macro',
     'type' => 'error'
   },
@@ -111,7 +108,6 @@ $result_errors{'non_ascii_in_macro_name'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'unknown command `parenbr\'',
     'type' => 'error'
   },
@@ -120,7 +116,6 @@ $result_errors{'non_ascii_in_macro_name'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
   },
@@ -129,7 +124,6 @@ $result_errors{'non_ascii_in_macro_name'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/macro/paragraph_and_macro.pl 
b/tp/t/results/macro/paragraph_and_macro.pl
index 443790e30c..4204c0a542 100644
--- a/tp/t/results/macro/paragraph_and_macro.pl
+++ b/tp/t/results/macro/paragraph_and_macro.pl
@@ -46,8 +46,7 @@ $result_trees{'paragraph_and_macro'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -57,8 +56,7 @@ $result_trees{'paragraph_and_macro'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -108,8 +106,7 @@ $result_trees{'paragraph_and_macro'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -119,8 +116,7 @@ $result_trees{'paragraph_and_macro'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -170,8 +166,7 @@ $result_trees{'paragraph_and_macro'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
@@ -181,8 +176,7 @@ $result_trees{'paragraph_and_macro'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
diff --git a/tp/t/results/macro/protect_comma_macro_line.pl 
b/tp/t/results/macro/protect_comma_macro_line.pl
index 58e50c74a6..2f3850e150 100644
--- a/tp/t/results/macro/protect_comma_macro_line.pl
+++ b/tp/t/results/macro/protect_comma_macro_line.pl
@@ -70,8 +70,7 @@ $result_trees{'protect_comma_macro_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -81,8 +80,7 @@ $result_trees{'protect_comma_macro_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/macro/protect_in_body.pl 
b/tp/t/results/macro/protect_in_body.pl
index cee1a3111c..7d0a270b58 100644
--- a/tp/t/results/macro/protect_in_body.pl
+++ b/tp/t/results/macro/protect_in_body.pl
@@ -59,8 +59,7 @@ $result_trees{'protect_in_body'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -70,8 +69,7 @@ $result_trees{'protect_in_body'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
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 7a39210552..41e8a1c972 100644
--- a/tp/t/results/macro/protect_in_body_line_arg.pl
+++ b/tp/t/results/macro/protect_in_body_line_arg.pl
@@ -59,8 +59,7 @@ $result_trees{'protect_in_body_line_arg'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -70,8 +69,7 @@ $result_trees{'protect_in_body_line_arg'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -151,8 +149,7 @@ $result_trees{'protect_in_body_line_arg'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -187,7 +184,6 @@ $result_errors{'protect_in_body_line_arg'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@macroone defined with zero or more than one argument should be 
invoked with {}',
     'type' => 'warning'
   }
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 d96af784ba..7850deff88 100644
--- a/tp/t/results/macro/protect_in_body_one_arg.pl
+++ b/tp/t/results/macro/protect_in_body_one_arg.pl
@@ -59,8 +59,7 @@ $result_trees{'protect_in_body_one_arg'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -70,8 +69,7 @@ $result_trees{'protect_in_body_one_arg'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/macro/recursive_call_in_argument.pl 
b/tp/t/results/macro/recursive_call_in_argument.pl
index 5f17607f87..7c9c773006 100644
--- a/tp/t/results/macro/recursive_call_in_argument.pl
+++ b/tp/t/results/macro/recursive_call_in_argument.pl
@@ -55,8 +55,7 @@ $result_trees{'recursive_call_in_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -66,8 +65,7 @@ $result_trees{'recursive_call_in_argument'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/macro/recursive_call_in_macro.pl 
b/tp/t/results/macro/recursive_call_in_macro.pl
index f8a5aa77af..be4bf42aa6 100644
--- a/tp/t/results/macro/recursive_call_in_macro.pl
+++ b/tp/t/results/macro/recursive_call_in_macro.pl
@@ -55,8 +55,7 @@ $result_trees{'recursive_call_in_macro'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -66,8 +65,7 @@ $result_trees{'recursive_call_in_macro'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/macro/recursive_call_in_rmacro.pl 
b/tp/t/results/macro/recursive_call_in_rmacro.pl
index 64b6b1fa2a..74ba69f4f8 100644
--- a/tp/t/results/macro/recursive_call_in_rmacro.pl
+++ b/tp/t/results/macro/recursive_call_in_rmacro.pl
@@ -56,8 +56,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -67,8 +66,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
diff --git a/tp/t/results/macro/redefine_texinfo_macro.pl 
b/tp/t/results/macro/redefine_texinfo_macro.pl
index 9537e1eead..b00a6400b9 100644
--- a/tp/t/results/macro/redefine_texinfo_macro.pl
+++ b/tp/t/results/macro/redefine_texinfo_macro.pl
@@ -55,8 +55,7 @@ $result_trees{'redefine_texinfo_macro'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -66,8 +65,7 @@ $result_trees{'redefine_texinfo_macro'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -158,7 +156,6 @@ $result_errors{'redefine_texinfo_macro'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'redefining Texinfo language command: @code',
     'type' => 'warning'
   }
diff --git a/tp/t/results/macro/simple_imbricated_macro.pl 
b/tp/t/results/macro/simple_imbricated_macro.pl
index 994626e026..45206d6e07 100644
--- a/tp/t/results/macro/simple_imbricated_macro.pl
+++ b/tp/t/results/macro/simple_imbricated_macro.pl
@@ -66,8 +66,7 @@ $result_trees{'simple_imbricated_macro'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -77,8 +76,7 @@ $result_trees{'simple_imbricated_macro'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/macro/simple_imbricated_macro_rmacro.pl 
b/tp/t/results/macro/simple_imbricated_macro_rmacro.pl
index 47e0bb3c93..846816b8f8 100644
--- a/tp/t/results/macro/simple_imbricated_macro_rmacro.pl
+++ b/tp/t/results/macro/simple_imbricated_macro_rmacro.pl
@@ -66,8 +66,7 @@ $result_trees{'simple_imbricated_macro_rmacro'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -77,8 +76,7 @@ $result_trees{'simple_imbricated_macro_rmacro'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/macro/space_macro_after_end.pl 
b/tp/t/results/macro/space_macro_after_end.pl
index e19fb86a7f..3aa80735c4 100644
--- a/tp/t/results/macro/space_macro_after_end.pl
+++ b/tp/t/results/macro/space_macro_after_end.pl
@@ -51,8 +51,7 @@ $result_trees{'space_macro_after_end'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'space_macro_after_end'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -146,15 +144,13 @@ $result_trees{'space_macro_after_end'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
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 0fe800e1b6..1a5a724597 100644
--- a/tp/t/results/macro/space_macro_after_end_verbatim.pl
+++ b/tp/t/results/macro/space_macro_after_end_verbatim.pl
@@ -51,8 +51,7 @@ $result_trees{'space_macro_after_end_verbatim'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'space_macro_after_end_verbatim'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -142,15 +140,13 @@ $result_trees{'space_macro_after_end_verbatim'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
diff --git a/tp/t/results/macro/text_before_after.pl 
b/tp/t/results/macro/text_before_after.pl
index 6980414ec8..3a057544e5 100644
--- a/tp/t/results/macro/text_before_after.pl
+++ b/tp/t/results/macro/text_before_after.pl
@@ -56,8 +56,7 @@ $result_trees{'text_before_after'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 }
               ],
@@ -67,8 +66,7 @@ $result_trees{'text_before_after'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -95,7 +93,6 @@ $result_errors{'text_before_after'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@macro should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -104,7 +101,6 @@ $result_errors{'text_before_after'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'bad argument to @end: macro after',
     'type' => 'error'
   }
diff --git a/tp/t/results/macro/too_much_args.pl 
b/tp/t/results/macro/too_much_args.pl
index 98806bd34d..bb412cc85b 100644
--- a/tp/t/results/macro/too_much_args.pl
+++ b/tp/t/results/macro/too_much_args.pl
@@ -64,8 +64,7 @@ $result_trees{'too_much_args'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -75,8 +74,7 @@ $result_trees{'too_much_args'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -170,7 +168,6 @@ $result_errors{'too_much_args'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'macro `twoargs\' called with too many args',
     'type' => 'error'
   }
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 9a499475fd..fb713b171d 100644
--- a/tp/t/results/macro/two_macros_on_a_line.pl
+++ b/tp/t/results/macro/two_macros_on_a_line.pl
@@ -51,8 +51,7 @@ $result_trees{'two_macros_on_a_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'two_macros_on_a_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -127,8 +125,7 @@ $result_trees{'two_macros_on_a_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
@@ -138,8 +135,7 @@ $result_trees{'two_macros_on_a_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
diff --git a/tp/t/results/macro/unknown_macro_on_line_command.pl 
b/tp/t/results/macro/unknown_macro_on_line_command.pl
index aa6ece6bb5..8b343365cc 100644
--- a/tp/t/results/macro/unknown_macro_on_line_command.pl
+++ b/tp/t/results/macro/unknown_macro_on_line_command.pl
@@ -31,8 +31,7 @@ $result_trees{'unknown_macro_on_line_command'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -53,7 +52,6 @@ $result_errors{'unknown_macro_on_line_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'unknown command `begin\'',
     'type' => 'error'
   },
@@ -62,7 +60,6 @@ $result_errors{'unknown_macro_on_line_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
   },
@@ -71,7 +68,6 @@ $result_errors{'unknown_macro_on_line_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/macro/unpaired_backslash_in_macro_body.pl 
b/tp/t/results/macro/unpaired_backslash_in_macro_body.pl
index e08af1d019..d09e6818a5 100644
--- a/tp/t/results/macro/unpaired_backslash_in_macro_body.pl
+++ b/tp/t/results/macro/unpaired_backslash_in_macro_body.pl
@@ -60,8 +60,7 @@ $result_trees{'unpaired_backslash_in_macro_body'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -71,8 +70,7 @@ $result_trees{'unpaired_backslash_in_macro_body'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/macro/verb_with_arobase_in_macro_call.pl 
b/tp/t/results/macro/verb_with_arobase_in_macro_call.pl
index 31d946bb04..14115b1acc 100644
--- a/tp/t/results/macro/verb_with_arobase_in_macro_call.pl
+++ b/tp/t/results/macro/verb_with_arobase_in_macro_call.pl
@@ -64,8 +64,7 @@ $result_trees{'verb_with_arobase_in_macro_call'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -75,8 +74,7 @@ $result_trees{'verb_with_arobase_in_macro_call'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/macro/verb_with_brace_in_macro_call.pl 
b/tp/t/results/macro/verb_with_brace_in_macro_call.pl
index 5bb2784a4b..6cde576166 100644
--- a/tp/t/results/macro/verb_with_brace_in_macro_call.pl
+++ b/tp/t/results/macro/verb_with_brace_in_macro_call.pl
@@ -68,8 +68,7 @@ $result_trees{'verb_with_brace_in_macro_call'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -79,8 +78,7 @@ $result_trees{'verb_with_brace_in_macro_call'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
diff --git a/tp/t/results/macro/zero_argument.pl 
b/tp/t/results/macro/zero_argument.pl
index 894a51c6a0..aeed99e61a 100644
--- a/tp/t/results/macro/zero_argument.pl
+++ b/tp/t/results/macro/zero_argument.pl
@@ -51,8 +51,7 @@ $result_trees{'zero_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'zero_argument'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -107,8 +105,7 @@ $result_trees{'zero_argument'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -118,8 +115,7 @@ $result_trees{'zero_argument'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
diff --git a/tp/t/results/macro/zero_argument_comment.pl 
b/tp/t/results/macro/zero_argument_comment.pl
index 7880ea5395..25eef1a3c2 100644
--- a/tp/t/results/macro/zero_argument_comment.pl
+++ b/tp/t/results/macro/zero_argument_comment.pl
@@ -51,8 +51,7 @@ $result_trees{'zero_argument_comment'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'zero_argument_comment'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -107,8 +105,7 @@ $result_trees{'zero_argument_comment'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -118,8 +115,7 @@ $result_trees{'zero_argument_comment'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
diff --git a/tp/t/results/menu/bad_beginning.pl 
b/tp/t/results/menu/bad_beginning.pl
index 4744ca8125..e0577ff3a7 100644
--- a/tp/t/results/menu/bad_beginning.pl
+++ b/tp/t/results/menu/bad_beginning.pl
@@ -56,8 +56,7 @@ $result_trees{'bad_beginning'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -92,15 +91,13 @@ $result_trees{'bad_beginning'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/menu/block_commands_in_menu_description.pl 
b/tp/t/results/menu/block_commands_in_menu_description.pl
index 4f5ec6fe56..bb74601765 100644
--- a/tp/t/results/menu/block_commands_in_menu_description.pl
+++ b/tp/t/results/menu/block_commands_in_menu_description.pl
@@ -39,8 +39,7 @@ $result_trees{'block_commands_in_menu_description'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -185,8 +184,7 @@ $result_trees{'block_commands_in_menu_description'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 8,
-                            'macro' => ''
+                            'line_nr' => 8
                           }
                         },
                         {
@@ -217,8 +215,7 @@ $result_trees{'block_commands_in_menu_description'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 10,
-                            'macro' => ''
+                            'line_nr' => 10
                           }
                         }
                       ],
@@ -227,8 +224,7 @@ $result_trees{'block_commands_in_menu_description'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     },
                     {
@@ -239,8 +235,7 @@ $result_trees{'block_commands_in_menu_description'} = {
                               'cmdname' => 'asis',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 11,
-                                'macro' => ''
+                                'line_nr' => 11
                               },
                               'type' => 'command_as_argument'
                             }
@@ -300,8 +295,7 @@ $result_trees{'block_commands_in_menu_description'} = {
                                   },
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 13,
-                                    'macro' => ''
+                                    'line_nr' => 13
                                   }
                                 }
                               ],
@@ -362,8 +356,7 @@ $result_trees{'block_commands_in_menu_description'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 17,
-                            'macro' => ''
+                            'line_nr' => 17
                           }
                         }
                       ],
@@ -377,8 +370,7 @@ $result_trees{'block_commands_in_menu_description'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     },
                     {
@@ -444,15 +436,13 @@ $result_trees{'block_commands_in_menu_description'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 22,
-                                'macro' => ''
+                                'line_nr' => 22
                               }
                             }
                           ],
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 18,
-                            'macro' => ''
+                            'line_nr' => 18
                           }
                         }
                       ],
@@ -505,15 +495,13 @@ $result_trees{'block_commands_in_menu_description'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 25,
-                            'macro' => ''
+                            'line_nr' => 25
                           }
                         }
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 23,
-                        'macro' => ''
+                        'line_nr' => 23
                       }
                     }
                   ],
@@ -522,8 +510,7 @@ $result_trees{'block_commands_in_menu_description'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -555,15 +542,13 @@ $result_trees{'block_commands_in_menu_description'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         }
       ],
@@ -575,8 +560,7 @@ $result_trees{'block_commands_in_menu_description'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
diff --git a/tp/t/results/menu/commands_in_nodedescriptionblock.pl 
b/tp/t/results/menu/commands_in_nodedescriptionblock.pl
index d685dea184..25063c2787 100644
--- a/tp/t/results/menu/commands_in_nodedescriptionblock.pl
+++ b/tp/t/results/menu/commands_in_nodedescriptionblock.pl
@@ -39,8 +39,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -124,8 +123,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -172,8 +170,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -205,15 +202,13 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -245,8 +240,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -274,8 +268,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -299,8 +292,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -355,8 +347,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -393,8 +384,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
                   'cmdname' => 'ref',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 17,
-                    'macro' => ''
+                    'line_nr' => 17
                   }
                 },
                 {
@@ -419,8 +409,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
                   'cmdname' => 'footnote',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 17,
-                    'macro' => ''
+                    'line_nr' => 17
                   }
                 },
                 {
@@ -444,8 +433,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
                   'cmdname' => 'w',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 18,
-                    'macro' => ''
+                    'line_nr' => 18
                   }
                 },
                 {
@@ -485,8 +473,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 19,
-                    'macro' => ''
+                    'line_nr' => 19
                   },
                   'type' => 'index_entry_command'
                 }
@@ -545,8 +532,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 22,
-                    'macro' => ''
+                    'line_nr' => 22
                   }
                 },
                 {
@@ -575,8 +561,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 23,
-                    'macro' => ''
+                    'line_nr' => 23
                   }
                 },
                 {
@@ -612,8 +597,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 24,
-                    'macro' => ''
+                    'line_nr' => 24
                   }
                 }
               ],
@@ -660,8 +644,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 12,
-                    'macro' => ''
+                    'line_nr' => 12
                   }
                 },
                 'float_type' => 'tfloat',
@@ -675,8 +658,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -717,8 +699,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             }
           ],
@@ -727,8 +708,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           }
         },
         'node_long_description' => {},
@@ -741,8 +721,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {},
@@ -776,8 +755,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 29,
-        'macro' => ''
+        'line_nr' => 29
       }
     },
     {
@@ -828,8 +806,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               }
             },
             {
@@ -857,8 +834,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               }
             },
             {
@@ -930,8 +906,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               },
               'type' => 'menu_entry'
             },
@@ -963,15 +938,13 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 34,
-            'macro' => ''
+            'line_nr' => 34
           }
         },
         {
@@ -1009,8 +982,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 38,
-            'macro' => ''
+            'line_nr' => 38
           }
         },
         {
@@ -1046,8 +1018,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 40,
-            'macro' => ''
+            'line_nr' => 40
           }
         },
         {
@@ -1066,8 +1037,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 30,
-        'macro' => ''
+        'line_nr' => 30
       }
     }
   ],
@@ -1422,7 +1392,6 @@ 
$result_converted_errors{'plaintext'}->{'commands_in_nodedescriptionblock'} = [
 ',
     'file_name' => '',
     'line_nr' => 22,
-    'macro' => '',
     'text' => 'could not find @image file `float_image.txt\' nor alternate 
text',
     'type' => 'warning'
   }
@@ -1557,7 +1526,6 @@ 
$result_converted_errors{'html'}->{'commands_in_nodedescriptionblock'} = [
 ',
     'file_name' => '',
     'line_nr' => 22,
-    'macro' => '',
     'text' => '@image file `float_image\' (for HTML) not found, using 
`float_image.jpg\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/menu/comment_on_menu_line.pl 
b/tp/t/results/menu/comment_on_menu_line.pl
index d8c353a241..8f8770de26 100644
--- a/tp/t/results/menu/comment_on_menu_line.pl
+++ b/tp/t/results/menu/comment_on_menu_line.pl
@@ -97,8 +97,7 @@ $result_trees{'comment_on_menu_line'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -130,8 +129,7 @@ $result_trees{'comment_on_menu_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -142,8 +140,7 @@ $result_trees{'comment_on_menu_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -163,8 +160,7 @@ $result_trees{'comment_on_menu_line'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -195,8 +191,7 @@ $result_trees{'comment_on_menu_line'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -228,8 +223,7 @@ $result_trees{'comment_on_menu_line'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     }
   ],
diff --git a/tp/t/results/menu/dash_in_menu.pl 
b/tp/t/results/menu/dash_in_menu.pl
index 7b4878709f..924c3a1d3f 100644
--- a/tp/t/results/menu/dash_in_menu.pl
+++ b/tp/t/results/menu/dash_in_menu.pl
@@ -97,8 +97,7 @@ $result_trees{'dash_in_menu'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               },
               'type' => 'menu_entry'
             },
@@ -149,15 +148,13 @@ $result_trees{'dash_in_menu'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
diff --git a/tp/t/results/menu/detailmenu.pl b/tp/t/results/menu/detailmenu.pl
index 6bddae02cd..8703818ce9 100644
--- a/tp/t/results/menu/detailmenu.pl
+++ b/tp/t/results/menu/detailmenu.pl
@@ -71,8 +71,7 @@ $result_trees{'detailmenu'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               },
               'type' => 'menu_entry'
             },
@@ -148,8 +147,7 @@ $result_trees{'detailmenu'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   },
                   'type' => 'menu_entry'
                 },
@@ -181,15 +179,13 @@ $result_trees{'detailmenu'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -220,15 +216,13 @@ $result_trees{'detailmenu'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
diff --git a/tp/t/results/menu/detailmenu_in_description.pl 
b/tp/t/results/menu/detailmenu_in_description.pl
index b558836888..29096ece83 100644
--- a/tp/t/results/menu/detailmenu_in_description.pl
+++ b/tp/t/results/menu/detailmenu_in_description.pl
@@ -71,8 +71,7 @@ $result_trees{'detailmenu_in_description'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               },
               'type' => 'menu_entry'
             },
@@ -133,8 +132,7 @@ $result_trees{'detailmenu_in_description'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   },
                   'type' => 'menu_entry'
                 },
@@ -166,15 +164,13 @@ $result_trees{'detailmenu_in_description'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -205,15 +201,13 @@ $result_trees{'detailmenu_in_description'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
diff --git a/tp/t/results/menu/detailmenu_on_subnodes.pl 
b/tp/t/results/menu/detailmenu_on_subnodes.pl
index a17a4674d2..13052c2d24 100644
--- a/tp/t/results/menu/detailmenu_on_subnodes.pl
+++ b/tp/t/results/menu/detailmenu_on_subnodes.pl
@@ -39,8 +39,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -124,8 +123,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -172,8 +170,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -249,8 +246,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   },
                   'type' => 'menu_entry'
                 },
@@ -282,15 +278,13 @@ $result_trees{'detailmenu_on_subnodes'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -384,8 +378,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 15,
-                    'macro' => ''
+                    'line_nr' => 15
                   },
                   'type' => 'menu_entry'
                 },
@@ -432,8 +425,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 16,
-                    'macro' => ''
+                    'line_nr' => 16
                   },
                   'type' => 'menu_entry'
                 },
@@ -465,15 +457,13 @@ $result_trees{'detailmenu_on_subnodes'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 17,
-                    'macro' => ''
+                    'line_nr' => 17
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -504,15 +494,13 @@ $result_trees{'detailmenu_on_subnodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -529,8 +517,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -562,8 +549,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 20,
-        'macro' => ''
+        'line_nr' => 20
       }
     },
     {
@@ -647,8 +633,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               },
               'type' => 'menu_entry'
             },
@@ -680,15 +665,13 @@ $result_trees{'detailmenu_on_subnodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           }
         },
         {
@@ -707,8 +690,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 21,
-        'macro' => ''
+        'line_nr' => 21
       }
     },
     {
@@ -740,8 +722,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 27,
-        'macro' => ''
+        'line_nr' => 27
       }
     },
     {
@@ -779,8 +760,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 28,
-        'macro' => ''
+        'line_nr' => 28
       }
     },
     {
@@ -812,8 +792,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 30,
-        'macro' => ''
+        'line_nr' => 30
       }
     },
     {
@@ -897,8 +876,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               },
               'type' => 'menu_entry'
             },
@@ -945,8 +923,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               },
               'type' => 'menu_entry'
             },
@@ -978,15 +955,13 @@ $result_trees{'detailmenu_on_subnodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 33,
-            'macro' => ''
+            'line_nr' => 33
           }
         },
         {
@@ -1005,8 +980,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 31,
-        'macro' => ''
+        'line_nr' => 31
       }
     },
     {
@@ -1038,8 +1012,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 38,
-        'macro' => ''
+        'line_nr' => 38
       }
     },
     {
@@ -1077,8 +1050,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 39,
-        'macro' => ''
+        'line_nr' => 39
       }
     },
     {
@@ -1110,8 +1082,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 41,
-        'macro' => ''
+        'line_nr' => 41
       }
     },
     {
@@ -1140,8 +1111,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 42,
-        'macro' => ''
+        'line_nr' => 42
       }
     }
   ],
diff --git a/tp/t/results/menu/detailmenu_unknown_node.pl 
b/tp/t/results/menu/detailmenu_unknown_node.pl
index 053f354d09..f73210a09f 100644
--- a/tp/t/results/menu/detailmenu_unknown_node.pl
+++ b/tp/t/results/menu/detailmenu_unknown_node.pl
@@ -105,8 +105,7 @@ $result_trees{'detailmenu_unknown_node'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   },
                   'type' => 'menu_entry'
                 },
@@ -138,15 +137,13 @@ $result_trees{'detailmenu_unknown_node'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -177,15 +174,13 @@ $result_trees{'detailmenu_unknown_node'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         }
       ],
@@ -200,8 +195,7 @@ $result_trees{'detailmenu_unknown_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
@@ -249,7 +243,6 @@ $result_errors{'detailmenu_unknown_node'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@detailmenu reference to nonexistent node `unknown\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/menu/direntry_dircategory_after_first_node.pl 
b/tp/t/results/menu/direntry_dircategory_after_first_node.pl
index 290581666d..e0b752c622 100644
--- a/tp/t/results/menu/direntry_dircategory_after_first_node.pl
+++ b/tp/t/results/menu/direntry_dircategory_after_first_node.pl
@@ -39,8 +39,7 @@ $result_trees{'direntry_dircategory_after_first_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -92,8 +91,7 @@ $result_trees{'direntry_dircategory_after_first_node'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -170,8 +168,7 @@ $result_trees{'direntry_dircategory_after_first_node'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -203,15 +200,13 @@ $result_trees{'direntry_dircategory_after_first_node'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
@@ -223,8 +218,7 @@ $result_trees{'direntry_dircategory_after_first_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
@@ -297,7 +291,6 @@ $result_errors{'direntry_dircategory_after_first_node'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '@dircategory after first node',
     'type' => 'warning'
   },
@@ -306,7 +299,6 @@ $result_errors{'direntry_dircategory_after_first_node'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@direntry after first node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/menu/empty_leading_menu_comment.pl 
b/tp/t/results/menu/empty_leading_menu_comment.pl
index 61c7e36a9e..caa8580045 100644
--- a/tp/t/results/menu/empty_leading_menu_comment.pl
+++ b/tp/t/results/menu/empty_leading_menu_comment.pl
@@ -120,8 +120,7 @@ $result_trees{'empty_leading_menu_comment'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -153,15 +152,13 @@ $result_trees{'empty_leading_menu_comment'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         }
       ],
@@ -176,8 +173,7 @@ $result_trees{'empty_leading_menu_comment'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
diff --git a/tp/t/results/menu/empty_menu_description.pl 
b/tp/t/results/menu/empty_menu_description.pl
index 7ed69021b8..51476edf82 100644
--- a/tp/t/results/menu/empty_menu_description.pl
+++ b/tp/t/results/menu/empty_menu_description.pl
@@ -108,8 +108,7 @@ $result_trees{'empty_menu_description'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -156,15 +155,13 @@ $result_trees{'empty_menu_description'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         }
       ],
@@ -179,8 +176,7 @@ $result_trees{'empty_menu_description'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
diff --git a/tp/t/results/menu/empty_menu_entry_name.pl 
b/tp/t/results/menu/empty_menu_entry_name.pl
index 541b29296a..2748a46631 100644
--- a/tp/t/results/menu/empty_menu_entry_name.pl
+++ b/tp/t/results/menu/empty_menu_entry_name.pl
@@ -103,8 +103,7 @@ $result_trees{'empty_menu_entry_name'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -158,8 +157,7 @@ $result_trees{'empty_menu_entry_name'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -191,15 +189,13 @@ $result_trees{'empty_menu_entry_name'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -219,8 +215,7 @@ $result_trees{'empty_menu_entry_name'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -252,8 +247,7 @@ $result_trees{'empty_menu_entry_name'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     }
   ],
@@ -330,7 +324,6 @@ $result_errors{'empty_menu_entry_name'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'empty menu entry name in `* : (vvv). \'',
     'type' => 'warning'
   },
@@ -339,7 +332,6 @@ $result_errors{'empty_menu_entry_name'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'empty menu entry name in `* :aaa,\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/menu/entry_after_detailmenu.pl 
b/tp/t/results/menu/entry_after_detailmenu.pl
index c95955a214..e45e420587 100644
--- a/tp/t/results/menu/entry_after_detailmenu.pl
+++ b/tp/t/results/menu/entry_after_detailmenu.pl
@@ -105,8 +105,7 @@ $result_trees{'entry_after_detailmenu'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   },
                   'type' => 'menu_entry'
                 },
@@ -138,15 +137,13 @@ $result_trees{'entry_after_detailmenu'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -216,8 +213,7 @@ $result_trees{'entry_after_detailmenu'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'menu_entry'
             },
@@ -293,8 +289,7 @@ $result_trees{'entry_after_detailmenu'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 13,
-                    'macro' => ''
+                    'line_nr' => 13
                   },
                   'type' => 'menu_entry'
                 },
@@ -326,15 +321,13 @@ $result_trees{'entry_after_detailmenu'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 14,
-                    'macro' => ''
+                    'line_nr' => 14
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -380,8 +373,7 @@ $result_trees{'entry_after_detailmenu'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               },
               'type' => 'menu_entry'
             },
@@ -413,15 +405,13 @@ $result_trees{'entry_after_detailmenu'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -441,8 +431,7 @@ $result_trees{'entry_after_detailmenu'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -474,8 +463,7 @@ $result_trees{'entry_after_detailmenu'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -507,8 +495,7 @@ $result_trees{'entry_after_detailmenu'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 19,
-        'macro' => ''
+        'line_nr' => 19
       }
     }
   ],
diff --git a/tp/t/results/menu/example_in_menu_comment.pl 
b/tp/t/results/menu/example_in_menu_comment.pl
index d87510856a..496a8284c0 100644
--- a/tp/t/results/menu/example_in_menu_comment.pl
+++ b/tp/t/results/menu/example_in_menu_comment.pl
@@ -66,8 +66,7 @@ $result_trees{'example_in_menu_comment'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               },
               'type' => 'menu_entry'
             },
@@ -143,15 +142,13 @@ $result_trees{'example_in_menu_comment'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     }
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 },
                 {
@@ -204,15 +201,13 @@ $result_trees{'example_in_menu_comment'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/menu/example_in_menu_description.pl 
b/tp/t/results/menu/example_in_menu_description.pl
index 192e930487..7f9177300e 100644
--- a/tp/t/results/menu/example_in_menu_description.pl
+++ b/tp/t/results/menu/example_in_menu_description.pl
@@ -39,8 +39,7 @@ $result_trees{'example_in_menu_description'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -183,15 +182,13 @@ $result_trees{'example_in_menu_description'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 10,
-                            'macro' => ''
+                            'line_nr' => 10
                           }
                         }
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     }
                   ],
@@ -200,8 +197,7 @@ $result_trees{'example_in_menu_description'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -248,15 +244,13 @@ $result_trees{'example_in_menu_description'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         }
       ],
@@ -268,8 +262,7 @@ $result_trees{'example_in_menu_description'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
diff --git a/tp/t/results/menu/formats_in_menu.pl 
b/tp/t/results/menu/formats_in_menu.pl
index 144a9724fa..64dc9adcee 100644
--- a/tp/t/results/menu/formats_in_menu.pl
+++ b/tp/t/results/menu/formats_in_menu.pl
@@ -98,8 +98,7 @@ $result_trees{'formats_in_menu'} = {
                               'cmdname' => 'asis',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 5,
-                                'macro' => ''
+                                'line_nr' => 5
                               },
                               'type' => 'command_as_argument'
                             }
@@ -144,8 +143,7 @@ $result_trees{'formats_in_menu'} = {
                                   },
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 6,
-                                    'macro' => ''
+                                    'line_nr' => 6
                                   }
                                 }
                               ],
@@ -196,8 +194,7 @@ $result_trees{'formats_in_menu'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 8,
-                            'macro' => ''
+                            'line_nr' => 8
                           }
                         }
                       ],
@@ -211,8 +208,7 @@ $result_trees{'formats_in_menu'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
@@ -221,8 +217,7 @@ $result_trees{'formats_in_menu'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -335,15 +330,13 @@ $result_trees{'formats_in_menu'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 14,
-                            'macro' => ''
+                            'line_nr' => 14
                           }
                         }
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     }
                   ],
@@ -352,8 +345,7 @@ $result_trees{'formats_in_menu'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'menu_entry'
             },
@@ -452,15 +444,13 @@ $result_trees{'formats_in_menu'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 19,
-                                'macro' => ''
+                                'line_nr' => 19
                               }
                             }
                           ],
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 16,
-                            'macro' => ''
+                            'line_nr' => 16
                           }
                         },
                         {
@@ -476,8 +466,7 @@ $result_trees{'formats_in_menu'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               },
               'type' => 'menu_entry'
             },
@@ -534,8 +523,7 @@ $result_trees{'formats_in_menu'} = {
                           'cmdname' => 'acronym',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 21,
-                            'macro' => ''
+                            'line_nr' => 21
                           }
                         },
                         {
@@ -551,8 +539,7 @@ $result_trees{'formats_in_menu'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               },
               'type' => 'menu_entry'
             },
@@ -623,15 +610,13 @@ $result_trees{'formats_in_menu'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 27,
-                        'macro' => ''
+                        'line_nr' => 27
                       }
                     }
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 24,
-                    'macro' => ''
+                    'line_nr' => 24
                   }
                 },
                 {
@@ -675,15 +660,13 @@ $result_trees{'formats_in_menu'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         }
       ],
@@ -698,8 +681,7 @@ $result_trees{'formats_in_menu'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
diff --git a/tp/t/results/menu/inlineraw_in_menu_description.pl 
b/tp/t/results/menu/inlineraw_in_menu_description.pl
index 0f413f09b8..8c9dbb227f 100644
--- a/tp/t/results/menu/inlineraw_in_menu_description.pl
+++ b/tp/t/results/menu/inlineraw_in_menu_description.pl
@@ -39,8 +39,7 @@ $result_trees{'inlineraw_in_menu_description'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -160,8 +159,7 @@ $result_trees{'inlineraw_in_menu_description'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 6,
-                            'macro' => ''
+                            'line_nr' => 6
                           }
                         },
                         {
@@ -177,8 +175,7 @@ $result_trees{'inlineraw_in_menu_description'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -225,15 +222,13 @@ $result_trees{'inlineraw_in_menu_description'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         }
       ],
@@ -245,8 +240,7 @@ $result_trees{'inlineraw_in_menu_description'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
diff --git a/tp/t/results/menu/invalid_info_menu_entry.pl 
b/tp/t/results/menu/invalid_info_menu_entry.pl
index f9b27e841a..0b933f93b8 100644
--- a/tp/t/results/menu/invalid_info_menu_entry.pl
+++ b/tp/t/results/menu/invalid_info_menu_entry.pl
@@ -79,8 +79,7 @@ $result_trees{'invalid_info_menu_entry'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     }
                   ],
@@ -120,8 +119,7 @@ $result_trees{'invalid_info_menu_entry'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -147,8 +145,7 @@ $result_trees{'invalid_info_menu_entry'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
@@ -209,8 +206,7 @@ $result_trees{'invalid_info_menu_entry'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -257,8 +253,7 @@ $result_trees{'invalid_info_menu_entry'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     }
                   ],
@@ -298,8 +293,7 @@ $result_trees{'invalid_info_menu_entry'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -346,8 +340,7 @@ $result_trees{'invalid_info_menu_entry'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     }
                   ],
@@ -387,8 +380,7 @@ $result_trees{'invalid_info_menu_entry'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -435,8 +427,7 @@ $result_trees{'invalid_info_menu_entry'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     }
                   ],
@@ -476,8 +467,7 @@ $result_trees{'invalid_info_menu_entry'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               },
               'type' => 'menu_entry'
             },
@@ -509,15 +499,13 @@ $result_trees{'invalid_info_menu_entry'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         }
       ],
@@ -532,8 +520,7 @@ $result_trees{'invalid_info_menu_entry'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
@@ -612,7 +599,6 @@ 
$result_converted_errors{'plaintext'}->{'invalid_info_menu_entry'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'menu entry node name should not contain `:\'',
     'type' => 'warning'
   },
@@ -621,7 +607,6 @@ 
$result_converted_errors{'plaintext'}->{'invalid_info_menu_entry'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'menu entry name should not contain `:\'',
     'type' => 'warning'
   },
@@ -630,7 +615,6 @@ 
$result_converted_errors{'plaintext'}->{'invalid_info_menu_entry'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'menu entry node name should not contain `. \'',
     'type' => 'warning'
   },
@@ -639,7 +623,6 @@ 
$result_converted_errors{'plaintext'}->{'invalid_info_menu_entry'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'menu entry node name should not contain `,\'',
     'type' => 'warning'
   },
@@ -648,7 +631,6 @@ 
$result_converted_errors{'plaintext'}->{'invalid_info_menu_entry'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => 'menu entry node name should not contain `       \'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/menu/leading_space_before_menu_star.pl 
b/tp/t/results/menu/leading_space_before_menu_star.pl
index b89b0035c1..48aced22a7 100644
--- a/tp/t/results/menu/leading_space_before_menu_star.pl
+++ b/tp/t/results/menu/leading_space_before_menu_star.pl
@@ -90,15 +90,13 @@ $result_trees{'leading_space_before_menu_star'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         }
       ],
@@ -113,8 +111,7 @@ $result_trees{'leading_space_before_menu_star'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
diff --git a/tp/t/results/menu/menu_entry_name.pl 
b/tp/t/results/menu/menu_entry_name.pl
index 94365f2d6a..04941f1a66 100644
--- a/tp/t/results/menu/menu_entry_name.pl
+++ b/tp/t/results/menu/menu_entry_name.pl
@@ -80,8 +80,7 @@ $result_trees{'menu_entry_name'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               },
               'type' => 'menu_entry'
             },
@@ -154,8 +153,7 @@ $result_trees{'menu_entry_name'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               },
               'type' => 'menu_entry'
             },
@@ -228,8 +226,7 @@ $result_trees{'menu_entry_name'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -302,8 +299,7 @@ $result_trees{'menu_entry_name'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -376,8 +372,7 @@ $result_trees{'menu_entry_name'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -453,8 +448,7 @@ $result_trees{'menu_entry_name'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -527,8 +521,7 @@ $result_trees{'menu_entry_name'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               },
               'type' => 'menu_entry'
             },
@@ -601,8 +594,7 @@ $result_trees{'menu_entry_name'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -675,8 +667,7 @@ $result_trees{'menu_entry_name'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'menu_entry'
             },
@@ -749,8 +740,7 @@ $result_trees{'menu_entry_name'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -782,15 +772,13 @@ $result_trees{'menu_entry_name'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/menu/menu_entry_name_comment.pl 
b/tp/t/results/menu/menu_entry_name_comment.pl
index e589a491f2..bd20aeb879 100644
--- a/tp/t/results/menu/menu_entry_name_comment.pl
+++ b/tp/t/results/menu/menu_entry_name_comment.pl
@@ -94,8 +94,7 @@ $result_trees{'menu_entry_name_comment'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               },
               'type' => 'menu_entry'
             },
@@ -175,8 +174,7 @@ $result_trees{'menu_entry_name_comment'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               },
               'type' => 'menu_entry'
             },
@@ -255,8 +253,7 @@ $result_trees{'menu_entry_name_comment'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -335,8 +332,7 @@ $result_trees{'menu_entry_name_comment'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -418,8 +414,7 @@ $result_trees{'menu_entry_name_comment'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -451,15 +446,13 @@ $result_trees{'menu_entry_name_comment'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/menu/menu_entry_no_entry.pl 
b/tp/t/results/menu/menu_entry_no_entry.pl
index c22f90d275..6bc9df5aa9 100644
--- a/tp/t/results/menu/menu_entry_no_entry.pl
+++ b/tp/t/results/menu/menu_entry_no_entry.pl
@@ -78,8 +78,7 @@ $result_trees{'menu_entry_no_entry'} = {
                       'cmdname' => 'b',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     },
                     {
@@ -103,8 +102,7 @@ $result_trees{'menu_entry_no_entry'} = {
                       'cmdname' => 'b',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     },
                     {
@@ -154,15 +152,13 @@ $result_trees{'menu_entry_no_entry'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/menu/menu_entry_no_entry_location.pl 
b/tp/t/results/menu/menu_entry_no_entry_location.pl
index 8098cfd770..f820075b2b 100644
--- a/tp/t/results/menu/menu_entry_no_entry_location.pl
+++ b/tp/t/results/menu/menu_entry_no_entry_location.pl
@@ -75,8 +75,7 @@ $result_trees{'menu_entry_no_entry_location'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               },
               'type' => 'menu_entry'
             },
@@ -140,8 +139,7 @@ $result_trees{'menu_entry_no_entry_location'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -193,8 +191,7 @@ $result_trees{'menu_entry_no_entry_location'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               },
               'type' => 'menu_entry'
             },
@@ -226,15 +223,13 @@ $result_trees{'menu_entry_no_entry_location'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/menu/menu_entry_node.pl 
b/tp/t/results/menu/menu_entry_node.pl
index f91092ae7a..78f6fbb0d8 100644
--- a/tp/t/results/menu/menu_entry_node.pl
+++ b/tp/t/results/menu/menu_entry_node.pl
@@ -80,8 +80,7 @@ $result_trees{'menu_entry_node'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               },
               'type' => 'menu_entry'
             },
@@ -142,8 +141,7 @@ $result_trees{'menu_entry_node'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               },
               'type' => 'menu_entry'
             },
@@ -204,8 +202,7 @@ $result_trees{'menu_entry_node'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -274,8 +271,7 @@ $result_trees{'menu_entry_node'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -307,15 +303,13 @@ $result_trees{'menu_entry_node'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/menu/menu_entry_node_comments.pl 
b/tp/t/results/menu/menu_entry_node_comments.pl
index 8b80b46b1b..8fc0290622 100644
--- a/tp/t/results/menu/menu_entry_node_comments.pl
+++ b/tp/t/results/menu/menu_entry_node_comments.pl
@@ -86,8 +86,7 @@ $result_trees{'menu_entry_node_comments'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               },
               'type' => 'menu_entry'
             },
@@ -154,8 +153,7 @@ $result_trees{'menu_entry_node_comments'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               },
               'type' => 'menu_entry'
             },
@@ -225,8 +223,7 @@ $result_trees{'menu_entry_node_comments'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -301,8 +298,7 @@ $result_trees{'menu_entry_node_comments'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -334,15 +330,13 @@ $result_trees{'menu_entry_node_comments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/menu/menu_in_deffn.pl 
b/tp/t/results/menu/menu_in_deffn.pl
index 40b047b280..d9e1418685 100644
--- a/tp/t/results/menu/menu_in_deffn.pl
+++ b/tp/t/results/menu/menu_in_deffn.pl
@@ -95,8 +95,7 @@ $result_trees{'menu_in_deffn'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               },
               'type' => 'def_line'
             },
@@ -164,8 +163,7 @@ $result_trees{'menu_in_deffn'} = {
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       },
                       'type' => 'menu_entry'
                     },
@@ -197,15 +195,13 @@ $result_trees{'menu_in_deffn'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     }
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 }
               ],
@@ -239,8 +235,7 @@ $result_trees{'menu_in_deffn'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -251,8 +246,7 @@ $result_trees{'menu_in_deffn'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         }
       ],
@@ -267,8 +261,7 @@ $result_trees{'menu_in_deffn'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
@@ -316,7 +309,6 @@ $result_errors{'menu_in_deffn'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '@menu in invalid context',
     'type' => 'warning'
   }
diff --git a/tp/t/results/menu/menu_in_example.pl 
b/tp/t/results/menu/menu_in_example.pl
index 3f9b899029..7a521961c3 100644
--- a/tp/t/results/menu/menu_in_example.pl
+++ b/tp/t/results/menu/menu_in_example.pl
@@ -155,15 +155,13 @@ $result_trees{'menu_in_example'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 8,
-                                'macro' => ''
+                                'line_nr' => 8
                               }
                             }
                           ],
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 6,
-                            'macro' => ''
+                            'line_nr' => 6
                           }
                         }
                       ],
@@ -172,8 +170,7 @@ $result_trees{'menu_in_example'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   },
                   'type' => 'menu_entry'
                 },
@@ -240,15 +237,13 @@ $result_trees{'menu_in_example'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 12,
-                            'macro' => ''
+                            'line_nr' => 12
                           }
                         }
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     },
                     {
@@ -324,8 +319,7 @@ $result_trees{'menu_in_example'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 14,
-                    'macro' => ''
+                    'line_nr' => 14
                   },
                   'type' => 'menu_entry'
                 },
@@ -401,8 +395,7 @@ $result_trees{'menu_in_example'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 15,
-                    'macro' => ''
+                    'line_nr' => 15
                   },
                   'type' => 'menu_entry'
                 },
@@ -434,15 +427,13 @@ $result_trees{'menu_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 16,
-                    'macro' => ''
+                    'line_nr' => 16
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -473,15 +464,13 @@ $result_trees{'menu_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         }
       ],
@@ -496,8 +485,7 @@ $result_trees{'menu_in_example'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
@@ -562,7 +550,6 @@ $result_errors{'menu_in_example'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '@menu in invalid context',
     'type' => 'warning'
   }
diff --git a/tp/t/results/menu/menu_no_closed_after_empty_line.pl 
b/tp/t/results/menu/menu_no_closed_after_empty_line.pl
index 5eaf33a8c6..e8a023c3cb 100644
--- a/tp/t/results/menu/menu_no_closed_after_empty_line.pl
+++ b/tp/t/results/menu/menu_no_closed_after_empty_line.pl
@@ -71,8 +71,7 @@ $result_trees{'menu_no_closed_after_empty_line'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               },
               'type' => 'menu_entry'
             },
@@ -99,8 +98,7 @@ $result_trees{'menu_no_closed_after_empty_line'} = {
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -129,7 +127,6 @@ $result_errors{'menu_no_closed_after_empty_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'no matching `@end menu\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/menu/menu_no_closed_entry_beginning.pl 
b/tp/t/results/menu/menu_no_closed_entry_beginning.pl
index 0d6d734354..c394433b16 100644
--- a/tp/t/results/menu/menu_no_closed_entry_beginning.pl
+++ b/tp/t/results/menu/menu_no_closed_entry_beginning.pl
@@ -39,8 +39,7 @@ $result_trees{'menu_no_closed_entry_beginning'} = {
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -62,7 +61,6 @@ $result_errors{'menu_no_closed_entry_beginning'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'no matching `@end menu\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/menu/menu_no_closed_in_description.pl 
b/tp/t/results/menu/menu_no_closed_in_description.pl
index c63afad0f0..4ae5d8c0d4 100644
--- a/tp/t/results/menu/menu_no_closed_in_description.pl
+++ b/tp/t/results/menu/menu_no_closed_in_description.pl
@@ -70,16 +70,14 @@ $result_trees{'menu_no_closed_in_description'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               },
               'type' => 'menu_entry'
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -103,7 +101,6 @@ $result_errors{'menu_no_closed_in_description'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'no matching `@end menu\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/menu/menu_no_closed_in_entry.pl 
b/tp/t/results/menu/menu_no_closed_in_entry.pl
index a711ebec5f..ff2d6d8aac 100644
--- a/tp/t/results/menu/menu_no_closed_in_entry.pl
+++ b/tp/t/results/menu/menu_no_closed_in_entry.pl
@@ -47,8 +47,7 @@ $result_trees{'menu_no_closed_in_entry'} = {
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -71,7 +70,6 @@ $result_errors{'menu_no_closed_in_entry'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'no matching `@end menu\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/menu/menu_no_closed_star.pl 
b/tp/t/results/menu/menu_no_closed_star.pl
index 0926c8450e..128f5a4964 100644
--- a/tp/t/results/menu/menu_no_closed_star.pl
+++ b/tp/t/results/menu/menu_no_closed_star.pl
@@ -39,8 +39,7 @@ $result_trees{'menu_no_closed_star'} = {
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -62,7 +61,6 @@ $result_errors{'menu_no_closed_star'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'no matching `@end menu\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/menu/menu_node_unterminated.pl 
b/tp/t/results/menu/menu_node_unterminated.pl
index 09a3147956..09b370e536 100644
--- a/tp/t/results/menu/menu_node_unterminated.pl
+++ b/tp/t/results/menu/menu_node_unterminated.pl
@@ -91,8 +91,7 @@ $result_trees{'menu_node_unterminated'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -124,15 +123,13 @@ $result_trees{'menu_node_unterminated'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         }
       ],
@@ -147,8 +144,7 @@ $result_trees{'menu_node_unterminated'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
@@ -196,7 +192,6 @@ $result_errors{'menu_node_unterminated'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '@menu reference to nonexistent node `Examples of Login 
Verification Functions
 \'',
     'type' => 'error'
diff --git a/tp/t/results/menu/menu_pointing_to_anchor.pl 
b/tp/t/results/menu/menu_pointing_to_anchor.pl
index 82448426fd..b9bfbfa931 100644
--- a/tp/t/results/menu/menu_pointing_to_anchor.pl
+++ b/tp/t/results/menu/menu_pointing_to_anchor.pl
@@ -39,8 +39,7 @@ $result_trees{'menu_pointing_to_anchor'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -99,8 +98,7 @@ $result_trees{'menu_pointing_to_anchor'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -170,8 +168,7 @@ $result_trees{'menu_pointing_to_anchor'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -203,15 +200,13 @@ $result_trees{'menu_pointing_to_anchor'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         }
       ],
@@ -223,8 +218,7 @@ $result_trees{'menu_pointing_to_anchor'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
diff --git a/tp/t/results/menu/menu_title_before_entries.pl 
b/tp/t/results/menu/menu_title_before_entries.pl
index 381d170a02..da81d0b60c 100644
--- a/tp/t/results/menu/menu_title_before_entries.pl
+++ b/tp/t/results/menu/menu_title_before_entries.pl
@@ -105,8 +105,7 @@ $result_trees{'menu_title_before_entries'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -138,15 +137,13 @@ $result_trees{'menu_title_before_entries'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -166,8 +163,7 @@ $result_trees{'menu_title_before_entries'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -199,8 +195,7 @@ $result_trees{'menu_title_before_entries'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     }
   ],
diff --git a/tp/t/results/menu/missing_detailmenu_on_subnodes.pl 
b/tp/t/results/menu/missing_detailmenu_on_subnodes.pl
index 98eeb63df7..9101a236b8 100644
--- a/tp/t/results/menu/missing_detailmenu_on_subnodes.pl
+++ b/tp/t/results/menu/missing_detailmenu_on_subnodes.pl
@@ -39,8 +39,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -124,8 +123,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -172,8 +170,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -235,8 +232,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               },
               'type' => 'menu_entry'
             },
@@ -307,8 +303,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               },
               'type' => 'menu_entry'
             },
@@ -355,8 +350,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               },
               'type' => 'menu_entry'
             },
@@ -388,15 +382,13 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -413,8 +405,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -446,8 +437,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 16,
-        'macro' => ''
+        'line_nr' => 16
       }
     },
     {
@@ -531,8 +521,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               },
               'type' => 'menu_entry'
             },
@@ -564,15 +553,13 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         },
         {
@@ -591,8 +578,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -624,8 +610,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 23,
-        'macro' => ''
+        'line_nr' => 23
       }
     },
     {
@@ -663,8 +648,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     {
@@ -696,8 +680,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 26,
-        'macro' => ''
+        'line_nr' => 26
       }
     },
     {
@@ -781,8 +764,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               },
               'type' => 'menu_entry'
             },
@@ -829,8 +811,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               },
               'type' => 'menu_entry'
             },
@@ -862,15 +843,13 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 29,
-            'macro' => ''
+            'line_nr' => 29
           }
         },
         {
@@ -889,8 +868,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 27,
-        'macro' => ''
+        'line_nr' => 27
       }
     },
     {
@@ -922,8 +900,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 34,
-        'macro' => ''
+        'line_nr' => 34
       }
     },
     {
@@ -961,8 +938,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 35,
-        'macro' => ''
+        'line_nr' => 35
       }
     },
     {
@@ -994,8 +970,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 37,
-        'macro' => ''
+        'line_nr' => 37
       }
     },
     {
@@ -1024,8 +999,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 38,
-        'macro' => ''
+        'line_nr' => 38
       }
     }
   ],
diff --git a/tp/t/results/menu/multiple_menus.pl 
b/tp/t/results/menu/multiple_menus.pl
index 1e1aa5e435..890142504d 100644
--- a/tp/t/results/menu/multiple_menus.pl
+++ b/tp/t/results/menu/multiple_menus.pl
@@ -105,8 +105,7 @@ $result_trees{'multiple_menus'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -138,15 +137,13 @@ $result_trees{'multiple_menus'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -225,8 +222,7 @@ $result_trees{'multiple_menus'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               },
               'type' => 'menu_entry'
             },
@@ -258,15 +254,13 @@ $result_trees{'multiple_menus'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         }
       ],
@@ -281,8 +275,7 @@ $result_trees{'multiple_menus'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
@@ -347,7 +340,6 @@ $result_errors{'multiple_menus'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'multiple @menu',
     'type' => 'warning'
   }
diff --git a/tp/t/results/menu/no_colon_in_menu.pl 
b/tp/t/results/menu/no_colon_in_menu.pl
index 4fc1a90d90..f4e3276bd0 100644
--- a/tp/t/results/menu/no_colon_in_menu.pl
+++ b/tp/t/results/menu/no_colon_in_menu.pl
@@ -90,15 +90,13 @@ $result_trees{'no_colon_in_menu'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         }
       ],
@@ -113,8 +111,7 @@ $result_trees{'no_colon_in_menu'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
diff --git a/tp/t/results/menu/nodedescription_descriptions.pl 
b/tp/t/results/menu/nodedescription_descriptions.pl
index 4ea797a5e4..e08fa5a628 100644
--- a/tp/t/results/menu/nodedescription_descriptions.pl
+++ b/tp/t/results/menu/nodedescription_descriptions.pl
@@ -39,8 +39,7 @@ $result_trees{'nodedescription_descriptions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -124,8 +123,7 @@ $result_trees{'nodedescription_descriptions'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -172,8 +170,7 @@ $result_trees{'nodedescription_descriptions'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -232,8 +229,7 @@ $result_trees{'nodedescription_descriptions'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -307,8 +303,7 @@ $result_trees{'nodedescription_descriptions'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -355,8 +350,7 @@ $result_trees{'nodedescription_descriptions'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'menu_entry'
             },
@@ -403,8 +397,7 @@ $result_trees{'nodedescription_descriptions'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -451,8 +444,7 @@ $result_trees{'nodedescription_descriptions'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               },
               'type' => 'menu_entry'
             },
@@ -484,15 +476,13 @@ $result_trees{'nodedescription_descriptions'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -509,8 +499,7 @@ $result_trees{'nodedescription_descriptions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -554,8 +543,7 @@ $result_trees{'nodedescription_descriptions'} = {
                   'cmdname' => 'emph',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 18,
-                    'macro' => ''
+                    'line_nr' => 18
                   }
                 },
                 {
@@ -572,8 +560,7 @@ $result_trees{'nodedescription_descriptions'} = {
                   'cmdname' => 'w',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 18,
-                    'macro' => ''
+                    'line_nr' => 18
                   }
                 },
                 {
@@ -597,8 +584,7 @@ $result_trees{'nodedescription_descriptions'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 18,
-                    'macro' => ''
+                    'line_nr' => 18
                   }
                 },
                 {
@@ -623,8 +609,7 @@ $result_trees{'nodedescription_descriptions'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 18,
-                    'macro' => ''
+                    'line_nr' => 18
                   }
                 },
                 {
@@ -651,8 +636,7 @@ $result_trees{'nodedescription_descriptions'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           }
         },
         'normalized' => 'toto'
@@ -664,8 +648,7 @@ $result_trees{'nodedescription_descriptions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -709,8 +692,7 @@ $result_trees{'nodedescription_descriptions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 16,
-        'macro' => ''
+        'line_nr' => 16
       }
     },
     {
@@ -761,8 +743,7 @@ $result_trees{'nodedescription_descriptions'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           }
         },
         'normalized' => 'titi'
@@ -774,8 +755,7 @@ $result_trees{'nodedescription_descriptions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 20,
-        'macro' => ''
+        'line_nr' => 20
       }
     },
     {
@@ -819,8 +799,7 @@ $result_trees{'nodedescription_descriptions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 21,
-        'macro' => ''
+        'line_nr' => 21
       }
     },
     {
@@ -871,8 +850,7 @@ $result_trees{'nodedescription_descriptions'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 28,
-            'macro' => ''
+            'line_nr' => 28
           }
         },
         'normalized' => 'other'
@@ -884,8 +862,7 @@ $result_trees{'nodedescription_descriptions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
@@ -929,8 +906,7 @@ $result_trees{'nodedescription_descriptions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 26,
-        'macro' => ''
+        'line_nr' => 26
       }
     },
     {
@@ -981,8 +957,7 @@ $result_trees{'nodedescription_descriptions'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 33,
-            'macro' => ''
+            'line_nr' => 33
           }
         },
         'normalized' => 'last'
@@ -994,8 +969,7 @@ $result_trees{'nodedescription_descriptions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 30,
-        'macro' => ''
+        'line_nr' => 30
       }
     },
     {
@@ -1039,8 +1013,7 @@ $result_trees{'nodedescription_descriptions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 31,
-        'macro' => ''
+        'line_nr' => 31
       }
     },
     {
@@ -1091,8 +1064,7 @@ $result_trees{'nodedescription_descriptions'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 38,
-            'macro' => ''
+            'line_nr' => 38
           }
         },
         'normalized' => 
'a-somewhat-long-node-without-description-nor-following-space'
@@ -1104,8 +1076,7 @@ $result_trees{'nodedescription_descriptions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 35,
-        'macro' => ''
+        'line_nr' => 35
       }
     },
     {
@@ -1149,8 +1120,7 @@ $result_trees{'nodedescription_descriptions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 36,
-        'macro' => ''
+        'line_nr' => 36
       }
     },
     {
@@ -1201,8 +1171,7 @@ $result_trees{'nodedescription_descriptions'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 43,
-            'macro' => ''
+            'line_nr' => 43
           }
         },
         'normalized' => 
'a-very-long-node-without-description-with-very-little-space-left-for'
@@ -1214,8 +1183,7 @@ $result_trees{'nodedescription_descriptions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 40,
-        'macro' => ''
+        'line_nr' => 40
       }
     },
     {
@@ -1259,8 +1227,7 @@ $result_trees{'nodedescription_descriptions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 41,
-        'macro' => ''
+        'line_nr' => 41
       }
     },
     {
@@ -1311,8 +1278,7 @@ $result_trees{'nodedescription_descriptions'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 48,
-            'macro' => ''
+            'line_nr' => 48
           }
         },
         'normalized' => 
'very-very-long-node-extending-past-the-max-columns-and-without-description'
@@ -1324,8 +1290,7 @@ $result_trees{'nodedescription_descriptions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 45,
-        'macro' => ''
+        'line_nr' => 45
       }
     },
     {
@@ -1364,8 +1329,7 @@ $result_trees{'nodedescription_descriptions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 46,
-        'macro' => ''
+        'line_nr' => 46
       }
     }
   ],
diff --git a/tp/t/results/menu/nodedescriptionblock_descriptions.pl 
b/tp/t/results/menu/nodedescriptionblock_descriptions.pl
index 037d2327ab..a446775494 100644
--- a/tp/t/results/menu/nodedescriptionblock_descriptions.pl
+++ b/tp/t/results/menu/nodedescriptionblock_descriptions.pl
@@ -39,8 +39,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -124,8 +123,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -172,8 +170,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -232,8 +229,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -295,8 +291,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -343,8 +338,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'menu_entry'
             },
@@ -376,15 +370,13 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -401,8 +393,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -446,8 +437,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
                   'cmdname' => 'emph',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 16,
-                    'macro' => ''
+                    'line_nr' => 16
                   }
                 },
                 {
@@ -464,8 +454,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
                   'cmdname' => 'w',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 16,
-                    'macro' => ''
+                    'line_nr' => 16
                   }
                 },
                 {
@@ -489,8 +478,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 16,
-                    'macro' => ''
+                    'line_nr' => 16
                   }
                 },
                 {
@@ -515,8 +503,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 16,
-                    'macro' => ''
+                    'line_nr' => 16
                   }
                 },
                 {
@@ -543,8 +530,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           }
         },
         'node_long_description' => {
@@ -598,8 +584,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             }
           ],
@@ -608,8 +593,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           }
         },
         'normalized' => 'toto'
@@ -621,8 +605,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -672,8 +655,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -747,8 +729,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             }
           ],
@@ -757,8 +738,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           }
         },
         'node_long_description' => {},
@@ -771,8 +751,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 22,
-        'macro' => ''
+        'line_nr' => 22
       }
     },
     {
@@ -816,8 +795,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 23,
-        'macro' => ''
+        'line_nr' => 23
       }
     },
     {
@@ -933,15 +911,13 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 39,
-                    'macro' => ''
+                    'line_nr' => 39
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 37,
-                'macro' => ''
+                'line_nr' => 37
               }
             },
             {
@@ -972,8 +948,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               }
             }
           ],
@@ -982,8 +957,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 32,
-            'macro' => ''
+            'line_nr' => 32
           }
         },
         'node_long_description' => {},
@@ -996,8 +970,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 29,
-        'macro' => ''
+        'line_nr' => 29
       }
     },
     {
@@ -1041,8 +1014,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 30,
-        'macro' => ''
+        'line_nr' => 30
       }
     },
     {
@@ -1093,8 +1065,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 49,
-            'macro' => ''
+            'line_nr' => 49
           }
         },
         'node_long_description' => {
@@ -1148,8 +1119,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               }
             }
           ],
@@ -1158,8 +1128,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 45,
-            'macro' => ''
+            'line_nr' => 45
           }
         },
         'normalized' => 
'a-somewhat-long-node-without-description-nor-following-space'
@@ -1171,8 +1140,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 42,
-        'macro' => ''
+        'line_nr' => 42
       }
     },
     {
@@ -1222,8 +1190,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 43,
-        'macro' => ''
+        'line_nr' => 43
       }
     },
     {
@@ -1297,8 +1264,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             }
           ],
@@ -1307,8 +1273,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 54,
-            'macro' => ''
+            'line_nr' => 54
           }
         },
         'node_long_description' => {},
@@ -1321,8 +1286,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 51,
-        'macro' => ''
+        'line_nr' => 51
       }
     },
     {
@@ -1406,8 +1370,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 60,
-                'macro' => ''
+                'line_nr' => 60
               }
             }
           ],
@@ -1416,8 +1379,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 58,
-            'macro' => ''
+            'line_nr' => 58
           }
         },
         {
@@ -1436,8 +1398,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 52,
-        'macro' => ''
+        'line_nr' => 52
       }
     }
   ],
@@ -1907,7 +1868,6 @@ $result_errors{'nodedescriptionblock_descriptions'} = [
 ',
     'file_name' => '',
     'line_nr' => 58,
-    'macro' => '',
     'text' => 'multiple node @nodedescriptionblock',
     'type' => 'warning'
   }
diff --git a/tp/t/results/menu/reference_to_external_manual.pl 
b/tp/t/results/menu/reference_to_external_manual.pl
index a2acea0d4f..81226505e0 100644
--- a/tp/t/results/menu/reference_to_external_manual.pl
+++ b/tp/t/results/menu/reference_to_external_manual.pl
@@ -103,8 +103,7 @@ $result_trees{'reference_to_external_manual'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -136,15 +135,13 @@ $result_trees{'reference_to_external_manual'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         }
       ],
@@ -159,8 +156,7 @@ $result_trees{'reference_to_external_manual'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
diff --git a/tp/t/results/menu/sc_in_menu.pl b/tp/t/results/menu/sc_in_menu.pl
index b9faeabd5d..586c4d950f 100644
--- a/tp/t/results/menu/sc_in_menu.pl
+++ b/tp/t/results/menu/sc_in_menu.pl
@@ -77,8 +77,7 @@ $result_trees{'sc_in_menu'} = {
                       'cmdname' => 'sc',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
@@ -104,8 +103,7 @@ $result_trees{'sc_in_menu'} = {
                       'cmdname' => 'sc',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
@@ -141,8 +139,7 @@ $result_trees{'sc_in_menu'} = {
                           'cmdname' => 'sc',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 5,
-                            'macro' => ''
+                            'line_nr' => 5
                           }
                         },
                         {
@@ -158,8 +155,7 @@ $result_trees{'sc_in_menu'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -186,8 +182,7 @@ $result_trees{'sc_in_menu'} = {
                       'cmdname' => 'sc',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     },
                     {
@@ -235,8 +230,7 @@ $result_trees{'sc_in_menu'} = {
                           'cmdname' => 'sc',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 10,
-                            'macro' => ''
+                            'line_nr' => 10
                           }
                         },
                         {
@@ -256,8 +250,7 @@ $result_trees{'sc_in_menu'} = {
                           'cmdname' => 'sc',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 10,
-                            'macro' => ''
+                            'line_nr' => 10
                           }
                         },
                         {
@@ -277,8 +270,7 @@ $result_trees{'sc_in_menu'} = {
                           'cmdname' => 'sc',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 10,
-                            'macro' => ''
+                            'line_nr' => 10
                           }
                         },
                         {
@@ -304,8 +296,7 @@ $result_trees{'sc_in_menu'} = {
                           'cmdname' => 'sc',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 12,
-                            'macro' => ''
+                            'line_nr' => 12
                           }
                         },
                         {
@@ -343,15 +334,13 @@ $result_trees{'sc_in_menu'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     }
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 }
               ],
@@ -385,15 +374,13 @@ $result_trees{'sc_in_menu'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -413,8 +400,7 @@ $result_trees{'sc_in_menu'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -435,8 +421,7 @@ $result_trees{'sc_in_menu'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
@@ -506,8 +491,7 @@ $result_trees{'sc_in_menu'} = {
                           'cmdname' => 'sc',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 20,
-                            'macro' => ''
+                            'line_nr' => 20
                           }
                         }
                       ],
@@ -542,8 +526,7 @@ $result_trees{'sc_in_menu'} = {
                           'cmdname' => 'sc',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 20,
-                            'macro' => ''
+                            'line_nr' => 20
                           }
                         }
                       ],
@@ -584,8 +567,7 @@ $result_trees{'sc_in_menu'} = {
                               'cmdname' => 'sc',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 20,
-                                'macro' => ''
+                                'line_nr' => 20
                               }
                             },
                             {
@@ -601,8 +583,7 @@ $result_trees{'sc_in_menu'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 20,
-                    'macro' => ''
+                    'line_nr' => 20
                   },
                   'type' => 'menu_entry'
                 },
@@ -629,8 +610,7 @@ $result_trees{'sc_in_menu'} = {
                           'cmdname' => 'sc',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 22,
-                            'macro' => ''
+                            'line_nr' => 22
                           }
                         },
                         {
@@ -671,15 +651,13 @@ $result_trees{'sc_in_menu'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 23,
-                    'macro' => ''
+                    'line_nr' => 23
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -710,15 +688,13 @@ $result_trees{'sc_in_menu'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           }
         },
         {
@@ -738,8 +714,7 @@ $result_trees{'sc_in_menu'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 16,
-        'macro' => ''
+        'line_nr' => 16
       }
     }
   ],
@@ -839,7 +814,6 @@ $result_errors{'sc_in_menu'} = [
 ',
     'file_name' => '',
     'line_nr' => 19,
-    'macro' => '',
     'text' => '@menu in invalid context',
     'type' => 'warning'
   }
diff --git a/tp/t/results/menu/simple.pl b/tp/t/results/menu/simple.pl
index 8521fecb7e..4dced96f1c 100644
--- a/tp/t/results/menu/simple.pl
+++ b/tp/t/results/menu/simple.pl
@@ -111,8 +111,7 @@ $result_trees{'simple'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -159,8 +158,7 @@ $result_trees{'simple'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -219,8 +217,7 @@ $result_trees{'simple'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               },
               'type' => 'menu_entry'
             },
@@ -275,8 +272,7 @@ $result_trees{'simple'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -347,8 +343,7 @@ $result_trees{'simple'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               },
               'type' => 'menu_entry'
             },
@@ -380,15 +375,13 @@ $result_trees{'simple'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
diff --git a/tp/t/results/menu/simple_no_menu.pl 
b/tp/t/results/menu/simple_no_menu.pl
index 6d625465ad..21318fe3f1 100644
--- a/tp/t/results/menu/simple_no_menu.pl
+++ b/tp/t/results/menu/simple_no_menu.pl
@@ -111,8 +111,7 @@ $result_trees{'simple_no_menu'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -159,8 +158,7 @@ $result_trees{'simple_no_menu'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -219,8 +217,7 @@ $result_trees{'simple_no_menu'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               },
               'type' => 'menu_entry'
             },
@@ -275,8 +272,7 @@ $result_trees{'simple_no_menu'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -347,8 +343,7 @@ $result_trees{'simple_no_menu'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               },
               'type' => 'menu_entry'
             },
@@ -380,15 +375,13 @@ $result_trees{'simple_no_menu'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
diff --git a/tp/t/results/menu/space_and_commands_in_menu_node.pl 
b/tp/t/results/menu/space_and_commands_in_menu_node.pl
index 29827e3d2d..574ff1ff28 100644
--- a/tp/t/results/menu/space_and_commands_in_menu_node.pl
+++ b/tp/t/results/menu/space_and_commands_in_menu_node.pl
@@ -39,8 +39,7 @@ $result_trees{'space_and_commands_in_menu_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -124,8 +123,7 @@ $result_trees{'space_and_commands_in_menu_node'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -180,8 +178,7 @@ $result_trees{'space_and_commands_in_menu_node'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -228,8 +225,7 @@ $result_trees{'space_and_commands_in_menu_node'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -288,8 +284,7 @@ $result_trees{'space_and_commands_in_menu_node'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               },
               'type' => 'menu_entry'
             },
@@ -344,8 +339,7 @@ $result_trees{'space_and_commands_in_menu_node'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -400,8 +394,7 @@ $result_trees{'space_and_commands_in_menu_node'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'menu_entry'
             },
@@ -468,8 +461,7 @@ $result_trees{'space_and_commands_in_menu_node'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -528,8 +520,7 @@ $result_trees{'space_and_commands_in_menu_node'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               },
               'type' => 'menu_entry'
             },
@@ -600,8 +591,7 @@ $result_trees{'space_and_commands_in_menu_node'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               },
               'type' => 'menu_entry'
             },
@@ -633,15 +623,13 @@ $result_trees{'space_and_commands_in_menu_node'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -658,8 +646,7 @@ $result_trees{'space_and_commands_in_menu_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -697,8 +684,7 @@ $result_trees{'space_and_commands_in_menu_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 16,
-        'macro' => ''
+        'line_nr' => 16
       }
     },
     {
@@ -729,8 +715,7 @@ $result_trees{'space_and_commands_in_menu_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     }
   ],
@@ -912,7 +897,6 @@ $result_errors{'space_and_commands_in_menu_node'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@menu entry node name `chap  b\' different from node name `chap 
@: b\'',
     'type' => 'warning'
   },
@@ -921,7 +905,6 @@ $result_errors{'space_and_commands_in_menu_node'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '@menu entry node name `chap b\' different from node name `chap 
@: b\'',
     'type' => 'warning'
   },
@@ -930,7 +913,6 @@ $result_errors{'space_and_commands_in_menu_node'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => '@menu entry node name `chap@ @ b\' different from node name 
`chap @: b\'',
     'type' => 'warning'
   },
@@ -939,7 +921,6 @@ $result_errors{'space_and_commands_in_menu_node'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@menu entry node name `chap@  b\' different from node name 
`chap @: b\'',
     'type' => 'warning'
   },
@@ -948,7 +929,6 @@ $result_errors{'space_and_commands_in_menu_node'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => '@menu entry node name `chap @ b\' different from node name 
`chap @: b\'',
     'type' => 'warning'
   },
@@ -957,7 +937,6 @@ $result_errors{'space_and_commands_in_menu_node'} = [
 ',
     'file_name' => '',
     'line_nr' => 12,
-    'macro' => '',
     'text' => '@menu entry node name `chap b\' different from node name `chap 
@: b\'',
     'type' => 'warning'
   },
@@ -966,7 +945,6 @@ $result_errors{'space_and_commands_in_menu_node'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => '@menu entry node name `chap @ @ b\' different from node name 
`chap @: b\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/menu/submenu_in_example.pl 
b/tp/t/results/menu/submenu_in_example.pl
index ff8babe4c9..932116bab5 100644
--- a/tp/t/results/menu/submenu_in_example.pl
+++ b/tp/t/results/menu/submenu_in_example.pl
@@ -142,15 +142,13 @@ $result_trees{'submenu_in_example'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     }
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 },
                 {
@@ -224,15 +222,13 @@ $result_trees{'submenu_in_example'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     }
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 13,
-                    'macro' => ''
+                    'line_nr' => 13
                   }
                 },
                 {
@@ -317,15 +313,13 @@ $result_trees{'submenu_in_example'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 20,
-                                'macro' => ''
+                                'line_nr' => 20
                               }
                             }
                           ],
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 18,
-                            'macro' => ''
+                            'line_nr' => 18
                           }
                         }
                       ],
@@ -359,15 +353,13 @@ $result_trees{'submenu_in_example'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 21,
-                        'macro' => ''
+                        'line_nr' => 21
                       }
                     }
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 17,
-                    'macro' => ''
+                    'line_nr' => 17
                   }
                 },
                 {
@@ -407,8 +399,7 @@ $result_trees{'submenu_in_example'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 23,
-                        'macro' => ''
+                        'line_nr' => 23
                       }
                     },
                     {
@@ -457,8 +448,7 @@ $result_trees{'submenu_in_example'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 26,
-                            'macro' => ''
+                            'line_nr' => 26
                           }
                         },
                         {
@@ -489,8 +479,7 @@ $result_trees{'submenu_in_example'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 27,
-                            'macro' => ''
+                            'line_nr' => 27
                           }
                         }
                       ],
@@ -499,8 +488,7 @@ $result_trees{'submenu_in_example'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 25,
-                        'macro' => ''
+                        'line_nr' => 25
                       }
                     },
                     {
@@ -544,15 +532,13 @@ $result_trees{'submenu_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 29,
-                    'macro' => ''
+                    'line_nr' => 29
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -583,15 +569,13 @@ $result_trees{'submenu_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         }
       ],
@@ -606,8 +590,7 @@ $result_trees{'submenu_in_example'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
@@ -688,7 +671,6 @@ $result_errors{'submenu_in_example'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '@menu in invalid context',
     'type' => 'warning'
   },
@@ -697,7 +679,6 @@ $result_errors{'submenu_in_example'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => '@menu in invalid context',
     'type' => 'warning'
   },
@@ -706,7 +687,6 @@ $result_errors{'submenu_in_example'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => '@menu in invalid context',
     'type' => 'warning'
   },
@@ -715,7 +695,6 @@ $result_errors{'submenu_in_example'} = [
 ',
     'file_name' => '',
     'line_nr' => 17,
-    'macro' => '',
     'text' => '@menu in invalid context',
     'type' => 'warning'
   }
diff --git a/tp/t/results/menu/verb_in_menu_description.pl 
b/tp/t/results/menu/verb_in_menu_description.pl
index b1989fad42..37082f1f96 100644
--- a/tp/t/results/menu/verb_in_menu_description.pl
+++ b/tp/t/results/menu/verb_in_menu_description.pl
@@ -39,8 +39,7 @@ $result_trees{'verb_in_menu_description'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -144,8 +143,7 @@ $result_trees{'verb_in_menu_description'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 6,
-                            'macro' => ''
+                            'line_nr' => 6
                           }
                         },
                         {
@@ -161,8 +159,7 @@ $result_trees{'verb_in_menu_description'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -209,15 +206,13 @@ $result_trees{'verb_in_menu_description'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         }
       ],
@@ -229,8 +224,7 @@ $result_trees{'verb_in_menu_description'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
diff --git a/tp/t/results/misc_commands/also_not_line.pl 
b/tp/t/results/misc_commands/also_not_line.pl
index 78c7af24df..5c6a4ba69d 100644
--- a/tp/t/results/misc_commands/also_not_line.pl
+++ b/tp/t/results/misc_commands/also_not_line.pl
@@ -46,8 +46,7 @@ $result_trees{'also_not_line'} = {
               'cmdname' => 'noindent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -76,8 +75,7 @@ $result_trees{'also_not_line'} = {
           'cmdname' => 'noindent',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -94,8 +92,7 @@ $result_trees{'also_not_line'} = {
               'cmdname' => 'noindent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -114,8 +111,7 @@ $result_trees{'also_not_line'} = {
               'cmdname' => 'noindent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -193,8 +189,7 @@ $result_trees{'also_not_line'} = {
               'cmdname' => 'noindent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -225,8 +220,7 @@ $result_trees{'also_not_line'} = {
               'cmdname' => 'novalidate',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
@@ -262,8 +256,7 @@ $result_trees{'also_not_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           }
         },
         {
@@ -331,8 +324,7 @@ $result_trees{'also_not_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           }
         }
       ],
@@ -397,7 +389,6 @@ $result_errors{'also_not_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@page should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -406,7 +397,6 @@ $result_errors{'also_not_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '@noindent is useless inside of a paragraph',
     'type' => 'warning'
   },
@@ -415,7 +405,6 @@ $result_errors{'also_not_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '@refill is obsolete',
     'type' => 'warning'
   },
@@ -424,7 +413,6 @@ $result_errors{'also_not_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '@noindent is useless inside of a paragraph',
     'type' => 'warning'
   },
@@ -433,7 +421,6 @@ $result_errors{'also_not_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@noindent is useless inside of a paragraph',
     'type' => 'warning'
   },
@@ -442,7 +429,6 @@ $result_errors{'also_not_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 14,
-    'macro' => '',
     'text' => '@page should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -451,7 +437,6 @@ $result_errors{'also_not_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 15,
-    'macro' => '',
     'text' => '@noindent is useless inside of a paragraph',
     'type' => 'warning'
   },
@@ -460,7 +445,6 @@ $result_errors{'also_not_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 15,
-    'macro' => '',
     'text' => '@refill is obsolete',
     'type' => 'warning'
   },
@@ -469,7 +453,6 @@ $result_errors{'also_not_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => '@novalidate should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -478,7 +461,6 @@ $result_errors{'also_not_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 21,
-    'macro' => '',
     'text' => '@vskip should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -487,7 +469,6 @@ $result_errors{'also_not_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 23,
-    'macro' => '',
     'text' => '@exdent should only appear at the beginning of a line',
     'type' => 'warning'
   }
diff --git a/tp/t/results/misc_commands/author_outside_titlepage_quotation.pl 
b/tp/t/results/misc_commands/author_outside_titlepage_quotation.pl
index be5d4c033b..9b9c1c8a16 100644
--- a/tp/t/results/misc_commands/author_outside_titlepage_quotation.pl
+++ b/tp/t/results/misc_commands/author_outside_titlepage_quotation.pl
@@ -34,8 +34,7 @@ $result_trees{'author_outside_titlepage_quotation'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -58,7 +57,6 @@ $result_errors{'author_outside_titlepage_quotation'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@author not meaningful outside `@titlepage\' and `@quotation\' 
environments',
     'type' => 'warning'
   }
diff --git a/tp/t/results/misc_commands/bad_documentlanguage.pl 
b/tp/t/results/misc_commands/bad_documentlanguage.pl
index 2891642d65..75b96367d3 100644
--- a/tp/t/results/misc_commands/bad_documentlanguage.pl
+++ b/tp/t/results/misc_commands/bad_documentlanguage.pl
@@ -47,8 +47,7 @@ $result_trees{'bad_documentlanguage'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -94,8 +93,7 @@ $result_trees{'bad_documentlanguage'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 }
               ],
@@ -113,8 +111,7 @@ $result_trees{'bad_documentlanguage'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -150,8 +147,7 @@ $result_trees{'bad_documentlanguage'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         }
       ],
@@ -181,7 +177,6 @@ $result_errors{'bad_documentlanguage'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@documentlanguage should only appear at the beginning of a 
line',
     'type' => 'warning'
   },
@@ -190,7 +185,6 @@ $result_errors{'bad_documentlanguage'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '@documentlanguage should only appear at the beginning of a 
line',
     'type' => 'warning'
   },
@@ -199,7 +193,6 @@ $result_errors{'bad_documentlanguage'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '@documentlanguage should not appear in @documentlanguage',
     'type' => 'warning'
   },
@@ -208,7 +201,6 @@ $result_errors{'bad_documentlanguage'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'bad argument to @documentlanguage: en @documentlanguage  en',
     'type' => 'error'
   },
@@ -217,7 +209,6 @@ $result_errors{'bad_documentlanguage'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'en  after documentlanguage is not a valid language code',
     'type' => 'warning'
   }
diff --git a/tp/t/results/misc_commands/clickstyle.pl 
b/tp/t/results/misc_commands/clickstyle.pl
index 6a6616827c..4f62ad7f57 100644
--- a/tp/t/results/misc_commands/clickstyle.pl
+++ b/tp/t/results/misc_commands/clickstyle.pl
@@ -23,8 +23,7 @@ $result_trees{'clickstyle'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -49,8 +48,7 @@ $result_trees{'clickstyle'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -79,8 +77,7 @@ $result_trees{'clickstyle'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -105,8 +102,7 @@ $result_trees{'clickstyle'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
diff --git a/tp/t/results/misc_commands/clickstyle_and_comments.pl 
b/tp/t/results/misc_commands/clickstyle_and_comments.pl
index 7b5fc28aec..3b4339fef5 100644
--- a/tp/t/results/misc_commands/clickstyle_and_comments.pl
+++ b/tp/t/results/misc_commands/clickstyle_and_comments.pl
@@ -23,8 +23,7 @@ $result_trees{'clickstyle_and_comments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -41,8 +40,7 @@ $result_trees{'clickstyle_and_comments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -53,8 +51,7 @@ $result_trees{'clickstyle_and_comments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -65,8 +62,7 @@ $result_trees{'clickstyle_and_comments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -83,8 +79,7 @@ $result_trees{'clickstyle_and_comments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -101,8 +96,7 @@ $result_trees{'clickstyle_and_comments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -119,8 +113,7 @@ $result_trees{'clickstyle_and_comments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         }
       ],
@@ -148,7 +141,6 @@ $result_errors{'clickstyle_and_comments'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'remaining argument on @clickstyle line: a',
     'type' => 'warning'
   },
@@ -157,7 +149,6 @@ $result_errors{'clickstyle_and_comments'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'remaining argument on @clickstyle line: b',
     'type' => 'warning'
   },
@@ -167,7 +158,6 @@ $result_errors{'clickstyle_and_comments'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@clickstyle should only accept an @-command as argument, not ` 
nocmd@comment c
 \'',
     'type' => 'error'
@@ -178,7 +168,6 @@ $result_errors{'clickstyle_and_comments'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '@clickstyle should only accept an @-command as argument, not ` 
more than one word @comment d
 \'',
     'type' => 'error'
@@ -188,7 +177,6 @@ $result_errors{'clickstyle_and_comments'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'remaining argument on @clickstyle line: on the same line 
@comment g',
     'type' => 'warning'
   }
diff --git a/tp/t/results/misc_commands/clickstyle_no_end_of_line.pl 
b/tp/t/results/misc_commands/clickstyle_no_end_of_line.pl
index c35e2b5c42..1bb0cba816 100644
--- a/tp/t/results/misc_commands/clickstyle_no_end_of_line.pl
+++ b/tp/t/results/misc_commands/clickstyle_no_end_of_line.pl
@@ -22,8 +22,7 @@ $result_trees{'clickstyle_no_end_of_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git 
a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl 
b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
index ff7f5e117b..44ee178fae 100644
--- a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
+++ b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
@@ -78,8 +78,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 8,
-                    'macro' => ''
+                    'line_nr' => 8
                   }
                 }
               ],
@@ -89,8 +88,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -220,8 +218,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 28,
-                    'macro' => ''
+                    'line_nr' => 28
                   }
                 }
               ],
@@ -231,8 +228,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -1394,15 +1390,13 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 32,
-                    'macro' => ''
+                    'line_nr' => 32
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -1439,8 +1433,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                   'cmdname' => 'insertcopying',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 35,
-                    'macro' => ''
+                    'line_nr' => 35
                   }
                 },
                 {
@@ -1471,15 +1464,13 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 36,
-                    'macro' => ''
+                    'line_nr' => 36
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               }
             },
             {
@@ -1527,8 +1518,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 39,
-        'macro' => ''
+        'line_nr' => 39
       }
     },
     {
@@ -1564,8 +1554,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 40,
-        'macro' => ''
+        'line_nr' => 40
       }
     },
     {
@@ -1597,8 +1586,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 42,
-        'macro' => ''
+        'line_nr' => 42
       }
     },
     {
@@ -3892,15 +3880,13 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 47,
-            'macro' => ''
+            'line_nr' => 47
           }
         },
         {
@@ -3919,8 +3905,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 43,
-        'macro' => ''
+        'line_nr' => 43
       }
     }
   ],
diff --git a/tp/t/results/misc_commands/command_in_heading_footing.pl 
b/tp/t/results/misc_commands/command_in_heading_footing.pl
index d8a72fe194..3dc1444a32 100644
--- a/tp/t/results/misc_commands/command_in_heading_footing.pl
+++ b/tp/t/results/misc_commands/command_in_heading_footing.pl
@@ -43,8 +43,7 @@ $result_trees{'command_in_heading_footing'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -97,8 +96,7 @@ $result_trees{'command_in_heading_footing'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -135,7 +133,6 @@ $result_errors{'command_in_heading_footing'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@thispage should only appear in heading or footing',
     'type' => 'error'
   },
@@ -144,7 +141,6 @@ $result_errors{'command_in_heading_footing'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@thischapternum should only appear in heading or footing',
     'type' => 'error'
   },
@@ -153,7 +149,6 @@ $result_errors{'command_in_heading_footing'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@thissection should only appear in heading or footing',
     'type' => 'error'
   }
diff --git a/tp/t/results/misc_commands/command_line_in_paragraph.pl 
b/tp/t/results/misc_commands/command_line_in_paragraph.pl
index 675bafcf64..fe1a8bfa61 100644
--- a/tp/t/results/misc_commands/command_line_in_paragraph.pl
+++ b/tp/t/results/misc_commands/command_line_in_paragraph.pl
@@ -43,8 +43,7 @@ $result_trees{'command_line_in_paragraph'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
diff --git 
a/tp/t/results/misc_commands/command_not_closed_in_documentencoding.pl 
b/tp/t/results/misc_commands/command_not_closed_in_documentencoding.pl
index eff55e2edd..a2e6a6292f 100644
--- a/tp/t/results/misc_commands/command_not_closed_in_documentencoding.pl
+++ b/tp/t/results/misc_commands/command_not_closed_in_documentencoding.pl
@@ -22,8 +22,7 @@ $result_trees{'command_not_closed_in_documentencoding'} = {
                   'cmdname' => 'strong',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 }
               ],
@@ -38,8 +37,7 @@ $result_trees{'command_not_closed_in_documentencoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -60,7 +58,6 @@ $result_errors{'command_not_closed_in_documentencoding'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@strong should not appear in @documentencoding',
     'type' => 'warning'
   },
@@ -69,7 +66,6 @@ $result_errors{'command_not_closed_in_documentencoding'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@strong missing closing brace',
     'type' => 'error'
   },
@@ -78,7 +74,6 @@ $result_errors{'command_not_closed_in_documentencoding'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'bad argument to @documentencoding: @strong{}',
     'type' => 'error'
   }
diff --git a/tp/t/results/misc_commands/comment_space_command_on_line.pl 
b/tp/t/results/misc_commands/comment_space_command_on_line.pl
index c7285a5ac4..bdd43a20af 100644
--- a/tp/t/results/misc_commands/comment_space_command_on_line.pl
+++ b/tp/t/results/misc_commands/comment_space_command_on_line.pl
@@ -43,8 +43,7 @@ $result_trees{'comment_space_command_on_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -93,8 +92,7 @@ $result_trees{'comment_space_command_on_line'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -142,8 +140,7 @@ $result_trees{'comment_space_command_on_line'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -185,8 +182,7 @@ $result_trees{'comment_space_command_on_line'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -264,8 +260,7 @@ $result_trees{'comment_space_command_on_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -309,8 +304,7 @@ $result_trees{'comment_space_command_on_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -363,8 +357,7 @@ $result_trees{'comment_space_command_on_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           },
           'type' => 'index_entry_command'
         },
@@ -410,8 +403,7 @@ $result_trees{'comment_space_command_on_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         },
         {
@@ -458,8 +450,7 @@ $result_trees{'comment_space_command_on_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -543,8 +534,7 @@ $result_trees{'comment_space_command_on_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             }
           ],
@@ -561,8 +551,7 @@ $result_trees{'comment_space_command_on_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         },
         {
@@ -607,8 +596,7 @@ $result_trees{'comment_space_command_on_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           }
         },
         {
@@ -627,8 +615,7 @@ $result_trees{'comment_space_command_on_line'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
diff --git a/tp/t/results/misc_commands/contents.pl 
b/tp/t/results/misc_commands/contents.pl
index afc3419dbc..2277bc8a87 100644
--- a/tp/t/results/misc_commands/contents.pl
+++ b/tp/t/results/misc_commands/contents.pl
@@ -39,8 +39,7 @@ $result_trees{'contents'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -68,8 +67,7 @@ $result_trees{'contents'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -92,8 +90,7 @@ $result_trees{'contents'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -119,8 +116,7 @@ $result_trees{'contents'} = {
           'cmdname' => 'shortcontents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -142,8 +138,7 @@ $result_trees{'contents'} = {
           'cmdname' => 'shortcontents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -165,8 +160,7 @@ $result_trees{'contents'} = {
           'cmdname' => 'summarycontents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         }
       ],
@@ -199,7 +193,6 @@ $result_errors{'contents'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@contents should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -208,7 +201,6 @@ $result_errors{'contents'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@contents should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -217,7 +209,6 @@ $result_errors{'contents'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '@shortcontents should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -226,7 +217,6 @@ $result_errors{'contents'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => '@shortcontents should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -235,7 +225,6 @@ $result_errors{'contents'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@summarycontents should only appear at the beginning of a line',
     'type' => 'warning'
   }
diff --git a/tp/t/results/misc_commands/defindex_too_much_args.pl 
b/tp/t/results/misc_commands/defindex_too_much_args.pl
index 36d0e58de9..564da53e83 100644
--- a/tp/t/results/misc_commands/defindex_too_much_args.pl
+++ b/tp/t/results/misc_commands/defindex_too_much_args.pl
@@ -28,8 +28,7 @@ $result_trees{'defindex_too_much_args'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -50,7 +49,6 @@ $result_errors{'defindex_too_much_args'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'bad argument to @defindex: chose    machin',
     'type' => 'error'
   }
diff --git a/tp/t/results/misc_commands/definfoenclose.pl 
b/tp/t/results/misc_commands/definfoenclose.pl
index 3bc475e1e1..6cd254a3ef 100644
--- a/tp/t/results/misc_commands/definfoenclose.pl
+++ b/tp/t/results/misc_commands/definfoenclose.pl
@@ -51,8 +51,7 @@ $result_trees{'definfoenclose'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -86,8 +85,7 @@ $result_trees{'definfoenclose'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'definfoenclose_command'
             },
@@ -140,8 +138,7 @@ $result_trees{'definfoenclose'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -175,8 +172,7 @@ $result_trees{'definfoenclose'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               },
               'type' => 'definfoenclose_command'
             },
@@ -208,8 +204,7 @@ $result_trees{'definfoenclose'} = {
               'cmdname' => 'strong',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -256,8 +251,7 @@ $result_trees{'definfoenclose'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           }
         },
         {
@@ -288,8 +282,7 @@ $result_trees{'definfoenclose'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               },
               'type' => 'definfoenclose_command'
             },
@@ -343,7 +336,6 @@ $result_errors{'definfoenclose'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@definfoenclose is obsolete',
     'type' => 'warning'
   },
@@ -352,7 +344,6 @@ $result_errors{'definfoenclose'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@definfoenclose should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -361,7 +352,6 @@ $result_errors{'definfoenclose'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => '@definfoenclose is obsolete',
     'type' => 'warning'
   },
@@ -370,7 +360,6 @@ $result_errors{'definfoenclose'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => '@definfoenclose should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -379,7 +368,6 @@ $result_errors{'definfoenclose'} = [
 ',
     'file_name' => '',
     'line_nr' => 12,
-    'macro' => '',
     'text' => '@definfoenclose is obsolete',
     'type' => 'warning'
   }
diff --git a/tp/t/results/misc_commands/definfoenclose_nestings.pl 
b/tp/t/results/misc_commands/definfoenclose_nestings.pl
index b504487678..e2b4fd5d06 100644
--- a/tp/t/results/misc_commands/definfoenclose_nestings.pl
+++ b/tp/t/results/misc_commands/definfoenclose_nestings.pl
@@ -41,8 +41,7 @@ $result_trees{'definfoenclose_nestings'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -77,8 +76,7 @@ $result_trees{'definfoenclose_nestings'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       },
                       'type' => 'definfoenclose_command'
                     }
@@ -89,8 +87,7 @@ $result_trees{'definfoenclose_nestings'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -125,8 +122,7 @@ $result_trees{'definfoenclose_nestings'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
@@ -143,8 +139,7 @@ $result_trees{'definfoenclose_nestings'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'definfoenclose_command'
             },
@@ -184,8 +179,7 @@ $result_trees{'definfoenclose_nestings'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'definfoenclose_command'
             }
@@ -217,8 +211,7 @@ $result_trees{'definfoenclose_nestings'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -261,7 +254,6 @@ $result_errors{'definfoenclose_nestings'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@definfoenclose is obsolete',
     'type' => 'warning'
   },
@@ -270,7 +262,6 @@ $result_errors{'definfoenclose_nestings'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@phoo should not appear in @code',
     'type' => 'warning'
   },
@@ -279,7 +270,6 @@ $result_errors{'definfoenclose_nestings'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '@phoo missing closing brace',
     'type' => 'error'
   },
@@ -288,7 +278,6 @@ $result_errors{'definfoenclose_nestings'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/misc_commands/definfoenclose_with_empty_arg.pl 
b/tp/t/results/misc_commands/definfoenclose_with_empty_arg.pl
index 3aab34ef3b..ede22e1e97 100644
--- a/tp/t/results/misc_commands/definfoenclose_with_empty_arg.pl
+++ b/tp/t/results/misc_commands/definfoenclose_with_empty_arg.pl
@@ -46,8 +46,7 @@ $result_trees{'definfoenclose_with_empty_arg'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -81,8 +80,7 @@ $result_trees{'definfoenclose_with_empty_arg'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'definfoenclose_command'
             },
@@ -125,7 +123,6 @@ $result_errors{'definfoenclose_with_empty_arg'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@definfoenclose is obsolete',
     'type' => 'warning'
   }
diff --git a/tp/t/results/misc_commands/documentencoding_utf8.pl 
b/tp/t/results/misc_commands/documentencoding_utf8.pl
index 019f09de4a..83f8a7dac9 100644
--- a/tp/t/results/misc_commands/documentencoding_utf8.pl
+++ b/tp/t/results/misc_commands/documentencoding_utf8.pl
@@ -38,8 +38,7 @@ $result_trees{'documentencoding_utf8'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -68,7 +67,6 @@ $result_errors{'documentencoding_utf8'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'encoding `utf8\' is not a canonical texinfo encoding',
     'type' => 'warning'
   }
diff --git a/tp/t/results/misc_commands/documentencoding_zero.pl 
b/tp/t/results/misc_commands/documentencoding_zero.pl
index 5e8959f205..d80cd53aef 100644
--- a/tp/t/results/misc_commands/documentencoding_zero.pl
+++ b/tp/t/results/misc_commands/documentencoding_zero.pl
@@ -37,8 +37,7 @@ $result_trees{'documentencoding_zero'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -60,7 +59,6 @@ $result_errors{'documentencoding_zero'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'encoding `0\' is not a canonical texinfo encoding',
     'type' => 'warning'
   },
@@ -69,7 +67,6 @@ $result_errors{'documentencoding_zero'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'unhandled encoding name `0\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/misc_commands/double_exdent.pl 
b/tp/t/results/misc_commands/double_exdent.pl
index 48cbe8ff7a..61481474bd 100644
--- a/tp/t/results/misc_commands/double_exdent.pl
+++ b/tp/t/results/misc_commands/double_exdent.pl
@@ -84,8 +84,7 @@ $result_trees{'double_exdent'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 5,
-                            'macro' => ''
+                            'line_nr' => 5
                           }
                         }
                       ],
@@ -100,8 +99,7 @@ $result_trees{'double_exdent'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 },
                 {
@@ -132,15 +130,13 @@ $result_trees{'double_exdent'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -171,15 +167,13 @@ $result_trees{'double_exdent'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -210,7 +204,6 @@ $result_errors{'double_exdent'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@exdent should not appear in @exdent',
     'type' => 'warning'
   }
diff --git a/tp/t/results/misc_commands/empty_center.pl 
b/tp/t/results/misc_commands/empty_center.pl
index 9eca221e36..69d650486b 100644
--- a/tp/t/results/misc_commands/empty_center.pl
+++ b/tp/t/results/misc_commands/empty_center.pl
@@ -24,8 +24,7 @@ $result_trees{'empty_center'} = {
           'cmdname' => 'center',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -48,7 +47,6 @@ $result_errors{'empty_center'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@center missing argument',
     'type' => 'warning'
   }
diff --git a/tp/t/results/misc_commands/empty_center_with_arg.pl 
b/tp/t/results/misc_commands/empty_center_with_arg.pl
index 79662fd8c9..36db29832b 100644
--- a/tp/t/results/misc_commands/empty_center_with_arg.pl
+++ b/tp/t/results/misc_commands/empty_center_with_arg.pl
@@ -22,8 +22,7 @@ $result_trees{'empty_center_with_arg'} = {
                   'cmdname' => 'w',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 }
               ],
@@ -44,8 +43,7 @@ $result_trees{'empty_center_with_arg'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/misc_commands/empty_documentencoding.pl 
b/tp/t/results/misc_commands/empty_documentencoding.pl
index dca9b489d7..2576292223 100644
--- a/tp/t/results/misc_commands/empty_documentencoding.pl
+++ b/tp/t/results/misc_commands/empty_documentencoding.pl
@@ -24,8 +24,7 @@ $result_trees{'empty_documentencoding'} = {
           'cmdname' => 'documentencoding',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -47,7 +46,6 @@ $result_errors{'empty_documentencoding'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@documentencoding missing argument',
     'type' => 'warning'
   }
diff --git a/tp/t/results/misc_commands/footnote_in_center.pl 
b/tp/t/results/misc_commands/footnote_in_center.pl
index 2498107251..54ce10880a 100644
--- a/tp/t/results/misc_commands/footnote_in_center.pl
+++ b/tp/t/results/misc_commands/footnote_in_center.pl
@@ -60,8 +60,7 @@ $result_trees{'footnote_in_center'} = {
                                       'cmdname' => 'asis',
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 5,
-                                        'macro' => ''
+                                        'line_nr' => 5
                                       },
                                       'type' => 'command_as_argument'
                                     }
@@ -106,8 +105,7 @@ $result_trees{'footnote_in_center'} = {
                                           },
                                           'source_info' => {
                                             'file_name' => '',
-                                            'line_nr' => 6,
-                                            'macro' => ''
+                                            'line_nr' => 6
                                           }
                                         }
                                       ],
@@ -158,8 +156,7 @@ $result_trees{'footnote_in_center'} = {
                                   },
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 8,
-                                    'macro' => ''
+                                    'line_nr' => 8
                                   }
                                 }
                               ],
@@ -173,8 +170,7 @@ $result_trees{'footnote_in_center'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 5,
-                                'macro' => ''
+                                'line_nr' => 5
                               }
                             },
                             {
@@ -205,15 +201,13 @@ $result_trees{'footnote_in_center'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 9,
-                                'macro' => ''
+                                'line_nr' => 9
                               }
                             }
                           ],
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 4,
-                            'macro' => ''
+                            'line_nr' => 4
                           }
                         }
                       ],
@@ -223,8 +217,7 @@ $result_trees{'footnote_in_center'} = {
                   'cmdname' => 'footnote',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -248,8 +241,7 @@ $result_trees{'footnote_in_center'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/misc_commands/heading_command_in_commands.pl 
b/tp/t/results/misc_commands/heading_command_in_commands.pl
index c7be2813dd..904f570fba 100644
--- a/tp/t/results/misc_commands/heading_command_in_commands.pl
+++ b/tp/t/results/misc_commands/heading_command_in_commands.pl
@@ -49,8 +49,7 @@ $result_trees{'heading_command_in_commands'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -60,8 +59,7 @@ $result_trees{'heading_command_in_commands'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -117,8 +115,7 @@ $result_trees{'heading_command_in_commands'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
@@ -152,15 +149,13 @@ $result_trees{'heading_command_in_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -207,8 +202,7 @@ $result_trees{'heading_command_in_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -239,15 +233,13 @@ $result_trees{'heading_command_in_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         }
       ],
@@ -285,7 +277,6 @@ $result_errors{'heading_command_in_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@everyheading should not appear in @code',
     'type' => 'warning'
   },
@@ -294,7 +285,6 @@ $result_errors{'heading_command_in_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'multiple @everyheading',
     'type' => 'warning'
   },
@@ -303,7 +293,6 @@ $result_errors{'heading_command_in_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'multiple @everyheading',
     'type' => 'warning'
   }
diff --git a/tp/t/results/misc_commands/incorrect_allowcodebreaks_argument.pl 
b/tp/t/results/misc_commands/incorrect_allowcodebreaks_argument.pl
index cd85adaa9c..40c40e5aaf 100644
--- a/tp/t/results/misc_commands/incorrect_allowcodebreaks_argument.pl
+++ b/tp/t/results/misc_commands/incorrect_allowcodebreaks_argument.pl
@@ -34,8 +34,7 @@ $result_trees{'incorrect_allowcodebreaks_argument'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -54,8 +53,7 @@ $result_trees{'incorrect_allowcodebreaks_argument'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -86,7 +84,6 @@ $result_errors{'incorrect_allowcodebreaks_argument'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@allowcodebreaks arg must be `true\' or `false\', not `_arg\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/misc_commands/indent_in_command_in_paragraph.pl 
b/tp/t/results/misc_commands/indent_in_command_in_paragraph.pl
index 128d37c954..a8f1f514be 100644
--- a/tp/t/results/misc_commands/indent_in_command_in_paragraph.pl
+++ b/tp/t/results/misc_commands/indent_in_command_in_paragraph.pl
@@ -22,8 +22,7 @@ $result_trees{'indent_in_command_in_paragraph'} = {
                       'cmdname' => 'indent',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     }
                   ],
@@ -33,8 +32,7 @@ $result_trees{'indent_in_command_in_paragraph'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -55,8 +53,7 @@ $result_trees{'indent_in_command_in_paragraph'} = {
                               'cmdname' => 'noindent',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 1,
-                                'macro' => ''
+                                'line_nr' => 1
                               }
                             }
                           ],
@@ -66,8 +63,7 @@ $result_trees{'indent_in_command_in_paragraph'} = {
                       'cmdname' => 'b',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     }
                   ],
@@ -77,8 +73,7 @@ $result_trees{'indent_in_command_in_paragraph'} = {
               'cmdname' => 'asis',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -108,7 +103,6 @@ $result_errors{'indent_in_command_in_paragraph'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@indent should not appear in @code',
     'type' => 'warning'
   },
@@ -117,7 +111,6 @@ $result_errors{'indent_in_command_in_paragraph'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@indent is useless inside of a paragraph',
     'type' => 'warning'
   },
@@ -126,7 +119,6 @@ $result_errors{'indent_in_command_in_paragraph'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@noindent should not appear in @b',
     'type' => 'warning'
   },
@@ -135,7 +127,6 @@ $result_errors{'indent_in_command_in_paragraph'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@noindent is useless inside of a paragraph',
     'type' => 'warning'
   }
diff --git a/tp/t/results/misc_commands/indent_in_quotation.pl 
b/tp/t/results/misc_commands/indent_in_quotation.pl
index 6f840e8f67..e1ed26b690 100644
--- a/tp/t/results/misc_commands/indent_in_quotation.pl
+++ b/tp/t/results/misc_commands/indent_in_quotation.pl
@@ -27,8 +27,7 @@ $result_trees{'indent_in_quotation'} = {
               'cmdname' => 'indent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -76,15 +75,13 @@ $result_trees{'indent_in_quotation'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/misc_commands/index_entries.pl 
b/tp/t/results/misc_commands/index_entries.pl
index 9f1be3cfd0..944d65051f 100644
--- a/tp/t/results/misc_commands/index_entries.pl
+++ b/tp/t/results/misc_commands/index_entries.pl
@@ -41,8 +41,7 @@ $result_trees{'index_entries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           },
           'type' => 'index_entry_command'
         },
@@ -81,8 +80,7 @@ $result_trees{'index_entries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -122,8 +120,7 @@ $result_trees{'index_entries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           },
           'type' => 'index_entry_command'
         }
@@ -152,7 +149,6 @@ $result_errors{'index_entries'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -161,7 +157,6 @@ $result_errors{'index_entries'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'entry for index `truc\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/misc_commands/invalid_clickstyle.pl 
b/tp/t/results/misc_commands/invalid_clickstyle.pl
index ae02517920..dae070ea2a 100644
--- a/tp/t/results/misc_commands/invalid_clickstyle.pl
+++ b/tp/t/results/misc_commands/invalid_clickstyle.pl
@@ -28,8 +28,7 @@ $result_trees{'invalid_clickstyle'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -54,8 +53,7 @@ $result_trees{'invalid_clickstyle'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -84,8 +82,7 @@ $result_trees{'invalid_clickstyle'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -110,8 +107,7 @@ $result_trees{'invalid_clickstyle'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -134,8 +130,7 @@ $result_trees{'invalid_clickstyle'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -160,8 +155,7 @@ $result_trees{'invalid_clickstyle'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -210,7 +204,6 @@ $result_errors{'invalid_clickstyle'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'remaining argument on @clickstyle line: on the same line',
     'type' => 'warning'
   },
@@ -220,7 +213,6 @@ $result_errors{'invalid_clickstyle'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => '@clickstyle should only accept an @-command as argument, not ` 
something
 \'',
     'type' => 'error'
diff --git a/tp/t/results/misc_commands/invalid_documentencoding.pl 
b/tp/t/results/misc_commands/invalid_documentencoding.pl
index cefb4823a4..339d08eddf 100644
--- a/tp/t/results/misc_commands/invalid_documentencoding.pl
+++ b/tp/t/results/misc_commands/invalid_documentencoding.pl
@@ -35,8 +35,7 @@ $result_trees{'invalid_documentencoding'} = {
                   'cmdname' => 'asis',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   }
                 }
               ],
@@ -60,8 +59,7 @@ $result_trees{'invalid_documentencoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -90,8 +88,7 @@ $result_trees{'invalid_documentencoding'} = {
                   'cmdname' => 'asis',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 }
               ],
@@ -115,8 +112,7 @@ $result_trees{'invalid_documentencoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -147,8 +143,7 @@ $result_trees{'invalid_documentencoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -187,8 +182,7 @@ $result_trees{'invalid_documentencoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -219,8 +213,7 @@ $result_trees{'invalid_documentencoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -251,8 +244,7 @@ $result_trees{'invalid_documentencoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -283,8 +275,7 @@ $result_trees{'invalid_documentencoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -303,8 +294,7 @@ $result_trees{'invalid_documentencoding'} = {
                       'cmdname' => 'TeX',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     }
                   ],
@@ -328,8 +318,7 @@ $result_trees{'invalid_documentencoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -353,8 +342,7 @@ $result_trees{'invalid_documentencoding'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     }
                   ],
@@ -378,8 +366,7 @@ $result_trees{'invalid_documentencoding'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
@@ -415,7 +402,6 @@ $result_errors{'invalid_documentencoding'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@asis should not appear in @documentencoding',
     'type' => 'warning'
   },
@@ -424,7 +410,6 @@ $result_errors{'invalid_documentencoding'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'bad argument to @documentencoding: us-ascii@asis{}',
     'type' => 'error'
   },
@@ -433,7 +418,6 @@ $result_errors{'invalid_documentencoding'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '@asis should not appear in @documentencoding',
     'type' => 'warning'
   },
@@ -442,7 +426,6 @@ $result_errors{'invalid_documentencoding'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'bad argument to @documentencoding: latin1@asis{a}',
     'type' => 'error'
   },
@@ -451,7 +434,6 @@ $result_errors{'invalid_documentencoding'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'encoding `YS-ASCII\' is not a canonical texinfo encoding',
     'type' => 'warning'
   },
@@ -460,7 +442,6 @@ $result_errors{'invalid_documentencoding'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'unhandled encoding name `YS-ASCII\'',
     'type' => 'warning'
   },
@@ -469,7 +450,6 @@ $result_errors{'invalid_documentencoding'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => '@documentencoding should only appear at the beginning of a 
line',
     'type' => 'warning'
   },
@@ -478,7 +458,6 @@ $result_errors{'invalid_documentencoding'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'encoding `bad encoding name\' is not a canonical texinfo 
encoding',
     'type' => 'warning'
   },
@@ -487,7 +466,6 @@ $result_errors{'invalid_documentencoding'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'unhandled encoding name `bad encoding name\'',
     'type' => 'warning'
   },
@@ -496,7 +474,6 @@ $result_errors{'invalid_documentencoding'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'encoding `1\' is not a canonical texinfo encoding',
     'type' => 'warning'
   },
@@ -505,7 +482,6 @@ $result_errors{'invalid_documentencoding'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'unhandled encoding name `1\'',
     'type' => 'warning'
   },
@@ -514,7 +490,6 @@ $result_errors{'invalid_documentencoding'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => 'bad encoding name `%\'',
     'type' => 'warning'
   },
@@ -523,7 +498,6 @@ $result_errors{'invalid_documentencoding'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'bad encoding name `@\'',
     'type' => 'warning'
   },
@@ -532,7 +506,6 @@ $result_errors{'invalid_documentencoding'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => 'bad argument to @documentencoding: AAA@TeX{}',
     'type' => 'error'
   },
@@ -541,7 +514,6 @@ $result_errors{'invalid_documentencoding'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'bad argument to @documentencoding: BBB@\'e',
     'type' => 'error'
   }
diff --git a/tp/t/results/misc_commands/invalid_kbdinputstyle.pl 
b/tp/t/results/misc_commands/invalid_kbdinputstyle.pl
index 242414623c..c6315f4c00 100644
--- a/tp/t/results/misc_commands/invalid_kbdinputstyle.pl
+++ b/tp/t/results/misc_commands/invalid_kbdinputstyle.pl
@@ -39,8 +39,7 @@ $result_trees{'invalid_kbdinputstyle'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -65,7 +64,6 @@ $result_errors{'invalid_kbdinputstyle'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@kbdinputstyle should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -74,7 +72,6 @@ $result_errors{'invalid_kbdinputstyle'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@kbdinputstyle arg must be `code\'/`example\'/`distinct\', not 
`wrong arg on line following kbdinputstyle\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/misc_commands/kbdinputstyle.pl 
b/tp/t/results/misc_commands/kbdinputstyle.pl
index 4d32f6f521..2a831aa050 100644
--- a/tp/t/results/misc_commands/kbdinputstyle.pl
+++ b/tp/t/results/misc_commands/kbdinputstyle.pl
@@ -106,8 +106,7 @@ $result_trees{'kbdinputstyle'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
@@ -117,8 +116,7 @@ $result_trees{'kbdinputstyle'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -173,8 +171,7 @@ $result_trees{'kbdinputstyle'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           }
         },
         {
@@ -679,8 +676,7 @@ $result_trees{'kbdinputstyle'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 24,
-            'macro' => ''
+            'line_nr' => 24
           }
         },
         {
@@ -1176,8 +1172,7 @@ $result_trees{'kbdinputstyle'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 30,
-            'macro' => ''
+            'line_nr' => 30
           }
         },
         {
diff --git a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl 
b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
index d146c36393..52308a7bfe 100644
--- a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
+++ b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
@@ -131,8 +131,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             }
           ],
@@ -142,8 +141,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -198,8 +196,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           }
         },
         {
@@ -828,8 +825,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 29,
-            'macro' => ''
+            'line_nr' => 29
           }
         },
         {
@@ -1450,8 +1446,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 35,
-            'macro' => ''
+            'line_nr' => 35
           }
         },
         {
diff --git a/tp/t/results/misc_commands/many_lines.pl 
b/tp/t/results/misc_commands/many_lines.pl
index 7843e90132..f5f7ad98fd 100644
--- a/tp/t/results/misc_commands/many_lines.pl
+++ b/tp/t/results/misc_commands/many_lines.pl
@@ -45,8 +45,7 @@ $result_trees{'many_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -63,8 +62,7 @@ $result_trees{'many_lines'} = {
               'cmdname' => 'afourpaper',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -81,8 +79,7 @@ $result_trees{'many_lines'} = {
               'cmdname' => 'smallbook',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -113,8 +110,7 @@ $result_trees{'many_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -145,8 +141,7 @@ $result_trees{'many_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -177,8 +172,7 @@ $result_trees{'many_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -209,8 +203,7 @@ $result_trees{'many_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -241,8 +234,7 @@ $result_trees{'many_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -273,8 +265,7 @@ $result_trees{'many_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -305,8 +296,7 @@ $result_trees{'many_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -340,8 +330,7 @@ $result_trees{'many_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -382,8 +371,7 @@ $result_trees{'many_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           }
         },
         {
@@ -416,8 +404,7 @@ $result_trees{'many_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -474,8 +461,7 @@ $result_trees{'many_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -492,8 +478,7 @@ $result_trees{'many_lines'} = {
               'cmdname' => 'afourpaper',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -510,8 +495,7 @@ $result_trees{'many_lines'} = {
               'cmdname' => 'afourlatex',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -528,8 +512,7 @@ $result_trees{'many_lines'} = {
               'cmdname' => 'afourwide',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -565,8 +548,7 @@ $result_trees{'many_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -602,8 +584,7 @@ $result_trees{'many_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -639,8 +620,7 @@ $result_trees{'many_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -676,8 +656,7 @@ $result_trees{'many_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -713,8 +692,7 @@ $result_trees{'many_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -745,8 +723,7 @@ $result_trees{'many_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               }
             },
             {
@@ -777,8 +754,7 @@ $result_trees{'many_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             },
             {
@@ -814,8 +790,7 @@ $result_trees{'many_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             },
             {
@@ -851,8 +826,7 @@ $result_trees{'many_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             },
             {
@@ -888,8 +862,7 @@ $result_trees{'many_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             },
             {
@@ -923,8 +896,7 @@ $result_trees{'many_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -956,8 +928,7 @@ $result_trees{'many_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               }
             },
             {
@@ -993,8 +964,7 @@ $result_trees{'many_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               }
             },
             {
@@ -1030,8 +1000,7 @@ $result_trees{'many_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               }
             },
             {
@@ -1067,8 +1036,7 @@ $result_trees{'many_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             },
             {
@@ -1099,8 +1067,7 @@ $result_trees{'many_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             },
             {
@@ -1133,8 +1100,7 @@ $result_trees{'many_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               }
             },
             {
@@ -1167,8 +1133,7 @@ $result_trees{'many_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 37,
-                'macro' => ''
+                'line_nr' => 37
               }
             }
           ],
@@ -1321,7 +1286,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@pagesizes should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1330,7 +1294,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@afourpaper should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1339,7 +1302,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@smallbook should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1348,7 +1310,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '@headings should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1357,7 +1318,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'bad argument to @headings: on line following headings',
     'type' => 'error'
   },
@@ -1366,7 +1326,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@oddfooting should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1375,7 +1334,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => '@everyheading should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1384,7 +1342,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '@everyfooting should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1393,7 +1350,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => '@evenheading should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1402,7 +1358,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@evenfooting should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1411,7 +1366,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => '@oddheading should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1420,7 +1374,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => '@need should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1429,7 +1382,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'bad argument to @need: 0.1 on line following',
     'type' => 'error'
   },
@@ -1438,7 +1390,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 12,
-    'macro' => '',
     'text' => '@need should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1447,7 +1398,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => '@setchapternewpage should only appear at the beginning of a 
line',
     'type' => 'warning'
   },
@@ -1456,7 +1406,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => '@setchapternewpage arg must be `on\', `off\' or `odd\', not `on 
line following setchapternewpage\'',
     'type' => 'error'
   },
@@ -1465,7 +1414,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 14,
-    'macro' => '',
     'text' => '@raisesections should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1474,7 +1422,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 15,
-    'macro' => '',
     'text' => '@lowersections should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1483,7 +1430,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => '@kbdinputstyle should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1492,7 +1438,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => '@kbdinputstyle arg must be `code\'/`example\'/`distinct\', not 
`code something\'',
     'type' => 'error'
   },
@@ -1501,7 +1446,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 17,
-    'macro' => '',
     'text' => '@afourpaper should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1510,7 +1454,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 17,
-    'macro' => '',
     'text' => 'multiple @afourpaper',
     'type' => 'warning'
   },
@@ -1519,7 +1462,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 18,
-    'macro' => '',
     'text' => '@afourlatex should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1528,7 +1470,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 19,
-    'macro' => '',
     'text' => '@afourwide should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1537,7 +1478,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 20,
-    'macro' => '',
     'text' => '@paragraphindent should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1546,7 +1486,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 21,
-    'macro' => '',
     'text' => '@paragraphindent should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1555,7 +1494,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 22,
-    'macro' => '',
     'text' => '@paragraphindent should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1564,7 +1502,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 23,
-    'macro' => '',
     'text' => '@paragraphindent should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1573,7 +1510,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 24,
-    'macro' => '',
     'text' => '@firstparagraphindent should only appear at the beginning of a 
line',
     'type' => 'warning'
   },
@@ -1582,7 +1518,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 25,
-    'macro' => '',
     'text' => '@firstparagraphindent should only appear at the beginning of a 
line',
     'type' => 'warning'
   },
@@ -1591,7 +1526,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 25,
-    'macro' => '',
     'text' => '@firstparagraphindent arg must be `none\' or `insert\', not 
`3\'',
     'type' => 'error'
   },
@@ -1600,7 +1534,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 26,
-    'macro' => '',
     'text' => '@exampleindent should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1609,7 +1542,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 26,
-    'macro' => '',
     'text' => '@exampleindent arg must be numeric/`asis\', not `6 on line 
following exampleindent\'',
     'type' => 'error'
   },
@@ -1618,7 +1550,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 27,
-    'macro' => '',
     'text' => '@exampleindent should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1627,7 +1558,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 28,
-    'macro' => '',
     'text' => '@footnotestyle should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1636,7 +1566,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 29,
-    'macro' => '',
     'text' => '@footnotestyle should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1645,7 +1574,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 29,
-    'macro' => '',
     'text' => 'multiple @footnotestyle',
     'type' => 'warning'
   },
@@ -1654,7 +1582,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 30,
-    'macro' => '',
     'text' => '@documentencoding should only appear at the beginning of a 
line',
     'type' => 'warning'
   },
@@ -1663,7 +1590,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 30,
-    'macro' => '',
     'text' => 'encoding `US-ascii encoding name\' is not a canonical texinfo 
encoding',
     'type' => 'warning'
   },
@@ -1672,7 +1598,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 30,
-    'macro' => '',
     'text' => 'unhandled encoding name `US-ascii encoding name\'',
     'type' => 'warning'
   },
@@ -1681,7 +1606,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 32,
-    'macro' => '',
     'text' => '@frenchspacing should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1690,7 +1614,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 33,
-    'macro' => '',
     'text' => '@frenchspacing should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1699,7 +1622,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 34,
-    'macro' => '',
     'text' => '@fonttextsize should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1708,7 +1630,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 35,
-    'macro' => '',
     'text' => '@everyheadingmarks should only appear at the beginning of a 
line',
     'type' => 'warning'
   },
@@ -1717,7 +1638,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 35,
-    'macro' => '',
     'text' => '@everyheadingmarks arg must be `top\' or `bottom\', not `bottom 
on line following everyheadingmarks\'',
     'type' => 'error'
   },
@@ -1726,7 +1646,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 39,
-    'macro' => '',
     'text' => '@finalout should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1735,7 +1654,6 @@ $result_errors{'many_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 41,
-    'macro' => '',
     'text' => '@finalout should only appear at the beginning of a line',
     'type' => 'warning'
   }
diff --git a/tp/t/results/misc_commands/no_empty_line_between_headings.pl 
b/tp/t/results/misc_commands/no_empty_line_between_headings.pl
index 62e1b19d83..a1baf12a19 100644
--- a/tp/t/results/misc_commands/no_empty_line_between_headings.pl
+++ b/tp/t/results/misc_commands/no_empty_line_between_headings.pl
@@ -54,8 +54,7 @@ $result_trees{'no_empty_line_between_headings'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
@@ -67,8 +66,7 @@ $result_trees{'no_empty_line_between_headings'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -99,8 +97,7 @@ $result_trees{'no_empty_line_between_headings'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -131,8 +128,7 @@ $result_trees{'no_empty_line_between_headings'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     }
   ],
diff --git a/tp/t/results/misc_commands/nodedescription.pl 
b/tp/t/results/misc_commands/nodedescription.pl
index 436e568519..d768f9f0ee 100644
--- a/tp/t/results/misc_commands/nodedescription.pl
+++ b/tp/t/results/misc_commands/nodedescription.pl
@@ -34,8 +34,7 @@ $result_trees{'nodedescription'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -75,8 +74,7 @@ $result_trees{'nodedescription'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -112,8 +110,7 @@ $result_trees{'nodedescription'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -154,8 +151,7 @@ $result_trees{'nodedescription'} = {
                   'cmdname' => 'emph',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 },
                 {
@@ -182,8 +178,7 @@ $result_trees{'nodedescription'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         'normalized' => 'chap'
@@ -195,8 +190,7 @@ $result_trees{'nodedescription'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -255,8 +249,7 @@ $result_trees{'nodedescription'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -283,8 +276,7 @@ $result_trees{'nodedescription'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     }
   ],
@@ -422,7 +414,6 @@ $result_errors{'nodedescription'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@nodedescription outside of any node',
     'type' => 'warning'
   },
@@ -431,7 +422,6 @@ $result_errors{'nodedescription'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'multiple node @nodedescription',
     'type' => 'warning'
   }
diff --git a/tp/t/results/misc_commands/noindent_after_smallexample.pl 
b/tp/t/results/misc_commands/noindent_after_smallexample.pl
index a847ee0ad0..59b1df4ff6 100644
--- a/tp/t/results/misc_commands/noindent_after_smallexample.pl
+++ b/tp/t/results/misc_commands/noindent_after_smallexample.pl
@@ -73,23 +73,20 @@ $result_trees{'noindent_after_smallexample'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
           'cmdname' => 'noindent',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
diff --git a/tp/t/results/misc_commands/noindent_empty_para.pl 
b/tp/t/results/misc_commands/noindent_empty_para.pl
index 8b14507bc4..5273ef92ad 100644
--- a/tp/t/results/misc_commands/noindent_empty_para.pl
+++ b/tp/t/results/misc_commands/noindent_empty_para.pl
@@ -13,8 +13,7 @@ $result_trees{'noindent_empty_para'} = {
           'cmdname' => 'noindent',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/misc_commands/noindent_in_paragraph.pl 
b/tp/t/results/misc_commands/noindent_in_paragraph.pl
index e37d890698..299b0c5161 100644
--- a/tp/t/results/misc_commands/noindent_in_paragraph.pl
+++ b/tp/t/results/misc_commands/noindent_in_paragraph.pl
@@ -19,8 +19,7 @@ $result_trees{'noindent_in_paragraph'} = {
               'cmdname' => 'noindent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -50,8 +49,7 @@ $result_trees{'noindent_in_paragraph'} = {
               'cmdname' => 'noindent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -96,7 +94,6 @@ $result_errors{'noindent_in_paragraph'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@noindent is useless inside of a paragraph',
     'type' => 'warning'
   },
@@ -105,7 +102,6 @@ $result_errors{'noindent_in_paragraph'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => '@noindent is useless inside of a paragraph',
     'type' => 'warning'
   }
diff --git a/tp/t/results/misc_commands/noindent_indent.pl 
b/tp/t/results/misc_commands/noindent_indent.pl
index 30e0d3e8e6..c992faa8ea 100644
--- a/tp/t/results/misc_commands/noindent_indent.pl
+++ b/tp/t/results/misc_commands/noindent_indent.pl
@@ -18,8 +18,7 @@ $result_trees{'noindent_indent'} = {
           'cmdname' => 'indent',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -48,8 +47,7 @@ $result_trees{'noindent_indent'} = {
           'cmdname' => 'noindent',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -82,8 +80,7 @@ $result_trees{'noindent_indent'} = {
           'cmdname' => 'noindent',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -111,8 +108,7 @@ $result_trees{'noindent_indent'} = {
           'cmdname' => 'indent',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
diff --git a/tp/t/results/misc_commands/ref_in_center.pl 
b/tp/t/results/misc_commands/ref_in_center.pl
index 62865d7d88..cb7a01091e 100644
--- a/tp/t/results/misc_commands/ref_in_center.pl
+++ b/tp/t/results/misc_commands/ref_in_center.pl
@@ -44,8 +44,7 @@ $result_trees{'ref_in_center'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -81,8 +80,7 @@ $result_trees{'ref_in_center'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -114,8 +112,7 @@ $result_trees{'ref_in_center'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -168,8 +165,7 @@ $result_trees{'ref_in_center'} = {
                   'cmdname' => 'ref',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
@@ -190,8 +186,7 @@ $result_trees{'ref_in_center'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -234,8 +229,7 @@ $result_trees{'ref_in_center'} = {
                   'cmdname' => 'ref',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 }
               ],
@@ -250,8 +244,7 @@ $result_trees{'ref_in_center'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -274,8 +267,7 @@ $result_trees{'ref_in_center'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
@@ -410,7 +402,6 @@ $result_errors{'ref_in_center'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@ref missing closing brace',
     'type' => 'error'
   },
@@ -419,7 +410,6 @@ $result_errors{'ref_in_center'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/misc_commands/setfilename.pl 
b/tp/t/results/misc_commands/setfilename.pl
index 19b4307164..b77a36ac3a 100644
--- a/tp/t/results/misc_commands/setfilename.pl
+++ b/tp/t/results/misc_commands/setfilename.pl
@@ -45,8 +45,7 @@ $result_trees{'setfilename'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -77,8 +76,7 @@ $result_trees{'setfilename'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -118,8 +116,7 @@ $result_trees{'setfilename'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -147,8 +144,7 @@ $result_trees{'setfilename'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     },
                     {
@@ -172,8 +168,7 @@ $result_trees{'setfilename'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -208,7 +203,6 @@ $result_errors{'setfilename'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'multiple @setfilename',
     'type' => 'warning'
   },
@@ -217,7 +211,6 @@ $result_errors{'setfilename'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'multiple @setfilename',
     'type' => 'warning'
   },
@@ -226,7 +219,6 @@ $result_errors{'setfilename'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'multiple @setfilename',
     'type' => 'warning'
   },
@@ -235,7 +227,6 @@ $result_errors{'setfilename'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '@verb should not appear in @setfilename',
     'type' => 'warning'
   },
@@ -244,7 +235,6 @@ $result_errors{'setfilename'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'bad argument to @setfilename: @ @verb{: name :}@',
     'type' => 'error'
   }
diff --git a/tp/t/results/misc_commands/simple.pl 
b/tp/t/results/misc_commands/simple.pl
index ecea4530f6..cfe0021416 100644
--- a/tp/t/results/misc_commands/simple.pl
+++ b/tp/t/results/misc_commands/simple.pl
@@ -33,8 +33,7 @@ $result_trees{'simple'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/misc_commands/sp.pl b/tp/t/results/misc_commands/sp.pl
index ad2db9035a..0041d532db 100644
--- a/tp/t/results/misc_commands/sp.pl
+++ b/tp/t/results/misc_commands/sp.pl
@@ -52,8 +52,7 @@ $result_trees{'sp'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -86,8 +85,7 @@ $result_trees{'sp'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -128,8 +126,7 @@ $result_trees{'sp'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -153,8 +150,7 @@ $result_trees{'sp'} = {
                     'cmdname' => 'ifnottex',
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 6,
-                      'macro' => ''
+                      'line_nr' => 6
                     }
                   },
                   'position' => 50,
@@ -193,8 +189,7 @@ $result_trees{'sp'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           },
           'source_marks' => [
             {
@@ -227,8 +222,7 @@ $result_trees{'sp'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 8,
-                  'macro' => ''
+                  'line_nr' => 8
                 }
               },
               'sourcemark_type' => 'expanded_conditional_command',
@@ -266,7 +260,6 @@ $result_errors{'sp'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@sp should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -275,7 +268,6 @@ $result_errors{'sp'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '@sp should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -284,7 +276,6 @@ $result_errors{'sp'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '@sp arg must be numeric, not `2 a number after sp\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/misc_commands/synindex_too_much_args.pl 
b/tp/t/results/misc_commands/synindex_too_much_args.pl
index 5ad6a5c8f1..4f6e332fc9 100644
--- a/tp/t/results/misc_commands/synindex_too_much_args.pl
+++ b/tp/t/results/misc_commands/synindex_too_much_args.pl
@@ -34,8 +34,7 @@ $result_trees{'synindex_too_much_args'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -57,7 +56,6 @@ $result_errors{'synindex_too_much_args'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'bad argument to @syncodeindex: cp fn    truc',
     'type' => 'error'
   }
diff --git a/tp/t/results/misc_commands/test_allowcodebreaks.pl 
b/tp/t/results/misc_commands/test_allowcodebreaks.pl
index 6c3a5d338c..8da692b70d 100644
--- a/tp/t/results/misc_commands/test_allowcodebreaks.pl
+++ b/tp/t/results/misc_commands/test_allowcodebreaks.pl
@@ -44,8 +44,7 @@ $result_trees{'test_allowcodebreaks'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -143,8 +142,7 @@ $result_trees{'test_allowcodebreaks'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
@@ -154,8 +152,7 @@ $result_trees{'test_allowcodebreaks'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -220,8 +217,7 @@ $result_trees{'test_allowcodebreaks'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             }
           ],
@@ -231,8 +227,7 @@ $result_trees{'test_allowcodebreaks'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -728,8 +723,7 @@ $result_trees{'test_allowcodebreaks'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 24,
-            'macro' => ''
+            'line_nr' => 24
           }
         },
         {
@@ -1539,8 +1533,7 @@ $result_trees{'test_allowcodebreaks'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             },
             {
@@ -1589,8 +1582,7 @@ $result_trees{'test_allowcodebreaks'} = {
                           'cmdname' => 'code',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 34,
-                            'macro' => ''
+                            'line_nr' => 34
                           }
                         }
                       ],
@@ -1600,8 +1592,7 @@ $result_trees{'test_allowcodebreaks'} = {
                   'cmdname' => 'w',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 34,
-                    'macro' => ''
+                    'line_nr' => 34
                   }
                 },
                 {
@@ -1639,15 +1630,13 @@ $result_trees{'test_allowcodebreaks'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 33,
-            'macro' => ''
+            'line_nr' => 33
           }
         },
         {
@@ -1685,8 +1674,7 @@ $result_trees{'test_allowcodebreaks'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 37,
-            'macro' => ''
+            'line_nr' => 37
           }
         },
         {
@@ -2154,8 +2142,7 @@ $result_trees{'test_allowcodebreaks'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
diff --git a/tp/t/results/misc_commands/text_before_and_after_bye.pl 
b/tp/t/results/misc_commands/text_before_and_after_bye.pl
index c3fb8014e3..4b37bf326f 100644
--- a/tp/t/results/misc_commands/text_before_and_after_bye.pl
+++ b/tp/t/results/misc_commands/text_before_and_after_bye.pl
@@ -63,7 +63,6 @@ $result_errors{'text_before_and_after_bye'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@bye should only appear at the beginning of a line',
     'type' => 'warning'
   }
diff --git a/tp/t/results/misc_commands/text_before_line_command.pl 
b/tp/t/results/misc_commands/text_before_line_command.pl
index 6a25a1dbc6..1596779695 100644
--- a/tp/t/results/misc_commands/text_before_line_command.pl
+++ b/tp/t/results/misc_commands/text_before_line_command.pl
@@ -39,8 +39,7 @@ $result_trees{'text_before_line_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -101,8 +100,7 @@ $result_trees{'text_before_line_command'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -148,8 +146,7 @@ $result_trees{'text_before_line_command'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -204,8 +201,7 @@ $result_trees{'text_before_line_command'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 },
                 {
@@ -243,8 +239,7 @@ $result_trees{'text_before_line_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
@@ -255,8 +250,7 @@ $result_trees{'text_before_line_command'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         }
       ],
@@ -270,8 +264,7 @@ $result_trees{'text_before_line_command'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     }
   ],
@@ -356,7 +349,6 @@ $result_errors{'text_before_line_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@title should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -365,7 +357,6 @@ $result_errors{'text_before_line_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@node should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -374,7 +365,6 @@ $result_errors{'text_before_line_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '@chapter should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -383,7 +373,6 @@ $result_errors{'text_before_line_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => '@contents should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -392,7 +381,6 @@ $result_errors{'text_before_line_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@author should only appear at the beginning of a line',
     'type' => 'warning'
   }
diff --git a/tp/t/results/moresectioning/anchor_in_footnote.pl 
b/tp/t/results/moresectioning/anchor_in_footnote.pl
index 6c7dc13b8f..b389d81689 100644
--- a/tp/t/results/moresectioning/anchor_in_footnote.pl
+++ b/tp/t/results/moresectioning/anchor_in_footnote.pl
@@ -39,8 +39,7 @@ $result_trees{'anchor_in_footnote'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -100,8 +99,7 @@ $result_trees{'anchor_in_footnote'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 5,
-                            'macro' => ''
+                            'line_nr' => 5
                           }
                         },
                         {
@@ -118,8 +116,7 @@ $result_trees{'anchor_in_footnote'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -191,8 +188,7 @@ $result_trees{'anchor_in_footnote'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -224,15 +220,13 @@ $result_trees{'anchor_in_footnote'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -249,8 +243,7 @@ $result_trees{'anchor_in_footnote'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -282,8 +275,7 @@ $result_trees{'anchor_in_footnote'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -334,8 +326,7 @@ $result_trees{'anchor_in_footnote'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -356,8 +347,7 @@ $result_trees{'anchor_in_footnote'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     }
   ],
diff --git a/tp/t/results/moresectioning/anchor_in_footnote_separate.pl 
b/tp/t/results/moresectioning/anchor_in_footnote_separate.pl
index 8b020b38e3..a9cb8df426 100644
--- a/tp/t/results/moresectioning/anchor_in_footnote_separate.pl
+++ b/tp/t/results/moresectioning/anchor_in_footnote_separate.pl
@@ -39,8 +39,7 @@ $result_trees{'anchor_in_footnote_separate'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -75,8 +74,7 @@ $result_trees{'anchor_in_footnote_separate'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -136,8 +134,7 @@ $result_trees{'anchor_in_footnote_separate'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 6,
-                            'macro' => ''
+                            'line_nr' => 6
                           }
                         },
                         {
@@ -154,8 +151,7 @@ $result_trees{'anchor_in_footnote_separate'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -227,8 +223,7 @@ $result_trees{'anchor_in_footnote_separate'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'menu_entry'
             },
@@ -260,15 +255,13 @@ $result_trees{'anchor_in_footnote_separate'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -285,8 +278,7 @@ $result_trees{'anchor_in_footnote_separate'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -318,8 +310,7 @@ $result_trees{'anchor_in_footnote_separate'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -370,8 +361,7 @@ $result_trees{'anchor_in_footnote_separate'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -392,8 +382,7 @@ $result_trees{'anchor_in_footnote_separate'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     }
   ],
diff --git 
a/tp/t/results/moresectioning/anchor_in_footnote_separate_split_node.pl 
b/tp/t/results/moresectioning/anchor_in_footnote_separate_split_node.pl
index da4967a2c5..a8461263d6 100644
--- a/tp/t/results/moresectioning/anchor_in_footnote_separate_split_node.pl
+++ b/tp/t/results/moresectioning/anchor_in_footnote_separate_split_node.pl
@@ -41,8 +41,7 @@ $result_trees{'anchor_in_footnote_separate_split_node'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -80,8 +79,7 @@ $result_trees{'anchor_in_footnote_separate_split_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -141,8 +139,7 @@ $result_trees{'anchor_in_footnote_separate_split_node'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 6,
-                            'macro' => ''
+                            'line_nr' => 6
                           }
                         },
                         {
@@ -159,8 +156,7 @@ $result_trees{'anchor_in_footnote_separate_split_node'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -232,8 +228,7 @@ $result_trees{'anchor_in_footnote_separate_split_node'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'menu_entry'
             },
@@ -265,15 +260,13 @@ $result_trees{'anchor_in_footnote_separate_split_node'} = 
{
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -290,8 +283,7 @@ $result_trees{'anchor_in_footnote_separate_split_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -323,8 +315,7 @@ $result_trees{'anchor_in_footnote_separate_split_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -375,8 +366,7 @@ $result_trees{'anchor_in_footnote_separate_split_node'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -397,8 +387,7 @@ $result_trees{'anchor_in_footnote_separate_split_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     }
   ],
diff --git a/tp/t/results/moresectioning/anchor_in_footnote_split_node.pl 
b/tp/t/results/moresectioning/anchor_in_footnote_split_node.pl
index 56c8f8526b..1730e4b317 100644
--- a/tp/t/results/moresectioning/anchor_in_footnote_split_node.pl
+++ b/tp/t/results/moresectioning/anchor_in_footnote_split_node.pl
@@ -44,8 +44,7 @@ $result_trees{'anchor_in_footnote_split_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -105,8 +104,7 @@ $result_trees{'anchor_in_footnote_split_node'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 5,
-                            'macro' => ''
+                            'line_nr' => 5
                           }
                         },
                         {
@@ -123,8 +121,7 @@ $result_trees{'anchor_in_footnote_split_node'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -196,8 +193,7 @@ $result_trees{'anchor_in_footnote_split_node'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -229,15 +225,13 @@ $result_trees{'anchor_in_footnote_split_node'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -254,8 +248,7 @@ $result_trees{'anchor_in_footnote_split_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -287,8 +280,7 @@ $result_trees{'anchor_in_footnote_split_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -339,8 +331,7 @@ $result_trees{'anchor_in_footnote_split_node'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -361,8 +352,7 @@ $result_trees{'anchor_in_footnote_split_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     }
   ],
diff --git a/tp/t/results/moresectioning/chapter_sections.pl 
b/tp/t/results/moresectioning/chapter_sections.pl
index 38780f1240..cc517561ca 100644
--- a/tp/t/results/moresectioning/chapter_sections.pl
+++ b/tp/t/results/moresectioning/chapter_sections.pl
@@ -40,8 +40,7 @@ $result_trees{'chapter_sections'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     'unit_contents' => [
@@ -88,8 +87,7 @@ $result_trees{'chapter_sections'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     'unit_contents' => [
@@ -133,8 +131,7 @@ $result_trees{'chapter_sections'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     'unit_contents' => [
@@ -178,8 +175,7 @@ $result_trees{'chapter_sections'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     'unit_contents' => [
@@ -223,8 +219,7 @@ $result_trees{'chapter_sections'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     'unit_contents' => [
@@ -268,8 +263,7 @@ $result_trees{'chapter_sections'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     'unit_contents' => [
@@ -313,8 +307,7 @@ $result_trees{'chapter_sections'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     'unit_contents' => [
@@ -351,8 +344,7 @@ $result_trees{'chapter_sections'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     'unit_contents' => [
diff --git a/tp/t/results/moresectioning/character_and_spaces_in_refs.pl 
b/tp/t/results/moresectioning/character_and_spaces_in_refs.pl
index e6395d6954..816b330678 100644
--- a/tp/t/results/moresectioning/character_and_spaces_in_refs.pl
+++ b/tp/t/results/moresectioning/character_and_spaces_in_refs.pl
@@ -44,8 +44,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'character_and_spaces_in_refs_text.texi',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -129,8 +128,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => 'character_and_spaces_in_refs_text.texi',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -177,8 +175,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => 'character_and_spaces_in_refs_text.texi',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -210,15 +207,13 @@ $result_trees{'character_and_spaces_in_refs'} = {
               },
               'source_info' => {
                 'file_name' => 'character_and_spaces_in_refs_text.texi',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => 'character_and_spaces_in_refs_text.texi',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -235,8 +230,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'character_and_spaces_in_refs_text.texi',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -268,8 +262,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'character_and_spaces_in_refs_text.texi',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -321,8 +314,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
           },
           'source_info' => {
             'file_name' => 'character_and_spaces_in_refs_text.texi',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           }
         },
         {
@@ -380,8 +372,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'character_and_spaces_in_refs_text.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -423,8 +414,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'character_and_spaces_in_refs_text.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -479,8 +469,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'character_and_spaces_in_refs_text.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -522,8 +511,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'character_and_spaces_in_refs_text.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -570,8 +558,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'character_and_spaces_in_refs_text.texi',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -611,8 +598,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
           },
           'source_info' => {
             'file_name' => 'character_and_spaces_in_refs_text.texi',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
@@ -644,8 +630,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'character_and_spaces_in_refs_text.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -674,8 +659,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'character_and_spaces_in_refs_text.texi',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -709,8 +693,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'character_and_spaces_in_refs_text.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -744,8 +727,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'character_and_spaces_in_refs_text.texi',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               }
             },
             {
@@ -771,8 +753,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'character_and_spaces_in_refs_text.texi',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -865,8 +846,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'character_and_spaces_in_refs_text.texi',
-        'line_nr' => 27,
-        'macro' => ''
+        'line_nr' => 27
       }
     },
     {
@@ -950,8 +930,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => 'character_and_spaces_in_refs_text.texi',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               },
               'type' => 'menu_entry'
             },
@@ -998,8 +977,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => 'character_and_spaces_in_refs_text.texi',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               },
               'type' => 'menu_entry'
             },
@@ -1046,8 +1024,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
               ],
               'source_info' => {
                 'file_name' => 'character_and_spaces_in_refs_text.texi',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               },
               'type' => 'menu_entry'
             },
@@ -1079,15 +1056,13 @@ $result_trees{'character_and_spaces_in_refs'} = {
               },
               'source_info' => {
                 'file_name' => 'character_and_spaces_in_refs_text.texi',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             }
           ],
           'source_info' => {
             'file_name' => 'character_and_spaces_in_refs_text.texi',
-            'line_nr' => 30,
-            'macro' => ''
+            'line_nr' => 30
           }
         },
         {
@@ -1106,8 +1081,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'character_and_spaces_in_refs_text.texi',
-        'line_nr' => 28,
-        'macro' => ''
+        'line_nr' => 28
       }
     },
     {
@@ -1207,8 +1181,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'character_and_spaces_in_refs_text.texi',
-        'line_nr' => 36,
-        'macro' => ''
+        'line_nr' => 36
       }
     },
     {
@@ -1298,8 +1271,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'character_and_spaces_in_refs_text.texi',
-        'line_nr' => 38,
-        'macro' => ''
+        'line_nr' => 38
       }
     },
     {
@@ -1373,8 +1345,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
       },
       'source_info' => {
         'file_name' => 'character_and_spaces_in_refs_text.texi',
-        'line_nr' => 40,
-        'macro' => ''
+        'line_nr' => 40
       }
     },
     {
@@ -1824,7 +1795,6 @@ 
$result_converted_errors{'info'}->{'character_and_spaces_in_refs'} = [
 ',
     'file_name' => 'character_and_spaces_in_refs_text.texi',
     'line_nr' => 15,
-    'macro' => '',
     'text' => '@ref node name should not contain `:\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/moresectioning/character_and_spaces_in_refs_out.pl 
b/tp/t/results/moresectioning/character_and_spaces_in_refs_out.pl
index fd9caf906a..3b4e955e61 100644
--- a/tp/t/results/moresectioning/character_and_spaces_in_refs_out.pl
+++ b/tp/t/results/moresectioning/character_and_spaces_in_refs_out.pl
@@ -36,8 +36,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
       },
       'source_info' => {
         'file_name' => 'character_and_spaces_in_refs_text.texi',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     'unit_contents' => [
@@ -131,8 +130,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                 ],
                 'source_info' => {
                   'file_name' => 'character_and_spaces_in_refs_text.texi',
-                  'line_nr' => 5,
-                  'macro' => ''
+                  'line_nr' => 5
                 },
                 'type' => 'menu_entry'
               },
@@ -179,8 +177,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                 ],
                 'source_info' => {
                   'file_name' => 'character_and_spaces_in_refs_text.texi',
-                  'line_nr' => 6,
-                  'macro' => ''
+                  'line_nr' => 6
                 },
                 'type' => 'menu_entry'
               },
@@ -212,15 +209,13 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                 },
                 'source_info' => {
                   'file_name' => 'character_and_spaces_in_refs_text.texi',
-                  'line_nr' => 7,
-                  'macro' => ''
+                  'line_nr' => 7
                 }
               }
             ],
             'source_info' => {
               'file_name' => 'character_and_spaces_in_refs_text.texi',
-              'line_nr' => 4,
-              'macro' => ''
+              'line_nr' => 4
             }
           },
           {
@@ -237,8 +232,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
         },
         'source_info' => {
           'file_name' => 'character_and_spaces_in_refs_text.texi',
-          'line_nr' => 2,
-          'macro' => ''
+          'line_nr' => 2
         }
       }
     ],
@@ -274,8 +268,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
       },
       'source_info' => {
         'file_name' => 'character_and_spaces_in_refs_text.texi',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     'unit_contents' => [
@@ -329,8 +322,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
             },
             'source_info' => {
               'file_name' => 'character_and_spaces_in_refs_text.texi',
-              'line_nr' => 12,
-              'macro' => ''
+              'line_nr' => 12
             }
           },
           {
@@ -388,8 +380,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                 'cmdname' => 'ref',
                 'source_info' => {
                   'file_name' => 'character_and_spaces_in_refs_text.texi',
-                  'line_nr' => 14,
-                  'macro' => ''
+                  'line_nr' => 14
                 }
               },
               {
@@ -431,8 +422,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                 'cmdname' => 'ref',
                 'source_info' => {
                   'file_name' => 'character_and_spaces_in_refs_text.texi',
-                  'line_nr' => 15,
-                  'macro' => ''
+                  'line_nr' => 15
                 }
               },
               {
@@ -487,8 +477,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                 'cmdname' => 'ref',
                 'source_info' => {
                   'file_name' => 'character_and_spaces_in_refs_text.texi',
-                  'line_nr' => 16,
-                  'macro' => ''
+                  'line_nr' => 16
                 }
               },
               {
@@ -530,8 +519,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                 'cmdname' => 'ref',
                 'source_info' => {
                   'file_name' => 'character_and_spaces_in_refs_text.texi',
-                  'line_nr' => 17,
-                  'macro' => ''
+                  'line_nr' => 17
                 }
               },
               {
@@ -578,8 +566,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                 'cmdname' => 'ref',
                 'source_info' => {
                   'file_name' => 'character_and_spaces_in_refs_text.texi',
-                  'line_nr' => 18,
-                  'macro' => ''
+                  'line_nr' => 18
                 }
               },
               {
@@ -619,8 +606,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
             },
             'source_info' => {
               'file_name' => 'character_and_spaces_in_refs_text.texi',
-              'line_nr' => 20,
-              'macro' => ''
+              'line_nr' => 20
             }
           },
           {
@@ -652,8 +638,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                 'cmdname' => 'ref',
                 'source_info' => {
                   'file_name' => 'character_and_spaces_in_refs_text.texi',
-                  'line_nr' => 22,
-                  'macro' => ''
+                  'line_nr' => 22
                 }
               },
               {
@@ -682,8 +667,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                 'cmdname' => 'ref',
                 'source_info' => {
                   'file_name' => 'character_and_spaces_in_refs_text.texi',
-                  'line_nr' => 23,
-                  'macro' => ''
+                  'line_nr' => 23
                 }
               },
               {
@@ -717,8 +701,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                 'cmdname' => 'ref',
                 'source_info' => {
                   'file_name' => 'character_and_spaces_in_refs_text.texi',
-                  'line_nr' => 24,
-                  'macro' => ''
+                  'line_nr' => 24
                 }
               },
               {
@@ -752,8 +735,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                 'cmdname' => 'ref',
                 'source_info' => {
                   'file_name' => 'character_and_spaces_in_refs_text.texi',
-                  'line_nr' => 25,
-                  'macro' => ''
+                  'line_nr' => 25
                 }
               },
               {
@@ -779,8 +761,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
         },
         'source_info' => {
           'file_name' => 'character_and_spaces_in_refs_text.texi',
-          'line_nr' => 10,
-          'macro' => ''
+          'line_nr' => 10
         }
       }
     ],
@@ -877,8 +858,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
       },
       'source_info' => {
         'file_name' => 'character_and_spaces_in_refs_text.texi',
-        'line_nr' => 27,
-        'macro' => ''
+        'line_nr' => 27
       }
     },
     'unit_contents' => [
@@ -964,8 +944,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                 ],
                 'source_info' => {
                   'file_name' => 'character_and_spaces_in_refs_text.texi',
-                  'line_nr' => 31,
-                  'macro' => ''
+                  'line_nr' => 31
                 },
                 'type' => 'menu_entry'
               },
@@ -1012,8 +991,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                 ],
                 'source_info' => {
                   'file_name' => 'character_and_spaces_in_refs_text.texi',
-                  'line_nr' => 32,
-                  'macro' => ''
+                  'line_nr' => 32
                 },
                 'type' => 'menu_entry'
               },
@@ -1060,8 +1038,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                 ],
                 'source_info' => {
                   'file_name' => 'character_and_spaces_in_refs_text.texi',
-                  'line_nr' => 33,
-                  'macro' => ''
+                  'line_nr' => 33
                 },
                 'type' => 'menu_entry'
               },
@@ -1093,15 +1070,13 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                 },
                 'source_info' => {
                   'file_name' => 'character_and_spaces_in_refs_text.texi',
-                  'line_nr' => 34,
-                  'macro' => ''
+                  'line_nr' => 34
                 }
               }
             ],
             'source_info' => {
               'file_name' => 'character_and_spaces_in_refs_text.texi',
-              'line_nr' => 30,
-              'macro' => ''
+              'line_nr' => 30
             }
           },
           {
@@ -1120,8 +1095,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
         },
         'source_info' => {
           'file_name' => 'character_and_spaces_in_refs_text.texi',
-          'line_nr' => 28,
-          'macro' => ''
+          'line_nr' => 28
         }
       }
     ],
@@ -1225,8 +1199,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
       },
       'source_info' => {
         'file_name' => 'character_and_spaces_in_refs_text.texi',
-        'line_nr' => 36,
-        'macro' => ''
+        'line_nr' => 36
       }
     },
     'unit_contents' => [
@@ -1322,8 +1295,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
       },
       'source_info' => {
         'file_name' => 'character_and_spaces_in_refs_text.texi',
-        'line_nr' => 38,
-        'macro' => ''
+        'line_nr' => 38
       }
     },
     'unit_contents' => [
@@ -1403,8 +1375,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
       },
       'source_info' => {
         'file_name' => 'character_and_spaces_in_refs_text.texi',
-        'line_nr' => 40,
-        'macro' => ''
+        'line_nr' => 40
       }
     },
     'unit_contents' => [
diff --git a/tp/t/results/moresectioning/complex.pl 
b/tp/t/results/moresectioning/complex.pl
index 36eb2d7e2a..449831338b 100644
--- a/tp/t/results/moresectioning/complex.pl
+++ b/tp/t/results/moresectioning/complex.pl
@@ -78,8 +78,7 @@ $result_trees{'complex'} = [
               ],
               'source_info' => {
                 'file_name' => 'complex_sectioning_case.texi',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -126,8 +125,7 @@ $result_trees{'complex'} = [
               ],
               'source_info' => {
                 'file_name' => 'complex_sectioning_case.texi',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -174,8 +172,7 @@ $result_trees{'complex'} = [
               ],
               'source_info' => {
                 'file_name' => 'complex_sectioning_case.texi',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -222,8 +219,7 @@ $result_trees{'complex'} = [
               ],
               'source_info' => {
                 'file_name' => 'complex_sectioning_case.texi',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -270,8 +266,7 @@ $result_trees{'complex'} = [
               ],
               'source_info' => {
                 'file_name' => 'complex_sectioning_case.texi',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               },
               'type' => 'menu_entry'
             },
@@ -318,8 +313,7 @@ $result_trees{'complex'} = [
               ],
               'source_info' => {
                 'file_name' => 'complex_sectioning_case.texi',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -351,15 +345,13 @@ $result_trees{'complex'} = [
               },
               'source_info' => {
                 'file_name' => 'complex_sectioning_case.texi',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
           'source_info' => {
             'file_name' => 'complex_sectioning_case.texi',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -371,8 +363,7 @@ $result_trees{'complex'} = [
       'extra' => {},
       'source_info' => {
         'file_name' => 'complex_sectioning_case.texi',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     'unit_contents' => [
@@ -450,8 +441,7 @@ $result_trees{'complex'} = [
         },
         'source_info' => {
           'file_name' => 'complex_sectioning_case.texi',
-          'line_nr' => 1,
-          'macro' => ''
+          'line_nr' => 1
         }
       },
       {}
@@ -549,8 +539,7 @@ $result_trees{'complex'} = [
               ],
               'source_info' => {
                 'file_name' => 'complex_sectioning_case.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               },
               'type' => 'menu_entry'
             },
@@ -597,8 +586,7 @@ $result_trees{'complex'} = [
               ],
               'source_info' => {
                 'file_name' => 'complex_sectioning_case.texi',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               },
               'type' => 'menu_entry'
             },
@@ -645,8 +633,7 @@ $result_trees{'complex'} = [
               ],
               'source_info' => {
                 'file_name' => 'complex_sectioning_case.texi',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               },
               'type' => 'menu_entry'
             },
@@ -693,15 +680,13 @@ $result_trees{'complex'} = [
               },
               'source_info' => {
                 'file_name' => 'complex_sectioning_case.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             }
           ],
           'source_info' => {
             'file_name' => 'complex_sectioning_case.texi',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           }
         },
         {
@@ -720,8 +705,7 @@ $result_trees{'complex'} = [
       },
       'source_info' => {
         'file_name' => 'complex_sectioning_case.texi',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     'unit_contents' => [
@@ -789,8 +773,7 @@ $result_trees{'complex'} = [
         },
         'source_info' => {
           'file_name' => 'complex_sectioning_case.texi',
-          'line_nr' => 12,
-          'macro' => ''
+          'line_nr' => 12
         }
       },
       {}
@@ -879,8 +862,7 @@ $result_trees{'complex'} = [
               ],
               'source_info' => {
                 'file_name' => 'complex_sectioning_case.texi',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               },
               'type' => 'menu_entry'
             },
@@ -927,8 +909,7 @@ $result_trees{'complex'} = [
               ],
               'source_info' => {
                 'file_name' => 'complex_sectioning_case.texi',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               },
               'type' => 'menu_entry'
             },
@@ -975,8 +956,7 @@ $result_trees{'complex'} = [
               ],
               'source_info' => {
                 'file_name' => 'complex_sectioning_case.texi',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               },
               'type' => 'menu_entry'
             },
@@ -1023,8 +1003,7 @@ $result_trees{'complex'} = [
               ],
               'source_info' => {
                 'file_name' => 'complex_sectioning_case.texi',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               },
               'type' => 'menu_entry'
             },
@@ -1056,15 +1035,13 @@ $result_trees{'complex'} = [
               },
               'source_info' => {
                 'file_name' => 'complex_sectioning_case.texi',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               }
             }
           ],
           'source_info' => {
             'file_name' => 'complex_sectioning_case.texi',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         },
         {
@@ -1081,8 +1058,7 @@ $result_trees{'complex'} = [
       },
       'source_info' => {
         'file_name' => 'complex_sectioning_case.texi',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     'unit_contents' => [
@@ -1115,8 +1091,7 @@ $result_trees{'complex'} = [
         },
         'source_info' => {
           'file_name' => 'complex_sectioning_case.texi',
-          'line_nr' => 23,
-          'macro' => ''
+          'line_nr' => 23
         }
       },
       {}
@@ -1157,8 +1132,7 @@ $result_trees{'complex'} = [
       },
       'source_info' => {
         'file_name' => 'complex_sectioning_case.texi',
-        'line_nr' => 34,
-        'macro' => ''
+        'line_nr' => 34
       }
     },
     'unit_contents' => [
@@ -1191,8 +1165,7 @@ $result_trees{'complex'} = [
         },
         'source_info' => {
           'file_name' => 'complex_sectioning_case.texi',
-          'line_nr' => 33,
-          'macro' => ''
+          'line_nr' => 33
         }
       },
       {}
@@ -1233,8 +1206,7 @@ $result_trees{'complex'} = [
       },
       'source_info' => {
         'file_name' => 'complex_sectioning_case.texi',
-        'line_nr' => 37,
-        'macro' => ''
+        'line_nr' => 37
       }
     },
     'unit_contents' => [
@@ -1267,8 +1239,7 @@ $result_trees{'complex'} = [
         },
         'source_info' => {
           'file_name' => 'complex_sectioning_case.texi',
-          'line_nr' => 36,
-          'macro' => ''
+          'line_nr' => 36
         }
       },
       {}
@@ -1309,8 +1280,7 @@ $result_trees{'complex'} = [
       },
       'source_info' => {
         'file_name' => 'complex_sectioning_case.texi',
-        'line_nr' => 40,
-        'macro' => ''
+        'line_nr' => 40
       }
     },
     'unit_contents' => [
@@ -1343,8 +1313,7 @@ $result_trees{'complex'} = [
         },
         'source_info' => {
           'file_name' => 'complex_sectioning_case.texi',
-          'line_nr' => 39,
-          'macro' => ''
+          'line_nr' => 39
         }
       },
       {}
@@ -1385,8 +1354,7 @@ $result_trees{'complex'} = [
       },
       'source_info' => {
         'file_name' => 'complex_sectioning_case.texi',
-        'line_nr' => 43,
-        'macro' => ''
+        'line_nr' => 43
       }
     },
     'unit_contents' => [
@@ -1419,8 +1387,7 @@ $result_trees{'complex'} = [
         },
         'source_info' => {
           'file_name' => 'complex_sectioning_case.texi',
-          'line_nr' => 42,
-          'macro' => ''
+          'line_nr' => 42
         }
       },
       {}
@@ -1509,8 +1476,7 @@ $result_trees{'complex'} = [
               ],
               'source_info' => {
                 'file_name' => 'complex_sectioning_case.texi',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               },
               'type' => 'menu_entry'
             },
@@ -1542,15 +1508,13 @@ $result_trees{'complex'} = [
               },
               'source_info' => {
                 'file_name' => 'complex_sectioning_case.texi',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             }
           ],
           'source_info' => {
             'file_name' => 'complex_sectioning_case.texi',
-            'line_nr' => 48,
-            'macro' => ''
+            'line_nr' => 48
           }
         },
         {
@@ -1567,8 +1531,7 @@ $result_trees{'complex'} = [
       },
       'source_info' => {
         'file_name' => 'complex_sectioning_case.texi',
-        'line_nr' => 46,
-        'macro' => ''
+        'line_nr' => 46
       }
     },
     'unit_contents' => [
@@ -1601,8 +1564,7 @@ $result_trees{'complex'} = [
         },
         'source_info' => {
           'file_name' => 'complex_sectioning_case.texi',
-          'line_nr' => 45,
-          'macro' => ''
+          'line_nr' => 45
         }
       },
       {}
@@ -1648,8 +1610,7 @@ $result_trees{'complex'} = [
       },
       'source_info' => {
         'file_name' => 'complex_sectioning_case.texi',
-        'line_nr' => 53,
-        'macro' => ''
+        'line_nr' => 53
       }
     },
     'unit_contents' => [
@@ -1682,8 +1643,7 @@ $result_trees{'complex'} = [
         },
         'source_info' => {
           'file_name' => 'complex_sectioning_case.texi',
-          'line_nr' => 52,
-          'macro' => ''
+          'line_nr' => 52
         }
       },
       {}
@@ -1726,8 +1686,7 @@ $result_trees{'complex'} = [
       },
       'source_info' => {
         'file_name' => 'complex_sectioning_case.texi',
-        'line_nr' => 57,
-        'macro' => ''
+        'line_nr' => 57
       }
     },
     'unit_contents' => [
@@ -1760,8 +1719,7 @@ $result_trees{'complex'} = [
         },
         'source_info' => {
           'file_name' => 'complex_sectioning_case.texi',
-          'line_nr' => 56,
-          'macro' => ''
+          'line_nr' => 56
         }
       },
       {},
@@ -1837,8 +1795,7 @@ $result_trees{'complex'} = [
         },
         'source_info' => {
           'file_name' => 'complex_sectioning_case.texi',
-          'line_nr' => 59,
-          'macro' => ''
+          'line_nr' => 59
         }
       }
     ],
@@ -1894,8 +1851,7 @@ $result_trees{'complex'} = [
       },
       'source_info' => {
         'file_name' => 'complex_sectioning_case.texi',
-        'line_nr' => 67,
-        'macro' => ''
+        'line_nr' => 67
       }
     },
     'unit_contents' => [
@@ -1984,8 +1940,7 @@ $result_trees{'complex'} = [
         },
         'source_info' => {
           'file_name' => 'complex_sectioning_case.texi',
-          'line_nr' => 63,
-          'macro' => ''
+          'line_nr' => 63
         }
       },
       {}
@@ -2040,8 +1995,7 @@ $result_trees{'complex'} = [
       },
       'source_info' => {
         'file_name' => 'complex_sectioning_case.texi',
-        'line_nr' => 72,
-        'macro' => ''
+        'line_nr' => 72
       }
     },
     'unit_contents' => [
@@ -2074,8 +2028,7 @@ $result_trees{'complex'} = [
         },
         'source_info' => {
           'file_name' => 'complex_sectioning_case.texi',
-          'line_nr' => 71,
-          'macro' => ''
+          'line_nr' => 71
         }
       },
       {}
@@ -2134,8 +2087,7 @@ $result_trees{'complex'} = [
       },
       'source_info' => {
         'file_name' => 'complex_sectioning_case.texi',
-        'line_nr' => 77,
-        'macro' => ''
+        'line_nr' => 77
       }
     },
     'unit_contents' => [
@@ -2229,8 +2181,7 @@ $result_trees{'complex'} = [
         },
         'source_info' => {
           'file_name' => 'complex_sectioning_case.texi',
-          'line_nr' => 76,
-          'macro' => ''
+          'line_nr' => 76
         }
       },
       {},
@@ -2304,8 +2255,7 @@ $result_trees{'complex'} = [
             'cmdname' => 'contents',
             'source_info' => {
               'file_name' => 'complex_sectioning_case.texi',
-              'line_nr' => 84,
-              'macro' => ''
+              'line_nr' => 84
             }
           }
         ],
@@ -2320,8 +2270,7 @@ $result_trees{'complex'} = [
         },
         'source_info' => {
           'file_name' => 'complex_sectioning_case.texi',
-          'line_nr' => 82,
-          'macro' => ''
+          'line_nr' => 82
         }
       },
       {
diff --git a/tp/t/results/moresectioning/complex_split_at_node.pl 
b/tp/t/results/moresectioning/complex_split_at_node.pl
index fb66a35120..cf2dd96880 100644
--- a/tp/t/results/moresectioning/complex_split_at_node.pl
+++ b/tp/t/results/moresectioning/complex_split_at_node.pl
@@ -73,8 +73,7 @@ $result_trees{'complex_split_at_node'} = [
       },
       'source_info' => {
         'file_name' => 'complex_sectioning_case.texi',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     'unit_contents' => [
@@ -158,8 +157,7 @@ $result_trees{'complex_split_at_node'} = [
                 ],
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
-                  'line_nr' => 4,
-                  'macro' => ''
+                  'line_nr' => 4
                 },
                 'type' => 'menu_entry'
               },
@@ -206,8 +204,7 @@ $result_trees{'complex_split_at_node'} = [
                 ],
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
-                  'line_nr' => 5,
-                  'macro' => ''
+                  'line_nr' => 5
                 },
                 'type' => 'menu_entry'
               },
@@ -254,8 +251,7 @@ $result_trees{'complex_split_at_node'} = [
                 ],
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
-                  'line_nr' => 6,
-                  'macro' => ''
+                  'line_nr' => 6
                 },
                 'type' => 'menu_entry'
               },
@@ -302,8 +298,7 @@ $result_trees{'complex_split_at_node'} = [
                 ],
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
-                  'line_nr' => 7,
-                  'macro' => ''
+                  'line_nr' => 7
                 },
                 'type' => 'menu_entry'
               },
@@ -350,8 +345,7 @@ $result_trees{'complex_split_at_node'} = [
                 ],
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
-                  'line_nr' => 8,
-                  'macro' => ''
+                  'line_nr' => 8
                 },
                 'type' => 'menu_entry'
               },
@@ -398,8 +392,7 @@ $result_trees{'complex_split_at_node'} = [
                 ],
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
-                  'line_nr' => 9,
-                  'macro' => ''
+                  'line_nr' => 9
                 },
                 'type' => 'menu_entry'
               },
@@ -431,15 +424,13 @@ $result_trees{'complex_split_at_node'} = [
                 },
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
-                  'line_nr' => 10,
-                  'macro' => ''
+                  'line_nr' => 10
                 }
               }
             ],
             'source_info' => {
               'file_name' => 'complex_sectioning_case.texi',
-              'line_nr' => 3,
-              'macro' => ''
+              'line_nr' => 3
             }
           },
           {
@@ -451,8 +442,7 @@ $result_trees{'complex_split_at_node'} = [
         'extra' => {},
         'source_info' => {
           'file_name' => 'complex_sectioning_case.texi',
-          'line_nr' => 2,
-          'macro' => ''
+          'line_nr' => 2
         }
       }
     ],
@@ -523,8 +513,7 @@ $result_trees{'complex_split_at_node'} = [
       },
       'source_info' => {
         'file_name' => 'complex_sectioning_case.texi',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     'unit_contents' => [
@@ -619,8 +608,7 @@ $result_trees{'complex_split_at_node'} = [
                 ],
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
-                  'line_nr' => 17,
-                  'macro' => ''
+                  'line_nr' => 17
                 },
                 'type' => 'menu_entry'
               },
@@ -667,8 +655,7 @@ $result_trees{'complex_split_at_node'} = [
                 ],
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
-                  'line_nr' => 18,
-                  'macro' => ''
+                  'line_nr' => 18
                 },
                 'type' => 'menu_entry'
               },
@@ -715,8 +702,7 @@ $result_trees{'complex_split_at_node'} = [
                 ],
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
-                  'line_nr' => 19,
-                  'macro' => ''
+                  'line_nr' => 19
                 },
                 'type' => 'menu_entry'
               },
@@ -763,15 +749,13 @@ $result_trees{'complex_split_at_node'} = [
                 },
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
-                  'line_nr' => 21,
-                  'macro' => ''
+                  'line_nr' => 21
                 }
               }
             ],
             'source_info' => {
               'file_name' => 'complex_sectioning_case.texi',
-              'line_nr' => 16,
-              'macro' => ''
+              'line_nr' => 16
             }
           },
           {
@@ -790,8 +774,7 @@ $result_trees{'complex_split_at_node'} = [
         },
         'source_info' => {
           'file_name' => 'complex_sectioning_case.texi',
-          'line_nr' => 13,
-          'macro' => ''
+          'line_nr' => 13
         }
       }
     ],
@@ -827,8 +810,7 @@ $result_trees{'complex_split_at_node'} = [
       },
       'source_info' => {
         'file_name' => 'complex_sectioning_case.texi',
-        'line_nr' => 23,
-        'macro' => ''
+        'line_nr' => 23
       }
     },
     'unit_contents' => [
@@ -914,8 +896,7 @@ $result_trees{'complex_split_at_node'} = [
                 ],
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
-                  'line_nr' => 27,
-                  'macro' => ''
+                  'line_nr' => 27
                 },
                 'type' => 'menu_entry'
               },
@@ -962,8 +943,7 @@ $result_trees{'complex_split_at_node'} = [
                 ],
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
-                  'line_nr' => 28,
-                  'macro' => ''
+                  'line_nr' => 28
                 },
                 'type' => 'menu_entry'
               },
@@ -1010,8 +990,7 @@ $result_trees{'complex_split_at_node'} = [
                 ],
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
-                  'line_nr' => 29,
-                  'macro' => ''
+                  'line_nr' => 29
                 },
                 'type' => 'menu_entry'
               },
@@ -1058,8 +1037,7 @@ $result_trees{'complex_split_at_node'} = [
                 ],
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
-                  'line_nr' => 30,
-                  'macro' => ''
+                  'line_nr' => 30
                 },
                 'type' => 'menu_entry'
               },
@@ -1091,15 +1069,13 @@ $result_trees{'complex_split_at_node'} = [
                 },
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
-                  'line_nr' => 31,
-                  'macro' => ''
+                  'line_nr' => 31
                 }
               }
             ],
             'source_info' => {
               'file_name' => 'complex_sectioning_case.texi',
-              'line_nr' => 26,
-              'macro' => ''
+              'line_nr' => 26
             }
           },
           {
@@ -1116,8 +1092,7 @@ $result_trees{'complex_split_at_node'} = [
         },
         'source_info' => {
           'file_name' => 'complex_sectioning_case.texi',
-          'line_nr' => 24,
-          'macro' => ''
+          'line_nr' => 24
         }
       }
     ],
@@ -1153,8 +1128,7 @@ $result_trees{'complex_split_at_node'} = [
       },
       'source_info' => {
         'file_name' => 'complex_sectioning_case.texi',
-        'line_nr' => 33,
-        'macro' => ''
+        'line_nr' => 33
       }
     },
     'unit_contents' => [
@@ -1192,8 +1166,7 @@ $result_trees{'complex_split_at_node'} = [
         },
         'source_info' => {
           'file_name' => 'complex_sectioning_case.texi',
-          'line_nr' => 34,
-          'macro' => ''
+          'line_nr' => 34
         }
       }
     ],
@@ -1229,8 +1202,7 @@ $result_trees{'complex_split_at_node'} = [
       },
       'source_info' => {
         'file_name' => 'complex_sectioning_case.texi',
-        'line_nr' => 36,
-        'macro' => ''
+        'line_nr' => 36
       }
     },
     'unit_contents' => [
@@ -1268,8 +1240,7 @@ $result_trees{'complex_split_at_node'} = [
         },
         'source_info' => {
           'file_name' => 'complex_sectioning_case.texi',
-          'line_nr' => 37,
-          'macro' => ''
+          'line_nr' => 37
         }
       }
     ],
@@ -1305,8 +1276,7 @@ $result_trees{'complex_split_at_node'} = [
       },
       'source_info' => {
         'file_name' => 'complex_sectioning_case.texi',
-        'line_nr' => 39,
-        'macro' => ''
+        'line_nr' => 39
       }
     },
     'unit_contents' => [
@@ -1344,8 +1314,7 @@ $result_trees{'complex_split_at_node'} = [
         },
         'source_info' => {
           'file_name' => 'complex_sectioning_case.texi',
-          'line_nr' => 40,
-          'macro' => ''
+          'line_nr' => 40
         }
       }
     ],
@@ -1381,8 +1350,7 @@ $result_trees{'complex_split_at_node'} = [
       },
       'source_info' => {
         'file_name' => 'complex_sectioning_case.texi',
-        'line_nr' => 42,
-        'macro' => ''
+        'line_nr' => 42
       }
     },
     'unit_contents' => [
@@ -1420,8 +1388,7 @@ $result_trees{'complex_split_at_node'} = [
         },
         'source_info' => {
           'file_name' => 'complex_sectioning_case.texi',
-          'line_nr' => 43,
-          'macro' => ''
+          'line_nr' => 43
         }
       }
     ],
@@ -1457,8 +1424,7 @@ $result_trees{'complex_split_at_node'} = [
       },
       'source_info' => {
         'file_name' => 'complex_sectioning_case.texi',
-        'line_nr' => 45,
-        'macro' => ''
+        'line_nr' => 45
       }
     },
     'unit_contents' => [
@@ -1544,8 +1510,7 @@ $result_trees{'complex_split_at_node'} = [
                 ],
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
-                  'line_nr' => 49,
-                  'macro' => ''
+                  'line_nr' => 49
                 },
                 'type' => 'menu_entry'
               },
@@ -1577,15 +1542,13 @@ $result_trees{'complex_split_at_node'} = [
                 },
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
-                  'line_nr' => 50,
-                  'macro' => ''
+                  'line_nr' => 50
                 }
               }
             ],
             'source_info' => {
               'file_name' => 'complex_sectioning_case.texi',
-              'line_nr' => 48,
-              'macro' => ''
+              'line_nr' => 48
             }
           },
           {
@@ -1602,8 +1565,7 @@ $result_trees{'complex_split_at_node'} = [
         },
         'source_info' => {
           'file_name' => 'complex_sectioning_case.texi',
-          'line_nr' => 46,
-          'macro' => ''
+          'line_nr' => 46
         }
       }
     ],
@@ -1639,8 +1601,7 @@ $result_trees{'complex_split_at_node'} = [
       },
       'source_info' => {
         'file_name' => 'complex_sectioning_case.texi',
-        'line_nr' => 52,
-        'macro' => ''
+        'line_nr' => 52
       }
     },
     'unit_contents' => [
@@ -1683,8 +1644,7 @@ $result_trees{'complex_split_at_node'} = [
         },
         'source_info' => {
           'file_name' => 'complex_sectioning_case.texi',
-          'line_nr' => 53,
-          'macro' => ''
+          'line_nr' => 53
         }
       }
     ],
@@ -1720,8 +1680,7 @@ $result_trees{'complex_split_at_node'} = [
       },
       'source_info' => {
         'file_name' => 'complex_sectioning_case.texi',
-        'line_nr' => 56,
-        'macro' => ''
+        'line_nr' => 56
       }
     },
     'unit_contents' => [
@@ -1761,8 +1720,7 @@ $result_trees{'complex_split_at_node'} = [
         },
         'source_info' => {
           'file_name' => 'complex_sectioning_case.texi',
-          'line_nr' => 57,
-          'macro' => ''
+          'line_nr' => 57
         }
       }
     ],
@@ -1841,8 +1799,7 @@ $result_trees{'complex_split_at_node'} = [
       },
       'source_info' => {
         'file_name' => 'complex_sectioning_case.texi',
-        'line_nr' => 59,
-        'macro' => ''
+        'line_nr' => 59
       }
     },
     'unit_contents' => [
@@ -1936,8 +1893,7 @@ $result_trees{'complex_split_at_node'} = [
       },
       'source_info' => {
         'file_name' => 'complex_sectioning_case.texi',
-        'line_nr' => 63,
-        'macro' => ''
+        'line_nr' => 63
       }
     },
     'unit_contents' => [
@@ -1991,8 +1947,7 @@ $result_trees{'complex_split_at_node'} = [
         },
         'source_info' => {
           'file_name' => 'complex_sectioning_case.texi',
-          'line_nr' => 67,
-          'macro' => ''
+          'line_nr' => 67
         }
       }
     ],
@@ -2028,8 +1983,7 @@ $result_trees{'complex_split_at_node'} = [
       },
       'source_info' => {
         'file_name' => 'complex_sectioning_case.texi',
-        'line_nr' => 71,
-        'macro' => ''
+        'line_nr' => 71
       }
     },
     'unit_contents' => [
@@ -2081,8 +2035,7 @@ $result_trees{'complex_split_at_node'} = [
         },
         'source_info' => {
           'file_name' => 'complex_sectioning_case.texi',
-          'line_nr' => 72,
-          'macro' => ''
+          'line_nr' => 72
         }
       }
     ],
@@ -2179,8 +2132,7 @@ $result_trees{'complex_split_at_node'} = [
       },
       'source_info' => {
         'file_name' => 'complex_sectioning_case.texi',
-        'line_nr' => 76,
-        'macro' => ''
+        'line_nr' => 76
       }
     },
     'unit_contents' => [
@@ -2236,8 +2188,7 @@ $result_trees{'complex_split_at_node'} = [
         },
         'source_info' => {
           'file_name' => 'complex_sectioning_case.texi',
-          'line_nr' => 77,
-          'macro' => ''
+          'line_nr' => 77
         }
       }
     ],
@@ -2314,8 +2265,7 @@ $result_trees{'complex_split_at_node'} = [
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'complex_sectioning_case.texi',
-            'line_nr' => 84,
-            'macro' => ''
+            'line_nr' => 84
           }
         }
       ],
@@ -2330,8 +2280,7 @@ $result_trees{'complex_split_at_node'} = [
       },
       'source_info' => {
         'file_name' => 'complex_sectioning_case.texi',
-        'line_nr' => 82,
-        'macro' => ''
+        'line_nr' => 82
       }
     },
     'unit_contents' => [
diff --git a/tp/t/results/moresectioning/contents.pl 
b/tp/t/results/moresectioning/contents.pl
index 9d1a0669cb..196ad6e4d0 100644
--- a/tp/t/results/moresectioning/contents.pl
+++ b/tp/t/results/moresectioning/contents.pl
@@ -48,8 +48,7 @@ $result_trees{'contents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -87,8 +86,7 @@ $result_trees{'contents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -126,8 +124,7 @@ $result_trees{'contents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -165,8 +162,7 @@ $result_trees{'contents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -204,8 +200,7 @@ $result_trees{'contents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -241,8 +236,7 @@ $result_trees{'contents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -281,8 +275,7 @@ $result_trees{'contents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -320,8 +313,7 @@ $result_trees{'contents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -357,8 +349,7 @@ $result_trees{'contents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -396,8 +387,7 @@ $result_trees{'contents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 19,
-        'macro' => ''
+        'line_nr' => 19
       }
     },
     {
@@ -435,8 +425,7 @@ $result_trees{'contents'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           }
         }
       ],
@@ -450,8 +439,7 @@ $result_trees{'contents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 21,
-        'macro' => ''
+        'line_nr' => 21
       }
     }
   ],
diff --git a/tp/t/results/moresectioning/contents_and_shortcontents.pl 
b/tp/t/results/moresectioning/contents_and_shortcontents.pl
index 36a909b5f2..62735c82ad 100644
--- a/tp/t/results/moresectioning/contents_and_shortcontents.pl
+++ b/tp/t/results/moresectioning/contents_and_shortcontents.pl
@@ -48,8 +48,7 @@ $result_trees{'contents_and_shortcontents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -87,8 +86,7 @@ $result_trees{'contents_and_shortcontents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -126,8 +124,7 @@ $result_trees{'contents_and_shortcontents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -165,8 +162,7 @@ $result_trees{'contents_and_shortcontents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -204,8 +200,7 @@ $result_trees{'contents_and_shortcontents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -241,8 +236,7 @@ $result_trees{'contents_and_shortcontents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -281,8 +275,7 @@ $result_trees{'contents_and_shortcontents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -320,8 +313,7 @@ $result_trees{'contents_and_shortcontents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -357,8 +349,7 @@ $result_trees{'contents_and_shortcontents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -396,8 +387,7 @@ $result_trees{'contents_and_shortcontents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 19,
-        'macro' => ''
+        'line_nr' => 19
       }
     },
     {
@@ -435,8 +425,7 @@ $result_trees{'contents_and_shortcontents'} = {
           'cmdname' => 'shortcontents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           }
         },
         {
@@ -455,8 +444,7 @@ $result_trees{'contents_and_shortcontents'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           }
         }
       ],
@@ -470,8 +458,7 @@ $result_trees{'contents_and_shortcontents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 21,
-        'macro' => ''
+        'line_nr' => 21
       }
     }
   ],
diff --git 
a/tp/t/results/moresectioning/contents_at_begin_chapter_without_node.pl 
b/tp/t/results/moresectioning/contents_at_begin_chapter_without_node.pl
index 83a1e4c3ba..f005e75f9b 100644
--- a/tp/t/results/moresectioning/contents_at_begin_chapter_without_node.pl
+++ b/tp/t/results/moresectioning/contents_at_begin_chapter_without_node.pl
@@ -20,8 +20,7 @@ $result_trees{'contents_at_begin_chapter_without_node'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -61,8 +60,7 @@ $result_trees{'contents_at_begin_chapter_without_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -98,8 +96,7 @@ $result_trees{'contents_at_begin_chapter_without_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -130,8 +127,7 @@ $result_trees{'contents_at_begin_chapter_without_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     }
   ],
diff --git a/tp/t/results/moresectioning/contents_at_end_document.pl 
b/tp/t/results/moresectioning/contents_at_end_document.pl
index 5ced29367b..1f2f2f4a11 100644
--- a/tp/t/results/moresectioning/contents_at_end_document.pl
+++ b/tp/t/results/moresectioning/contents_at_end_document.pl
@@ -39,8 +39,7 @@ $result_trees{'contents_at_end_document'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -76,8 +75,7 @@ $result_trees{'contents_at_end_document'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -115,8 +113,7 @@ $result_trees{'contents_at_end_document'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         }
       ],
@@ -130,8 +127,7 @@ $result_trees{'contents_at_end_document'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     }
   ],
diff --git a/tp/t/results/moresectioning/contents_at_end_document_after_node.pl 
b/tp/t/results/moresectioning/contents_at_end_document_after_node.pl
index d55f71003c..dd379c60fd 100644
--- a/tp/t/results/moresectioning/contents_at_end_document_after_node.pl
+++ b/tp/t/results/moresectioning/contents_at_end_document_after_node.pl
@@ -39,8 +39,7 @@ $result_trees{'contents_at_end_document_after_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -124,8 +123,7 @@ $result_trees{'contents_at_end_document_after_node'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -157,15 +155,13 @@ $result_trees{'contents_at_end_document_after_node'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -182,8 +178,7 @@ $result_trees{'contents_at_end_document_after_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -221,8 +216,7 @@ $result_trees{'contents_at_end_document_after_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -282,8 +276,7 @@ $result_trees{'contents_at_end_document_after_node'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           }
         }
       ],
@@ -298,8 +291,7 @@ $result_trees{'contents_at_end_document_after_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     }
   ],
diff --git a/tp/t/results/moresectioning/contents_in_document.pl 
b/tp/t/results/moresectioning/contents_in_document.pl
index 9d304c78fc..d303ab863b 100644
--- a/tp/t/results/moresectioning/contents_in_document.pl
+++ b/tp/t/results/moresectioning/contents_in_document.pl
@@ -39,8 +39,7 @@ $result_trees{'contents_in_document'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -78,8 +77,7 @@ $result_trees{'contents_in_document'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -96,8 +94,7 @@ $result_trees{'contents_in_document'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -128,8 +125,7 @@ $result_trees{'contents_in_document'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     }
   ],
diff --git a/tp/t/results/moresectioning/empty_top_node_up.pl 
b/tp/t/results/moresectioning/empty_top_node_up.pl
index 223bf2cb16..f4cb47b1b3 100644
--- a/tp/t/results/moresectioning/empty_top_node_up.pl
+++ b/tp/t/results/moresectioning/empty_top_node_up.pl
@@ -39,8 +39,7 @@ $result_trees{'empty_top_node_up'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -124,8 +123,7 @@ $result_trees{'empty_top_node_up'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -157,15 +155,13 @@ $result_trees{'empty_top_node_up'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -182,8 +178,7 @@ $result_trees{'empty_top_node_up'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -215,8 +210,7 @@ $result_trees{'empty_top_node_up'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     }
   ],
diff --git a/tp/t/results/moresectioning/equivalent_nodes_defined_linked.pl 
b/tp/t/results/moresectioning/equivalent_nodes_defined_linked.pl
index 4aedab428d..ab7b3c7ef6 100644
--- a/tp/t/results/moresectioning/equivalent_nodes_defined_linked.pl
+++ b/tp/t/results/moresectioning/equivalent_nodes_defined_linked.pl
@@ -36,8 +36,7 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
               'cmdname' => 'asis',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -104,8 +103,7 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
                       'cmdname' => 'strong',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     }
                   ],
@@ -140,8 +138,7 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -173,15 +170,13 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -201,8 +196,7 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -255,8 +249,7 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 }
               ],
@@ -311,8 +304,7 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
@@ -327,8 +319,7 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -364,8 +355,7 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -400,8 +390,7 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -457,8 +446,7 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
                       'cmdname' => 'samp',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     }
                   ],
@@ -476,8 +464,7 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -499,8 +486,7 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     }
   ],
@@ -593,7 +579,6 @@ $result_errors{'equivalent_nodes_defined_linked'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@float `@samp{chap}\' previously defined',
     'type' => 'error'
   },
@@ -603,7 +588,6 @@ $result_errors{'equivalent_nodes_defined_linked'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'here is the previous definition as @node',
     'type' => 'error'
   },
@@ -612,7 +596,6 @@ $result_errors{'equivalent_nodes_defined_linked'} = [
 ',
     'file_name' => '',
     'line_nr' => 17,
-    'macro' => '',
     'text' => '@ref to `@samp{chap}\', different from node name `chap\'',
     'type' => 'warning'
   },
@@ -621,7 +604,6 @@ $result_errors{'equivalent_nodes_defined_linked'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'Next pointer `@asis{chap}\' (for node `Top\') different from 
node name `chap\'',
     'type' => 'warning'
   },
@@ -630,7 +612,6 @@ $result_errors{'equivalent_nodes_defined_linked'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '@menu entry node name `@strong{chap}\' different from node name 
`chap\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/moresectioning/internal_top_node_up.pl 
b/tp/t/results/moresectioning/internal_top_node_up.pl
index 9c21f0ba90..6a13c0d348 100644
--- a/tp/t/results/moresectioning/internal_top_node_up.pl
+++ b/tp/t/results/moresectioning/internal_top_node_up.pl
@@ -36,8 +36,7 @@ $result_trees{'internal_top_node_up'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     'unit_contents' => [
@@ -126,8 +125,7 @@ $result_trees{'internal_top_node_up'} = [
                 ],
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 5,
-                  'macro' => ''
+                  'line_nr' => 5
                 },
                 'type' => 'menu_entry'
               },
@@ -159,15 +157,13 @@ $result_trees{'internal_top_node_up'} = [
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 6,
-                  'macro' => ''
+                  'line_nr' => 6
                 }
               }
             ],
             'source_info' => {
               'file_name' => '',
-              'line_nr' => 4,
-              'macro' => ''
+              'line_nr' => 4
             }
           },
           {
@@ -184,8 +180,7 @@ $result_trees{'internal_top_node_up'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 2,
-          'macro' => ''
+          'line_nr' => 2
         }
       }
     ],
@@ -221,8 +216,7 @@ $result_trees{'internal_top_node_up'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     'unit_contents' => [
diff --git a/tp/t/results/moresectioning/lowered_subsubsection.pl 
b/tp/t/results/moresectioning/lowered_subsubsection.pl
index 816d916ac4..ada334aaa8 100644
--- a/tp/t/results/moresectioning/lowered_subsubsection.pl
+++ b/tp/t/results/moresectioning/lowered_subsubsection.pl
@@ -39,8 +39,7 @@ $result_trees{'lowered_subsubsection'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -119,8 +118,7 @@ $result_trees{'lowered_subsubsection'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -152,15 +150,13 @@ $result_trees{'lowered_subsubsection'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -172,8 +168,7 @@ $result_trees{'lowered_subsubsection'} = {
       'extra' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -205,8 +200,7 @@ $result_trees{'lowered_subsubsection'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -290,8 +284,7 @@ $result_trees{'lowered_subsubsection'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               },
               'type' => 'menu_entry'
             },
@@ -323,15 +316,13 @@ $result_trees{'lowered_subsubsection'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -350,8 +341,7 @@ $result_trees{'lowered_subsubsection'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -383,8 +373,7 @@ $result_trees{'lowered_subsubsection'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -468,8 +457,7 @@ $result_trees{'lowered_subsubsection'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               },
               'type' => 'menu_entry'
             },
@@ -501,15 +489,13 @@ $result_trees{'lowered_subsubsection'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           }
         },
         {
@@ -528,8 +514,7 @@ $result_trees{'lowered_subsubsection'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 16,
-        'macro' => ''
+        'line_nr' => 16
       }
     },
     {
@@ -561,8 +546,7 @@ $result_trees{'lowered_subsubsection'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 22,
-        'macro' => ''
+        'line_nr' => 22
       }
     },
     {
@@ -646,8 +630,7 @@ $result_trees{'lowered_subsubsection'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               },
               'type' => 'menu_entry'
             },
@@ -694,8 +677,7 @@ $result_trees{'lowered_subsubsection'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               },
               'type' => 'menu_entry'
             },
@@ -727,15 +709,13 @@ $result_trees{'lowered_subsubsection'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           }
         },
         {
@@ -754,8 +734,7 @@ $result_trees{'lowered_subsubsection'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 23,
-        'macro' => ''
+        'line_nr' => 23
       }
     },
     {
@@ -787,8 +766,7 @@ $result_trees{'lowered_subsubsection'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 30,
-        'macro' => ''
+        'line_nr' => 30
       }
     },
     {
@@ -836,8 +814,7 @@ $result_trees{'lowered_subsubsection'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 31,
-        'macro' => ''
+        'line_nr' => 31
       }
     },
     {
@@ -869,8 +846,7 @@ $result_trees{'lowered_subsubsection'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 34,
-        'macro' => ''
+        'line_nr' => 34
       }
     },
     {
@@ -954,8 +930,7 @@ $result_trees{'lowered_subsubsection'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               },
               'type' => 'menu_entry'
             },
@@ -987,15 +962,13 @@ $result_trees{'lowered_subsubsection'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 39,
-                'macro' => ''
+                'line_nr' => 39
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 37,
-            'macro' => ''
+            'line_nr' => 37
           }
         },
         {
@@ -1015,8 +988,7 @@ $result_trees{'lowered_subsubsection'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 35,
-        'macro' => ''
+        'line_nr' => 35
       }
     },
     {
@@ -1048,8 +1020,7 @@ $result_trees{'lowered_subsubsection'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 41,
-        'macro' => ''
+        'line_nr' => 41
       }
     },
     {
@@ -1097,8 +1068,7 @@ $result_trees{'lowered_subsubsection'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 45,
-            'macro' => ''
+            'line_nr' => 45
           }
         }
       ],
@@ -1113,8 +1083,7 @@ $result_trees{'lowered_subsubsection'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 42,
-        'macro' => ''
+        'line_nr' => 42
       }
     },
     {
@@ -1575,7 +1544,6 @@ $result_errors{'lowered_subsubsection'} = [
 ',
     'file_name' => '',
     'line_nr' => 34,
-    'macro' => '',
     'text' => 'node next for `Lowered subsec\' is `Lowered subsubsection\' in 
sectioning but not in menu',
     'type' => 'warning'
   },
@@ -1584,7 +1552,6 @@ $result_errors{'lowered_subsubsection'} = [
 ',
     'file_name' => '',
     'line_nr' => 41,
-    'macro' => '',
     'text' => 'node prev for `Lowered subsubsection\' is `Lowered subsec\' in 
sectioning but not in menu',
     'type' => 'warning'
   },
@@ -1593,7 +1560,6 @@ $result_errors{'lowered_subsubsection'} = [
 ',
     'file_name' => '',
     'line_nr' => 41,
-    'macro' => '',
     'text' => 'node up pointer for `Lowered subsubsection\' is `Subsection\' 
but up is `Lowered subsec\' in menu',
     'type' => 'warning'
   },
@@ -1602,7 +1568,6 @@ $result_errors{'lowered_subsubsection'} = [
 ',
     'file_name' => '',
     'line_nr' => 22,
-    'macro' => '',
     'text' => 'node `Subsection\' lacks menu item for `Lowered subsubsection\' 
despite being its Up target',
     'type' => 'warning'
   }
diff --git a/tp/t/results/moresectioning/loweredheading.pl 
b/tp/t/results/moresectioning/loweredheading.pl
index 38148a8631..b1ce518435 100644
--- a/tp/t/results/moresectioning/loweredheading.pl
+++ b/tp/t/results/moresectioning/loweredheading.pl
@@ -69,8 +69,7 @@ $result_trees{'loweredheading'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         }
       ],
@@ -85,8 +84,7 @@ $result_trees{'loweredheading'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
diff --git a/tp/t/results/moresectioning/more_sections_than_nodes.pl 
b/tp/t/results/moresectioning/more_sections_than_nodes.pl
index 3a0a2a2503..158ae05925 100644
--- a/tp/t/results/moresectioning/more_sections_than_nodes.pl
+++ b/tp/t/results/moresectioning/more_sections_than_nodes.pl
@@ -39,8 +39,7 @@ $result_trees{'more_sections_than_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -124,8 +123,7 @@ $result_trees{'more_sections_than_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -172,8 +170,7 @@ $result_trees{'more_sections_than_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -220,8 +217,7 @@ $result_trees{'more_sections_than_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -253,15 +249,13 @@ $result_trees{'more_sections_than_nodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -278,8 +272,7 @@ $result_trees{'more_sections_than_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -317,8 +310,7 @@ $result_trees{'more_sections_than_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -350,8 +342,7 @@ $result_trees{'more_sections_than_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -389,8 +380,7 @@ $result_trees{'more_sections_than_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -428,8 +418,7 @@ $result_trees{'more_sections_than_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -522,8 +511,7 @@ $result_trees{'more_sections_than_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -607,8 +595,7 @@ $result_trees{'more_sections_than_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               },
               'type' => 'menu_entry'
             },
@@ -640,15 +627,13 @@ $result_trees{'more_sections_than_nodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
@@ -667,8 +652,7 @@ $result_trees{'more_sections_than_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -706,8 +690,7 @@ $result_trees{'more_sections_than_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     {
@@ -739,8 +722,7 @@ $result_trees{'more_sections_than_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 26,
-        'macro' => ''
+        'line_nr' => 26
       }
     },
     {
@@ -778,8 +760,7 @@ $result_trees{'more_sections_than_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 27,
-        'macro' => ''
+        'line_nr' => 27
       }
     },
     {
@@ -817,8 +798,7 @@ $result_trees{'more_sections_than_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 29,
-        'macro' => ''
+        'line_nr' => 29
       }
     },
     {
@@ -856,8 +836,7 @@ $result_trees{'more_sections_than_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 31,
-        'macro' => ''
+        'line_nr' => 31
       }
     },
     {
@@ -895,8 +874,7 @@ $result_trees{'more_sections_than_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 33,
-        'macro' => ''
+        'line_nr' => 33
       }
     },
     {
@@ -934,8 +912,7 @@ $result_trees{'more_sections_than_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 35,
-        'macro' => ''
+        'line_nr' => 35
       }
     },
     {
@@ -1002,8 +979,7 @@ $result_trees{'more_sections_than_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 37,
-        'macro' => ''
+        'line_nr' => 37
       }
     },
     {
@@ -1041,8 +1017,7 @@ $result_trees{'more_sections_than_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 38,
-        'macro' => ''
+        'line_nr' => 38
       }
     },
     {
@@ -1073,8 +1048,7 @@ $result_trees{'more_sections_than_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 40,
-        'macro' => ''
+        'line_nr' => 40
       }
     }
   ],
diff --git a/tp/t/results/moresectioning/more_sections_than_nodes_texi2html.pl 
b/tp/t/results/moresectioning/more_sections_than_nodes_texi2html.pl
index f62e5d0059..d4ad6772b8 100644
--- a/tp/t/results/moresectioning/more_sections_than_nodes_texi2html.pl
+++ b/tp/t/results/moresectioning/more_sections_than_nodes_texi2html.pl
@@ -44,8 +44,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -129,8 +128,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -177,8 +175,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -225,8 +222,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -258,15 +254,13 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -283,8 +277,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -322,8 +315,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -355,8 +347,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -394,8 +385,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -433,8 +423,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -527,8 +516,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -612,8 +600,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               },
               'type' => 'menu_entry'
             },
@@ -645,15 +632,13 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
@@ -672,8 +657,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -711,8 +695,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     {
@@ -744,8 +727,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 26,
-        'macro' => ''
+        'line_nr' => 26
       }
     },
     {
@@ -783,8 +765,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 27,
-        'macro' => ''
+        'line_nr' => 27
       }
     },
     {
@@ -822,8 +803,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 29,
-        'macro' => ''
+        'line_nr' => 29
       }
     },
     {
@@ -861,8 +841,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 31,
-        'macro' => ''
+        'line_nr' => 31
       }
     },
     {
@@ -900,8 +879,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 33,
-        'macro' => ''
+        'line_nr' => 33
       }
     },
     {
@@ -939,8 +917,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 35,
-        'macro' => ''
+        'line_nr' => 35
       }
     },
     {
@@ -1007,8 +984,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 37,
-        'macro' => ''
+        'line_nr' => 37
       }
     },
     {
@@ -1046,8 +1022,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 38,
-        'macro' => ''
+        'line_nr' => 38
       }
     },
     {
@@ -1078,8 +1053,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 40,
-        'macro' => ''
+        'line_nr' => 40
       }
     }
   ],
diff --git a/tp/t/results/moresectioning/no_element.pl 
b/tp/t/results/moresectioning/no_element.pl
index c346c2f9a7..7a6c2cb555 100644
--- a/tp/t/results/moresectioning/no_element.pl
+++ b/tp/t/results/moresectioning/no_element.pl
@@ -34,8 +34,7 @@ $result_trees{'no_element'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -67,8 +66,7 @@ $result_trees{'no_element'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -99,8 +97,7 @@ $result_trees{'no_element'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -141,8 +138,7 @@ $result_trees{'no_element'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -185,8 +181,7 @@ $result_trees{'no_element'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -239,8 +234,7 @@ $result_trees{'no_element'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     },
                     {
@@ -281,8 +275,7 @@ $result_trees{'no_element'} = {
                           'cmdname' => 'ref',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 18,
-                            'macro' => ''
+                            'line_nr' => 18
                           }
                         },
                         {
@@ -299,8 +292,7 @@ $result_trees{'no_element'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -377,8 +369,7 @@ $result_trees{'no_element'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             }
           ],
@@ -394,8 +385,7 @@ $result_trees{'no_element'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 21,
-            'macro' => ''
+            'line_nr' => 21
           }
         },
         {
@@ -431,8 +421,7 @@ $result_trees{'no_element'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             },
             {
@@ -504,8 +493,7 @@ $result_trees{'no_element'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               },
               'type' => 'menu_entry'
             },
@@ -537,15 +525,13 @@ $result_trees{'no_element'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 28,
-            'macro' => ''
+            'line_nr' => 28
           }
         },
         {
@@ -585,8 +571,7 @@ $result_trees{'no_element'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 32,
-            'macro' => ''
+            'line_nr' => 32
           },
           'type' => 'index_entry_command'
         }
@@ -664,7 +649,6 @@ $result_errors{'no_element'} = [
 ',
     'file_name' => '',
     'line_nr' => 32,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   }
@@ -743,7 +727,6 @@ $result_converted_errors{'info'}->{'no_element'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@anchor outside of any node',
     'type' => 'warning'
   },
@@ -752,7 +735,6 @@ $result_converted_errors{'info'}->{'no_element'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => '@footnote outside of any node',
     'type' => 'warning'
   },
@@ -761,7 +743,6 @@ $result_converted_errors{'info'}->{'no_element'} = [
 ',
     'file_name' => '',
     'line_nr' => 21,
-    'macro' => '',
     'text' => '@float outside of any node',
     'type' => 'warning'
   },
@@ -770,7 +751,6 @@ $result_converted_errors{'info'}->{'no_element'} = [
 ',
     'file_name' => '',
     'line_nr' => 15,
-    'macro' => '',
     'text' => '@anchor outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/moresectioning/nodes_before_after_top_xref.pl 
b/tp/t/results/moresectioning/nodes_before_after_top_xref.pl
index 9457808569..3746126f1d 100644
--- a/tp/t/results/moresectioning/nodes_before_after_top_xref.pl
+++ b/tp/t/results/moresectioning/nodes_before_after_top_xref.pl
@@ -39,8 +39,7 @@ $result_trees{'nodes_before_after_top_xref'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -104,8 +103,7 @@ $result_trees{'nodes_before_after_top_xref'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -137,8 +135,7 @@ $result_trees{'nodes_before_after_top_xref'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -188,8 +185,7 @@ $result_trees{'nodes_before_after_top_xref'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -242,8 +238,7 @@ $result_trees{'nodes_before_after_top_xref'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -275,8 +270,7 @@ $result_trees{'nodes_before_after_top_xref'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 16,
-        'macro' => ''
+        'line_nr' => 16
       }
     },
     {
@@ -347,8 +341,7 @@ $result_trees{'nodes_before_after_top_xref'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 21,
-            'macro' => ''
+            'line_nr' => 21
           }
         },
         {
@@ -375,8 +368,7 @@ $result_trees{'nodes_before_after_top_xref'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -405,8 +397,7 @@ $result_trees{'nodes_before_after_top_xref'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -451,8 +442,7 @@ $result_trees{'nodes_before_after_top_xref'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           }
         },
         {
@@ -479,8 +469,7 @@ $result_trees{'nodes_before_after_top_xref'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             },
             {
@@ -509,8 +498,7 @@ $result_trees{'nodes_before_after_top_xref'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             },
             {
@@ -536,8 +524,7 @@ $result_trees{'nodes_before_after_top_xref'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     }
   ],
diff --git a/tp/t/results/moresectioning/non_automatic_internal_top_node_up.pl 
b/tp/t/results/moresectioning/non_automatic_internal_top_node_up.pl
index 503a8a5ffa..7be0ad7384 100644
--- a/tp/t/results/moresectioning/non_automatic_internal_top_node_up.pl
+++ b/tp/t/results/moresectioning/non_automatic_internal_top_node_up.pl
@@ -66,8 +66,7 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
                       'cmdname' => 'acronym',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     },
                     {
@@ -85,8 +84,7 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -137,8 +135,7 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
                       'cmdname' => 'acronym',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     },
                     {
@@ -156,8 +153,7 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -197,8 +193,7 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     'unit_contents' => [
@@ -287,8 +282,7 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
                 ],
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 5,
-                  'macro' => ''
+                  'line_nr' => 5
                 },
                 'type' => 'menu_entry'
               },
@@ -320,15 +314,13 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 6,
-                  'macro' => ''
+                  'line_nr' => 6
                 }
               }
             ],
             'source_info' => {
               'file_name' => '',
-              'line_nr' => 4,
-              'macro' => ''
+              'line_nr' => 4
             }
           },
           {
@@ -345,8 +337,7 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 2,
-          'macro' => ''
+          'line_nr' => 2
         }
       }
     ],
@@ -420,8 +411,7 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
                       'cmdname' => 'acronym',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     },
                     {
@@ -439,8 +429,7 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -480,8 +469,7 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     'unit_contents' => [
@@ -720,7 +708,6 @@ $result_errors{'non_automatic_internal_top_node_up'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'Prev reference to nonexistent `@acronym{GNU, @acronym{GNU}\'s 
Not Unix} manuals\'',
     'type' => 'error'
   },
@@ -729,7 +716,6 @@ $result_errors{'non_automatic_internal_top_node_up'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'Up reference to nonexistent `@acronym{GNU, @acronym{GNU}\'s Not 
Unix} manuals\'',
     'type' => 'error'
   },
@@ -738,7 +724,6 @@ $result_errors{'non_automatic_internal_top_node_up'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => 'Up reference to nonexistent `@acronym{GNU, @acronym{GNU}\'s Not 
Unix} manuals\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/moresectioning/non_automatic_top_node_up_and_url.pl 
b/tp/t/results/moresectioning/non_automatic_top_node_up_and_url.pl
index f17643f749..1f4f0246d4 100644
--- a/tp/t/results/moresectioning/non_automatic_top_node_up_and_url.pl
+++ b/tp/t/results/moresectioning/non_automatic_top_node_up_and_url.pl
@@ -66,8 +66,7 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
                       'cmdname' => 'acronym',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     },
                     {
@@ -85,8 +84,7 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -137,8 +135,7 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
                       'cmdname' => 'acronym',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     },
                     {
@@ -156,8 +153,7 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -197,8 +193,7 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     'unit_contents' => [
@@ -287,8 +282,7 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
                 ],
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 5,
-                  'macro' => ''
+                  'line_nr' => 5
                 },
                 'type' => 'menu_entry'
               },
@@ -320,15 +314,13 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 6,
-                  'macro' => ''
+                  'line_nr' => 6
                 }
               }
             ],
             'source_info' => {
               'file_name' => '',
-              'line_nr' => 4,
-              'macro' => ''
+              'line_nr' => 4
             }
           },
           {
@@ -345,8 +337,7 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 2,
-          'macro' => ''
+          'line_nr' => 2
         }
       }
     ],
@@ -420,8 +411,7 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
                       'cmdname' => 'acronym',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     },
                     {
@@ -439,8 +429,7 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -480,8 +469,7 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     'unit_contents' => [
@@ -720,7 +708,6 @@ $result_errors{'non_automatic_top_node_up_and_url'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'Prev reference to nonexistent `@acronym{GNU, @acronym{GNU}\'s 
Not Unix} manuals\'',
     'type' => 'error'
   },
@@ -729,7 +716,6 @@ $result_errors{'non_automatic_top_node_up_and_url'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'Up reference to nonexistent `@acronym{GNU, @acronym{GNU}\'s Not 
Unix} manuals\'',
     'type' => 'error'
   },
@@ -738,7 +724,6 @@ $result_errors{'non_automatic_top_node_up_and_url'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => 'Up reference to nonexistent `@acronym{GNU, @acronym{GNU}\'s Not 
Unix} manuals\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/moresectioning/non_automatic_top_node_up_url.pl 
b/tp/t/results/moresectioning/non_automatic_top_node_up_url.pl
index e85b512941..1f417181e8 100644
--- a/tp/t/results/moresectioning/non_automatic_top_node_up_url.pl
+++ b/tp/t/results/moresectioning/non_automatic_top_node_up_url.pl
@@ -107,8 +107,7 @@ $result_trees{'non_automatic_top_node_up_url'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     'unit_contents' => [
@@ -197,8 +196,7 @@ $result_trees{'non_automatic_top_node_up_url'} = [
                 ],
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 5,
-                  'macro' => ''
+                  'line_nr' => 5
                 },
                 'type' => 'menu_entry'
               },
@@ -230,15 +228,13 @@ $result_trees{'non_automatic_top_node_up_url'} = [
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 6,
-                  'macro' => ''
+                  'line_nr' => 6
                 }
               }
             ],
             'source_info' => {
               'file_name' => '',
-              'line_nr' => 4,
-              'macro' => ''
+              'line_nr' => 4
             }
           },
           {
@@ -255,8 +251,7 @@ $result_trees{'non_automatic_top_node_up_url'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 2,
-          'macro' => ''
+          'line_nr' => 2
         }
       }
     ],
@@ -345,8 +340,7 @@ $result_trees{'non_automatic_top_node_up_url'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     'unit_contents' => [
diff --git a/tp/t/results/moresectioning/only_special_spaces_node.pl 
b/tp/t/results/moresectioning/only_special_spaces_node.pl
index 6a2c7e634b..93a8ac1f2c 100644
--- a/tp/t/results/moresectioning/only_special_spaces_node.pl
+++ b/tp/t/results/moresectioning/only_special_spaces_node.pl
@@ -52,8 +52,7 @@ $result_trees{'only_special_spaces_node'} = {
       },
       "source_info" => {
         "file_name" => "only_special_spaces_node.texi",
-        "line_nr" => 2,
-        "macro" => ""
+        "line_nr" => 2
       }
     },
     {
@@ -87,8 +86,7 @@ $result_trees{'only_special_spaces_node'} = {
       },
       "source_info" => {
         "file_name" => "only_special_spaces_node.texi",
-        "line_nr" => 3,
-        "macro" => ""
+        "line_nr" => 3
       }
     },
     {
@@ -119,8 +117,7 @@ $result_trees{'only_special_spaces_node'} = {
       },
       "source_info" => {
         "file_name" => "only_special_spaces_node.texi",
-        "line_nr" => 5,
-        "macro" => ""
+        "line_nr" => 5
       }
     },
     {
@@ -156,8 +153,7 @@ $result_trees{'only_special_spaces_node'} = {
       },
       "source_info" => {
         "file_name" => "only_special_spaces_node.texi",
-        "line_nr" => 6,
-        "macro" => ""
+        "line_nr" => 6
       }
     },
     {
@@ -175,8 +171,7 @@ $result_trees{'only_special_spaces_node'} = {
       "extra" => {},
       "source_info" => {
         "file_name" => "only_special_spaces_node.texi",
-        "line_nr" => 8,
-        "macro" => ""
+        "line_nr" => 8
       }
     },
     {
@@ -212,8 +207,7 @@ $result_trees{'only_special_spaces_node'} = {
       },
       "source_info" => {
         "file_name" => "only_special_spaces_node.texi",
-        "line_nr" => 9,
-        "macro" => ""
+        "line_nr" => 9
       }
     },
     {
@@ -231,8 +225,7 @@ $result_trees{'only_special_spaces_node'} = {
       "extra" => {},
       "source_info" => {
         "file_name" => "only_special_spaces_node.texi",
-        "line_nr" => 11,
-        "macro" => ""
+        "line_nr" => 11
       }
     },
     {
@@ -268,8 +261,7 @@ $result_trees{'only_special_spaces_node'} = {
       },
       "source_info" => {
         "file_name" => "only_special_spaces_node.texi",
-        "line_nr" => 12,
-        "macro" => ""
+        "line_nr" => 12
       }
     },
     {
@@ -300,8 +292,7 @@ $result_trees{'only_special_spaces_node'} = {
       },
       "source_info" => {
         "file_name" => "only_special_spaces_node.texi",
-        "line_nr" => 14,
-        "macro" => ""
+        "line_nr" => 14
       }
     },
     {
@@ -337,8 +328,7 @@ $result_trees{'only_special_spaces_node'} = {
       },
       "source_info" => {
         "file_name" => "only_special_spaces_node.texi",
-        "line_nr" => 15,
-        "macro" => ""
+        "line_nr" => 15
       }
     },
     {
@@ -369,8 +359,7 @@ $result_trees{'only_special_spaces_node'} = {
       },
       "source_info" => {
         "file_name" => "only_special_spaces_node.texi",
-        "line_nr" => 17,
-        "macro" => ""
+        "line_nr" => 17
       }
     },
     {
@@ -406,8 +395,7 @@ $result_trees{'only_special_spaces_node'} = {
       },
       "source_info" => {
         "file_name" => "only_special_spaces_node.texi",
-        "line_nr" => 18,
-        "macro" => ""
+        "line_nr" => 18
       }
     },
     {
@@ -438,8 +426,7 @@ $result_trees{'only_special_spaces_node'} = {
       },
       "source_info" => {
         "file_name" => "only_special_spaces_node.texi",
-        "line_nr" => 20,
-        "macro" => ""
+        "line_nr" => 20
       }
     },
     {
@@ -515,8 +502,7 @@ $result_trees{'only_special_spaces_node'} = {
       },
       "source_info" => {
         "file_name" => "only_special_spaces_node.texi",
-        "line_nr" => 21,
-        "macro" => ""
+        "line_nr" => 21
       }
     },
     {
@@ -903,7 +889,6 @@ $result_errors{'only_special_spaces_node'} = [
 ',
     'file_name' => 'only_special_spaces_node.texi',
     'line_nr' => 8,
-    'macro' => '',
     'text' => 'empty argument in @node',
     'type' => 'error'
   },
@@ -912,7 +897,6 @@ $result_errors{'only_special_spaces_node'} = [
 ',
     'file_name' => 'only_special_spaces_node.texi',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'empty argument in @node',
     'type' => 'error'
   }
diff --git a/tp/t/results/moresectioning/placed_things_before_element.pl 
b/tp/t/results/moresectioning/placed_things_before_element.pl
index 3719a3077c..d793b62fd6 100644
--- a/tp/t/results/moresectioning/placed_things_before_element.pl
+++ b/tp/t/results/moresectioning/placed_things_before_element.pl
@@ -27,8 +27,7 @@ $result_trees{'placed_things_before_element'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -69,8 +68,7 @@ $result_trees{'placed_things_before_element'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -113,8 +111,7 @@ $result_trees{'placed_things_before_element'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -167,8 +164,7 @@ $result_trees{'placed_things_before_element'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     },
                     {
@@ -209,8 +205,7 @@ $result_trees{'placed_things_before_element'} = {
                           'cmdname' => 'ref',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 14,
-                            'macro' => ''
+                            'line_nr' => 14
                           }
                         },
                         {
@@ -227,8 +222,7 @@ $result_trees{'placed_things_before_element'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -305,8 +299,7 @@ $result_trees{'placed_things_before_element'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             }
           ],
@@ -322,8 +315,7 @@ $result_trees{'placed_things_before_element'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -359,8 +351,7 @@ $result_trees{'placed_things_before_element'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -432,8 +423,7 @@ $result_trees{'placed_things_before_element'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               },
               'type' => 'menu_entry'
             },
@@ -465,15 +455,13 @@ $result_trees{'placed_things_before_element'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 24,
-            'macro' => ''
+            'line_nr' => 24
           }
         },
         {
@@ -513,8 +501,7 @@ $result_trees{'placed_things_before_element'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 28,
-            'macro' => ''
+            'line_nr' => 28
           },
           'type' => 'index_entry_command'
         },
@@ -578,8 +565,7 @@ $result_trees{'placed_things_before_element'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               }
             },
             {
@@ -622,8 +608,7 @@ $result_trees{'placed_things_before_element'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               }
             },
             {
@@ -644,8 +629,7 @@ $result_trees{'placed_things_before_element'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 30,
-        'macro' => ''
+        'line_nr' => 30
       }
     }
   ],
@@ -749,7 +733,6 @@ $result_errors{'placed_things_before_element'} = [
 ',
     'file_name' => '',
     'line_nr' => 28,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   }
@@ -835,7 +818,6 @@ 
$result_converted_errors{'info'}->{'placed_things_before_element'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@anchor outside of any node',
     'type' => 'warning'
   },
@@ -844,7 +826,6 @@ 
$result_converted_errors{'info'}->{'placed_things_before_element'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@footnote outside of any node',
     'type' => 'warning'
   },
@@ -853,7 +834,6 @@ 
$result_converted_errors{'info'}->{'placed_things_before_element'} = [
 ',
     'file_name' => '',
     'line_nr' => 17,
-    'macro' => '',
     'text' => '@float outside of any node',
     'type' => 'warning'
   },
@@ -862,7 +842,6 @@ 
$result_converted_errors{'info'}->{'placed_things_before_element'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => '@anchor outside of any node',
     'type' => 'warning'
   }
diff --git 
a/tp/t/results/moresectioning/placed_things_before_element_no_use_node.pl 
b/tp/t/results/moresectioning/placed_things_before_element_no_use_node.pl
index a6ed56a95f..5f0509d62e 100644
--- a/tp/t/results/moresectioning/placed_things_before_element_no_use_node.pl
+++ b/tp/t/results/moresectioning/placed_things_before_element_no_use_node.pl
@@ -27,8 +27,7 @@ $result_trees{'placed_things_before_element_no_use_node'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -69,8 +68,7 @@ $result_trees{'placed_things_before_element_no_use_node'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -113,8 +111,7 @@ $result_trees{'placed_things_before_element_no_use_node'} = 
{
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -167,8 +164,7 @@ $result_trees{'placed_things_before_element_no_use_node'} = 
{
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     },
                     {
@@ -209,8 +205,7 @@ $result_trees{'placed_things_before_element_no_use_node'} = 
{
                           'cmdname' => 'ref',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 14,
-                            'macro' => ''
+                            'line_nr' => 14
                           }
                         },
                         {
@@ -227,8 +222,7 @@ $result_trees{'placed_things_before_element_no_use_node'} = 
{
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -305,8 +299,7 @@ $result_trees{'placed_things_before_element_no_use_node'} = 
{
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             }
           ],
@@ -322,8 +315,7 @@ $result_trees{'placed_things_before_element_no_use_node'} = 
{
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -359,8 +351,7 @@ $result_trees{'placed_things_before_element_no_use_node'} = 
{
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -432,8 +423,7 @@ $result_trees{'placed_things_before_element_no_use_node'} = 
{
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               },
               'type' => 'menu_entry'
             },
@@ -465,15 +455,13 @@ $result_trees{'placed_things_before_element_no_use_node'} 
= {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 24,
-            'macro' => ''
+            'line_nr' => 24
           }
         },
         {
@@ -513,8 +501,7 @@ $result_trees{'placed_things_before_element_no_use_node'} = 
{
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 28,
-            'macro' => ''
+            'line_nr' => 28
           },
           'type' => 'index_entry_command'
         },
@@ -578,8 +565,7 @@ $result_trees{'placed_things_before_element_no_use_node'} = 
{
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               }
             },
             {
@@ -622,8 +608,7 @@ $result_trees{'placed_things_before_element_no_use_node'} = 
{
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               }
             },
             {
@@ -644,8 +629,7 @@ $result_trees{'placed_things_before_element_no_use_node'} = 
{
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 30,
-        'macro' => ''
+        'line_nr' => 30
       }
     }
   ],
@@ -749,7 +733,6 @@ $result_errors{'placed_things_before_element_no_use_node'} 
= [
 ',
     'file_name' => '',
     'line_nr' => 28,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   }
@@ -835,7 +818,6 @@ 
$result_converted_errors{'info'}->{'placed_things_before_element_no_use_node'} =
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@anchor outside of any node',
     'type' => 'warning'
   },
@@ -844,7 +826,6 @@ 
$result_converted_errors{'info'}->{'placed_things_before_element_no_use_node'} =
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@footnote outside of any node',
     'type' => 'warning'
   },
@@ -853,7 +834,6 @@ 
$result_converted_errors{'info'}->{'placed_things_before_element_no_use_node'} =
 ',
     'file_name' => '',
     'line_nr' => 17,
-    'macro' => '',
     'text' => '@float outside of any node',
     'type' => 'warning'
   },
@@ -862,7 +842,6 @@ 
$result_converted_errors{'info'}->{'placed_things_before_element_no_use_node'} =
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => '@anchor outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/moresectioning/placed_things_before_node.pl 
b/tp/t/results/moresectioning/placed_things_before_node.pl
index c276739922..0317f6979a 100644
--- a/tp/t/results/moresectioning/placed_things_before_node.pl
+++ b/tp/t/results/moresectioning/placed_things_before_node.pl
@@ -30,8 +30,7 @@ $result_trees{'placed_things_before_node'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -72,8 +71,7 @@ $result_trees{'placed_things_before_node'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -116,8 +114,7 @@ $result_trees{'placed_things_before_node'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -170,8 +167,7 @@ $result_trees{'placed_things_before_node'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     },
                     {
@@ -212,8 +208,7 @@ $result_trees{'placed_things_before_node'} = {
                           'cmdname' => 'ref',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 14,
-                            'macro' => ''
+                            'line_nr' => 14
                           }
                         },
                         {
@@ -230,8 +225,7 @@ $result_trees{'placed_things_before_node'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -308,8 +302,7 @@ $result_trees{'placed_things_before_node'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             }
           ],
@@ -325,8 +318,7 @@ $result_trees{'placed_things_before_node'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -362,8 +354,7 @@ $result_trees{'placed_things_before_node'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -435,8 +426,7 @@ $result_trees{'placed_things_before_node'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               },
               'type' => 'menu_entry'
             },
@@ -468,15 +458,13 @@ $result_trees{'placed_things_before_node'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 24,
-            'macro' => ''
+            'line_nr' => 24
           }
         },
         {
@@ -516,8 +504,7 @@ $result_trees{'placed_things_before_node'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 28,
-            'macro' => ''
+            'line_nr' => 28
           },
           'type' => 'index_entry_command'
         },
@@ -558,8 +545,7 @@ $result_trees{'placed_things_before_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 30,
-        'macro' => ''
+        'line_nr' => 30
       }
     },
     {
@@ -595,8 +581,7 @@ $result_trees{'placed_things_before_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 31,
-        'macro' => ''
+        'line_nr' => 31
       }
     },
     {
@@ -628,8 +613,7 @@ $result_trees{'placed_things_before_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 33,
-        'macro' => ''
+        'line_nr' => 33
       }
     },
     {
@@ -684,8 +668,7 @@ $result_trees{'placed_things_before_node'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 37,
-                'macro' => ''
+                'line_nr' => 37
               }
             },
             {
@@ -728,8 +711,7 @@ $result_trees{'placed_things_before_node'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               }
             },
             {
@@ -750,8 +732,7 @@ $result_trees{'placed_things_before_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 34,
-        'macro' => ''
+        'line_nr' => 34
       }
     }
   ],
@@ -941,7 +922,6 @@ $result_errors{'placed_things_before_node'} = [
 ',
     'file_name' => '',
     'line_nr' => 28,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   }
@@ -1036,7 +1016,6 @@ 
$result_converted_errors{'info'}->{'placed_things_before_node'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@anchor outside of any node',
     'type' => 'warning'
   },
@@ -1045,7 +1024,6 @@ 
$result_converted_errors{'info'}->{'placed_things_before_node'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@footnote outside of any node',
     'type' => 'warning'
   },
@@ -1054,7 +1032,6 @@ 
$result_converted_errors{'info'}->{'placed_things_before_node'} = [
 ',
     'file_name' => '',
     'line_nr' => 17,
-    'macro' => '',
     'text' => '@float outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/moresectioning/raiselowersections.pl 
b/tp/t/results/moresectioning/raiselowersections.pl
index f087c16ca4..73fddd7ce0 100644
--- a/tp/t/results/moresectioning/raiselowersections.pl
+++ b/tp/t/results/moresectioning/raiselowersections.pl
@@ -64,8 +64,7 @@ $result_trees{'raiselowersections'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -139,8 +138,7 @@ $result_trees{'raiselowersections'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -187,8 +185,7 @@ $result_trees{'raiselowersections'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -220,15 +217,13 @@ $result_trees{'raiselowersections'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -240,8 +235,7 @@ $result_trees{'raiselowersections'} = {
       'extra' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -273,8 +267,7 @@ $result_trees{'raiselowersections'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -344,8 +337,7 @@ $result_trees{'raiselowersections'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 14,
-                      'macro' => ''
+                      'line_nr' => 14
                     }
                   },
                   'sourcemark_type' => 'expanded_conditional_command',
@@ -415,8 +407,7 @@ $result_trees{'raiselowersections'} = {
                                 },
                                 'source_info' => {
                                   'file_name' => '',
-                                  'line_nr' => 16,
-                                  'macro' => ''
+                                  'line_nr' => 16
                                 }
                               },
                               'position' => 1,
@@ -436,8 +427,7 @@ $result_trees{'raiselowersections'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               },
               'type' => 'menu_entry'
             },
@@ -469,15 +459,13 @@ $result_trees{'raiselowersections'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -546,8 +534,7 @@ $result_trees{'raiselowersections'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 23,
-                  'macro' => ''
+                  'line_nr' => 23
                 }
               },
               'position' => 1,
@@ -584,8 +571,7 @@ $result_trees{'raiselowersections'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 24,
-                  'macro' => ''
+                  'line_nr' => 24
                 }
               },
               'position' => 1,
@@ -696,8 +682,7 @@ $result_trees{'raiselowersections'} = {
                     },
                     'source_info' => {
                       'file_name' => 'section_file.texi',
-                      'line_nr' => 10,
-                      'macro' => ''
+                      'line_nr' => 10
                     }
                   }
                 ],
@@ -708,8 +693,7 @@ $result_trees{'raiselowersections'} = {
                 },
                 'source_info' => {
                   'file_name' => 'section_file.texi',
-                  'line_nr' => 3,
-                  'macro' => ''
+                  'line_nr' => 3
                 }
               },
               'position' => 1,
@@ -736,8 +720,7 @@ $result_trees{'raiselowersections'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -769,8 +752,7 @@ $result_trees{'raiselowersections'} = {
       },
       'source_info' => {
         'file_name' => 'section_file.texi',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -854,8 +836,7 @@ $result_trees{'raiselowersections'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_file.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               },
               'type' => 'menu_entry'
             },
@@ -887,15 +868,13 @@ $result_trees{'raiselowersections'} = {
               },
               'source_info' => {
                 'file_name' => 'section_file.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             }
           ],
           'source_info' => {
             'file_name' => 'section_file.texi',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         },
         {
@@ -915,8 +894,7 @@ $result_trees{'raiselowersections'} = {
       },
       'source_info' => {
         'file_name' => 'section_file.texi',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -948,8 +926,7 @@ $result_trees{'raiselowersections'} = {
       },
       'source_info' => {
         'file_name' => 'section_file.texi',
-        'line_nr' => 19,
-        'macro' => ''
+        'line_nr' => 19
       }
     },
     {
@@ -1033,8 +1010,7 @@ $result_trees{'raiselowersections'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_file.texi',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               },
               'type' => 'menu_entry'
             },
@@ -1066,15 +1042,13 @@ $result_trees{'raiselowersections'} = {
               },
               'source_info' => {
                 'file_name' => 'section_file.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             }
           ],
           'source_info' => {
             'file_name' => 'section_file.texi',
-            'line_nr' => 22,
-            'macro' => ''
+            'line_nr' => 22
           }
         },
         {
@@ -1094,8 +1068,7 @@ $result_trees{'raiselowersections'} = {
       },
       'source_info' => {
         'file_name' => 'section_file.texi',
-        'line_nr' => 20,
-        'macro' => ''
+        'line_nr' => 20
       }
     },
     {
@@ -1127,8 +1100,7 @@ $result_trees{'raiselowersections'} = {
       },
       'source_info' => {
         'file_name' => 'section_file.texi',
-        'line_nr' => 26,
-        'macro' => ''
+        'line_nr' => 26
       }
     },
     {
@@ -1231,8 +1203,7 @@ $result_trees{'raiselowersections'} = {
                     },
                     'source_info' => {
                       'file_name' => 'section_file.texi',
-                      'line_nr' => 36,
-                      'macro' => ''
+                      'line_nr' => 36
                     }
                   }
                 ],
@@ -1243,8 +1214,7 @@ $result_trees{'raiselowersections'} = {
                 },
                 'source_info' => {
                   'file_name' => 'section_file.texi',
-                  'line_nr' => 29,
-                  'macro' => ''
+                  'line_nr' => 29
                 }
               },
               'position' => 1,
@@ -1316,8 +1286,7 @@ $result_trees{'raiselowersections'} = {
                     },
                     'source_info' => {
                       'file_name' => 'section_file.texi',
-                      'line_nr' => 41,
-                      'macro' => ''
+                      'line_nr' => 41
                     }
                   }
                 ],
@@ -1328,8 +1297,7 @@ $result_trees{'raiselowersections'} = {
                 },
                 'source_info' => {
                   'file_name' => 'section_file.texi',
-                  'line_nr' => 38,
-                  'macro' => ''
+                  'line_nr' => 38
                 }
               },
               'position' => 1,
@@ -1371,8 +1339,7 @@ $result_trees{'raiselowersections'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 25,
-                  'macro' => ''
+                  'line_nr' => 25
                 }
               },
               'position' => 1,
@@ -1429,8 +1396,7 @@ $result_trees{'raiselowersections'} = {
       },
       'source_info' => {
         'file_name' => 'section_file.texi',
-        'line_nr' => 27,
-        'macro' => ''
+        'line_nr' => 27
       }
     },
     {
@@ -1462,8 +1428,7 @@ $result_trees{'raiselowersections'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 30,
-        'macro' => ''
+        'line_nr' => 30
       }
     },
     {
@@ -1515,8 +1480,7 @@ $result_trees{'raiselowersections'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 35,
-            'macro' => ''
+            'line_nr' => 35
           }
         }
       ],
@@ -1530,8 +1494,7 @@ $result_trees{'raiselowersections'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 31,
-        'macro' => ''
+        'line_nr' => 31
       }
     },
     {
diff --git a/tp/t/results/moresectioning/rec_nodes.pl 
b/tp/t/results/moresectioning/rec_nodes.pl
index 3b0adf520d..dd787a6f19 100644
--- a/tp/t/results/moresectioning/rec_nodes.pl
+++ b/tp/t/results/moresectioning/rec_nodes.pl
@@ -100,8 +100,7 @@ $result_trees{'rec_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -148,8 +147,7 @@ $result_trees{'rec_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -181,15 +179,13 @@ $result_trees{'rec_nodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -209,8 +205,7 @@ $result_trees{'rec_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -329,8 +324,7 @@ $result_trees{'rec_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               },
               'type' => 'menu_entry'
             },
@@ -377,8 +371,7 @@ $result_trees{'rec_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               },
               'type' => 'menu_entry'
             },
@@ -410,15 +403,13 @@ $result_trees{'rec_nodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -438,8 +429,7 @@ $result_trees{'rec_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -545,8 +535,7 @@ $result_trees{'rec_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               },
               'type' => 'menu_entry'
             },
@@ -578,15 +567,13 @@ $result_trees{'rec_nodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           }
         },
         {
@@ -606,8 +593,7 @@ $result_trees{'rec_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 16,
-        'macro' => ''
+        'line_nr' => 16
       }
     },
     {
@@ -708,8 +694,7 @@ $result_trees{'rec_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               },
               'type' => 'menu_entry'
             },
@@ -741,15 +726,13 @@ $result_trees{'rec_nodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           }
         },
         {
@@ -783,8 +766,7 @@ $result_trees{'rec_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 22,
-        'macro' => ''
+        'line_nr' => 22
       }
     },
     {
@@ -899,8 +881,7 @@ $result_trees{'rec_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               },
               'type' => 'menu_entry'
             },
@@ -932,15 +913,13 @@ $result_trees{'rec_nodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 32,
-            'macro' => ''
+            'line_nr' => 32
           }
         }
       ],
@@ -955,8 +934,7 @@ $result_trees{'rec_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 29,
-        'macro' => ''
+        'line_nr' => 29
       }
     }
   ],
diff --git a/tp/t/results/moresectioning/section_in_unnumbered_info.pl 
b/tp/t/results/moresectioning/section_in_unnumbered_info.pl
index 675695b5eb..e7bf62bd22 100644
--- a/tp/t/results/moresectioning/section_in_unnumbered_info.pl
+++ b/tp/t/results/moresectioning/section_in_unnumbered_info.pl
@@ -54,8 +54,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -93,8 +92,7 @@ $result_trees{'section_in_unnumbered_info'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'section_in_unnumbered_text.texi',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -173,8 +171,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'menu_entry'
             },
@@ -221,8 +218,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -269,8 +265,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               },
               'type' => 'menu_entry'
             },
@@ -317,8 +312,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               },
               'type' => 'menu_entry'
             },
@@ -365,8 +359,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               },
               'type' => 'menu_entry'
             },
@@ -398,15 +391,13 @@ $result_trees{'section_in_unnumbered_info'} = {
               },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
           'source_info' => {
             'file_name' => 'section_in_unnumbered_text.texi',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -423,8 +414,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -456,8 +446,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -541,8 +530,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               },
               'type' => 'menu_entry'
             },
@@ -574,15 +562,13 @@ $result_trees{'section_in_unnumbered_info'} = {
               },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           ],
           'source_info' => {
             'file_name' => 'section_in_unnumbered_text.texi',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
@@ -601,8 +587,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -634,8 +619,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     {
@@ -673,8 +657,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
@@ -706,8 +689,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 27,
-        'macro' => ''
+        'line_nr' => 27
       }
     },
     {
@@ -791,8 +773,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               },
               'type' => 'menu_entry'
             },
@@ -824,15 +805,13 @@ $result_trees{'section_in_unnumbered_info'} = {
               },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               }
             }
           ],
           'source_info' => {
             'file_name' => 'section_in_unnumbered_text.texi',
-            'line_nr' => 30,
-            'macro' => ''
+            'line_nr' => 30
           }
         },
         {
@@ -849,8 +828,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 28,
-        'macro' => ''
+        'line_nr' => 28
       }
     },
     {
@@ -882,8 +860,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 34,
-        'macro' => ''
+        'line_nr' => 34
       }
     },
     {
@@ -919,8 +896,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 35,
-        'macro' => ''
+        'line_nr' => 35
       }
     },
     {
@@ -952,8 +928,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 37,
-        'macro' => ''
+        'line_nr' => 37
       }
     },
     {
@@ -1037,8 +1012,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 41,
-                'macro' => ''
+                'line_nr' => 41
               },
               'type' => 'menu_entry'
             },
@@ -1085,8 +1059,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               },
               'type' => 'menu_entry'
             },
@@ -1118,15 +1091,13 @@ $result_trees{'section_in_unnumbered_info'} = {
               },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               }
             }
           ],
           'source_info' => {
             'file_name' => 'section_in_unnumbered_text.texi',
-            'line_nr' => 40,
-            'macro' => ''
+            'line_nr' => 40
           }
         },
         {
@@ -1145,8 +1116,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 38,
-        'macro' => ''
+        'line_nr' => 38
       }
     },
     {
@@ -1178,8 +1148,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 45,
-        'macro' => ''
+        'line_nr' => 45
       }
     },
     {
@@ -1263,8 +1232,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               },
               'type' => 'menu_entry'
             },
@@ -1311,8 +1279,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               },
               'type' => 'menu_entry'
             },
@@ -1359,8 +1326,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 51,
-                'macro' => ''
+                'line_nr' => 51
               },
               'type' => 'menu_entry'
             },
@@ -1407,8 +1373,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               },
               'type' => 'menu_entry'
             },
@@ -1440,15 +1405,13 @@ $result_trees{'section_in_unnumbered_info'} = {
               },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               }
             }
           ],
           'source_info' => {
             'file_name' => 'section_in_unnumbered_text.texi',
-            'line_nr' => 48,
-            'macro' => ''
+            'line_nr' => 48
           }
         },
         {
@@ -1465,8 +1428,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 46,
-        'macro' => ''
+        'line_nr' => 46
       }
     },
     {
@@ -1498,8 +1460,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 55,
-        'macro' => ''
+        'line_nr' => 55
       }
     },
     {
@@ -1535,8 +1496,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 56,
-        'macro' => ''
+        'line_nr' => 56
       }
     },
     {
@@ -1568,8 +1528,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 58,
-        'macro' => ''
+        'line_nr' => 58
       }
     },
     {
@@ -1605,8 +1564,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 59,
-        'macro' => ''
+        'line_nr' => 59
       }
     },
     {
@@ -1638,8 +1596,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 61,
-        'macro' => ''
+        'line_nr' => 61
       }
     },
     {
@@ -1675,8 +1632,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 62,
-        'macro' => ''
+        'line_nr' => 62
       }
     },
     {
@@ -1708,8 +1664,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 64,
-        'macro' => ''
+        'line_nr' => 64
       }
     },
     {
@@ -1745,8 +1700,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 65,
-        'macro' => ''
+        'line_nr' => 65
       }
     },
     {
@@ -1778,8 +1732,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 67,
-        'macro' => ''
+        'line_nr' => 67
       }
     },
     {
@@ -1863,8 +1816,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               },
               'type' => 'menu_entry'
             },
@@ -1896,15 +1848,13 @@ $result_trees{'section_in_unnumbered_info'} = {
               },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 72,
-                'macro' => ''
+                'line_nr' => 72
               }
             }
           ],
           'source_info' => {
             'file_name' => 'section_in_unnumbered_text.texi',
-            'line_nr' => 70,
-            'macro' => ''
+            'line_nr' => 70
           }
         },
         {
@@ -1921,8 +1871,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 68,
-        'macro' => ''
+        'line_nr' => 68
       }
     },
     {
@@ -1954,8 +1903,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 74,
-        'macro' => ''
+        'line_nr' => 74
       }
     },
     {
@@ -1996,8 +1944,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 75,
-        'macro' => ''
+        'line_nr' => 75
       }
     },
     {
@@ -2029,8 +1976,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 78,
-        'macro' => ''
+        'line_nr' => 78
       }
     },
     {
@@ -2114,8 +2060,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 82,
-                'macro' => ''
+                'line_nr' => 82
               },
               'type' => 'menu_entry'
             },
@@ -2162,8 +2107,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 83,
-                'macro' => ''
+                'line_nr' => 83
               },
               'type' => 'menu_entry'
             },
@@ -2210,8 +2154,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 84,
-                'macro' => ''
+                'line_nr' => 84
               },
               'type' => 'menu_entry'
             },
@@ -2258,8 +2201,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 85,
-                'macro' => ''
+                'line_nr' => 85
               },
               'type' => 'menu_entry'
             },
@@ -2306,8 +2248,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 86,
-                'macro' => ''
+                'line_nr' => 86
               },
               'type' => 'menu_entry'
             },
@@ -2339,15 +2280,13 @@ $result_trees{'section_in_unnumbered_info'} = {
               },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 87,
-                'macro' => ''
+                'line_nr' => 87
               }
             }
           ],
           'source_info' => {
             'file_name' => 'section_in_unnumbered_text.texi',
-            'line_nr' => 81,
-            'macro' => ''
+            'line_nr' => 81
           }
         },
         {
@@ -2366,8 +2305,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 79,
-        'macro' => ''
+        'line_nr' => 79
       }
     },
     {
@@ -2399,8 +2337,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 89,
-        'macro' => ''
+        'line_nr' => 89
       }
     },
     {
@@ -2484,8 +2421,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 93,
-                'macro' => ''
+                'line_nr' => 93
               },
               'type' => 'menu_entry'
             },
@@ -2532,8 +2468,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 94,
-                'macro' => ''
+                'line_nr' => 94
               },
               'type' => 'menu_entry'
             },
@@ -2580,8 +2515,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 95,
-                'macro' => ''
+                'line_nr' => 95
               },
               'type' => 'menu_entry'
             },
@@ -2628,8 +2562,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 96,
-                'macro' => ''
+                'line_nr' => 96
               },
               'type' => 'menu_entry'
             },
@@ -2661,15 +2594,13 @@ $result_trees{'section_in_unnumbered_info'} = {
               },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 97,
-                'macro' => ''
+                'line_nr' => 97
               }
             }
           ],
           'source_info' => {
             'file_name' => 'section_in_unnumbered_text.texi',
-            'line_nr' => 92,
-            'macro' => ''
+            'line_nr' => 92
           }
         },
         {
@@ -2686,8 +2617,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 90,
-        'macro' => ''
+        'line_nr' => 90
       }
     },
     {
@@ -2719,8 +2649,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 99,
-        'macro' => ''
+        'line_nr' => 99
       }
     },
     {
@@ -2756,8 +2685,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 100,
-        'macro' => ''
+        'line_nr' => 100
       }
     },
     {
@@ -2789,8 +2717,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 102,
-        'macro' => ''
+        'line_nr' => 102
       }
     },
     {
@@ -2826,8 +2753,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 103,
-        'macro' => ''
+        'line_nr' => 103
       }
     },
     {
@@ -2859,8 +2785,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 105,
-        'macro' => ''
+        'line_nr' => 105
       }
     },
     {
@@ -2896,8 +2821,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 106,
-        'macro' => ''
+        'line_nr' => 106
       }
     },
     {
@@ -2929,8 +2853,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 108,
-        'macro' => ''
+        'line_nr' => 108
       }
     },
     {
@@ -2966,8 +2889,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 109,
-        'macro' => ''
+        'line_nr' => 109
       }
     },
     {
@@ -2999,8 +2921,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 111,
-        'macro' => ''
+        'line_nr' => 111
       }
     },
     {
@@ -3038,8 +2959,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 112,
-        'macro' => ''
+        'line_nr' => 112
       }
     },
     {
@@ -3071,8 +2991,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 114,
-        'macro' => ''
+        'line_nr' => 114
       }
     },
     {
@@ -3156,8 +3075,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 118,
-                'macro' => ''
+                'line_nr' => 118
               },
               'type' => 'menu_entry'
             },
@@ -3189,15 +3107,13 @@ $result_trees{'section_in_unnumbered_info'} = {
               },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 119,
-                'macro' => ''
+                'line_nr' => 119
               }
             }
           ],
           'source_info' => {
             'file_name' => 'section_in_unnumbered_text.texi',
-            'line_nr' => 117,
-            'macro' => ''
+            'line_nr' => 117
           }
         },
         {
@@ -3214,8 +3130,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 115,
-        'macro' => ''
+        'line_nr' => 115
       }
     },
     {
@@ -3247,8 +3162,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 121,
-        'macro' => ''
+        'line_nr' => 121
       }
     },
     {
@@ -3284,8 +3198,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 122,
-        'macro' => ''
+        'line_nr' => 122
       }
     },
     {
@@ -3317,8 +3230,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 124,
-        'macro' => ''
+        'line_nr' => 124
       }
     },
     {
@@ -3402,8 +3314,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 128,
-                'macro' => ''
+                'line_nr' => 128
               },
               'type' => 'menu_entry'
             },
@@ -3435,15 +3346,13 @@ $result_trees{'section_in_unnumbered_info'} = {
               },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 129,
-                'macro' => ''
+                'line_nr' => 129
               }
             }
           ],
           'source_info' => {
             'file_name' => 'section_in_unnumbered_text.texi',
-            'line_nr' => 127,
-            'macro' => ''
+            'line_nr' => 127
           }
         },
         {
@@ -3462,8 +3371,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 125,
-        'macro' => ''
+        'line_nr' => 125
       }
     },
     {
@@ -3495,8 +3403,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 131,
-        'macro' => ''
+        'line_nr' => 131
       }
     },
     {
@@ -3534,8 +3441,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 132,
-        'macro' => ''
+        'line_nr' => 132
       }
     },
     {
@@ -3567,8 +3473,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 134,
-        'macro' => ''
+        'line_nr' => 134
       }
     },
     {
@@ -3652,8 +3557,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 138,
-                'macro' => ''
+                'line_nr' => 138
               },
               'type' => 'menu_entry'
             },
@@ -3685,15 +3589,13 @@ $result_trees{'section_in_unnumbered_info'} = {
               },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 139,
-                'macro' => ''
+                'line_nr' => 139
               }
             }
           ],
           'source_info' => {
             'file_name' => 'section_in_unnumbered_text.texi',
-            'line_nr' => 137,
-            'macro' => ''
+            'line_nr' => 137
           }
         },
         {
@@ -3710,8 +3612,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 135,
-        'macro' => ''
+        'line_nr' => 135
       }
     },
     {
@@ -3743,8 +3644,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 141,
-        'macro' => ''
+        'line_nr' => 141
       }
     },
     {
@@ -3780,8 +3680,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 142,
-        'macro' => ''
+        'line_nr' => 142
       }
     },
     {
@@ -3813,8 +3712,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 144,
-        'macro' => ''
+        'line_nr' => 144
       }
     },
     {
@@ -3898,8 +3796,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 148,
-                'macro' => ''
+                'line_nr' => 148
               },
               'type' => 'menu_entry'
             },
@@ -3931,15 +3828,13 @@ $result_trees{'section_in_unnumbered_info'} = {
               },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 149,
-                'macro' => ''
+                'line_nr' => 149
               }
             }
           ],
           'source_info' => {
             'file_name' => 'section_in_unnumbered_text.texi',
-            'line_nr' => 147,
-            'macro' => ''
+            'line_nr' => 147
           }
         },
         {
@@ -3956,8 +3851,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 145,
-        'macro' => ''
+        'line_nr' => 145
       }
     },
     {
@@ -3989,8 +3883,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 151,
-        'macro' => ''
+        'line_nr' => 151
       }
     },
     {
@@ -4074,8 +3967,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 155,
-                'macro' => ''
+                'line_nr' => 155
               },
               'type' => 'menu_entry'
             },
@@ -4122,8 +4014,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 156,
-                'macro' => ''
+                'line_nr' => 156
               },
               'type' => 'menu_entry'
             },
@@ -4170,8 +4061,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 157,
-                'macro' => ''
+                'line_nr' => 157
               },
               'type' => 'menu_entry'
             },
@@ -4218,8 +4108,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 158,
-                'macro' => ''
+                'line_nr' => 158
               },
               'type' => 'menu_entry'
             },
@@ -4251,15 +4140,13 @@ $result_trees{'section_in_unnumbered_info'} = {
               },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 159,
-                'macro' => ''
+                'line_nr' => 159
               }
             }
           ],
           'source_info' => {
             'file_name' => 'section_in_unnumbered_text.texi',
-            'line_nr' => 154,
-            'macro' => ''
+            'line_nr' => 154
           }
         },
         {
@@ -4276,8 +4163,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 152,
-        'macro' => ''
+        'line_nr' => 152
       }
     },
     {
@@ -4309,8 +4195,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 161,
-        'macro' => ''
+        'line_nr' => 161
       }
     },
     {
@@ -4346,8 +4231,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 162,
-        'macro' => ''
+        'line_nr' => 162
       }
     },
     {
@@ -4379,8 +4263,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 164,
-        'macro' => ''
+        'line_nr' => 164
       }
     },
     {
@@ -4416,8 +4299,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 165,
-        'macro' => ''
+        'line_nr' => 165
       }
     },
     {
@@ -4449,8 +4331,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 167,
-        'macro' => ''
+        'line_nr' => 167
       }
     },
     {
@@ -4486,8 +4367,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 168,
-        'macro' => ''
+        'line_nr' => 168
       }
     },
     {
@@ -4519,8 +4399,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 170,
-        'macro' => ''
+        'line_nr' => 170
       }
     },
     {
@@ -4549,8 +4428,7 @@ $result_trees{'section_in_unnumbered_info'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 171,
-        'macro' => ''
+        'line_nr' => 171
       }
     }
   ],
diff --git a/tp/t/results/moresectioning/section_in_unnumbered_plaintext.pl 
b/tp/t/results/moresectioning/section_in_unnumbered_plaintext.pl
index 5738945c28..a1c7b8fbf3 100644
--- a/tp/t/results/moresectioning/section_in_unnumbered_plaintext.pl
+++ b/tp/t/results/moresectioning/section_in_unnumbered_plaintext.pl
@@ -54,8 +54,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -93,8 +92,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'section_in_unnumbered_text.texi',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -173,8 +171,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'menu_entry'
             },
@@ -221,8 +218,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -269,8 +265,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               },
               'type' => 'menu_entry'
             },
@@ -317,8 +312,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               },
               'type' => 'menu_entry'
             },
@@ -365,8 +359,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               },
               'type' => 'menu_entry'
             },
@@ -398,15 +391,13 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
           'source_info' => {
             'file_name' => 'section_in_unnumbered_text.texi',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -423,8 +414,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -456,8 +446,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -541,8 +530,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               },
               'type' => 'menu_entry'
             },
@@ -574,15 +562,13 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           ],
           'source_info' => {
             'file_name' => 'section_in_unnumbered_text.texi',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
@@ -601,8 +587,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -634,8 +619,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     },
     {
@@ -673,8 +657,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
@@ -706,8 +689,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 27,
-        'macro' => ''
+        'line_nr' => 27
       }
     },
     {
@@ -791,8 +773,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               },
               'type' => 'menu_entry'
             },
@@ -824,15 +805,13 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               }
             }
           ],
           'source_info' => {
             'file_name' => 'section_in_unnumbered_text.texi',
-            'line_nr' => 30,
-            'macro' => ''
+            'line_nr' => 30
           }
         },
         {
@@ -849,8 +828,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 28,
-        'macro' => ''
+        'line_nr' => 28
       }
     },
     {
@@ -882,8 +860,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 34,
-        'macro' => ''
+        'line_nr' => 34
       }
     },
     {
@@ -919,8 +896,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 35,
-        'macro' => ''
+        'line_nr' => 35
       }
     },
     {
@@ -952,8 +928,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 37,
-        'macro' => ''
+        'line_nr' => 37
       }
     },
     {
@@ -1037,8 +1012,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 41,
-                'macro' => ''
+                'line_nr' => 41
               },
               'type' => 'menu_entry'
             },
@@ -1085,8 +1059,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               },
               'type' => 'menu_entry'
             },
@@ -1118,15 +1091,13 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               }
             }
           ],
           'source_info' => {
             'file_name' => 'section_in_unnumbered_text.texi',
-            'line_nr' => 40,
-            'macro' => ''
+            'line_nr' => 40
           }
         },
         {
@@ -1145,8 +1116,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 38,
-        'macro' => ''
+        'line_nr' => 38
       }
     },
     {
@@ -1178,8 +1148,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 45,
-        'macro' => ''
+        'line_nr' => 45
       }
     },
     {
@@ -1263,8 +1232,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               },
               'type' => 'menu_entry'
             },
@@ -1311,8 +1279,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               },
               'type' => 'menu_entry'
             },
@@ -1359,8 +1326,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 51,
-                'macro' => ''
+                'line_nr' => 51
               },
               'type' => 'menu_entry'
             },
@@ -1407,8 +1373,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               },
               'type' => 'menu_entry'
             },
@@ -1440,15 +1405,13 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               }
             }
           ],
           'source_info' => {
             'file_name' => 'section_in_unnumbered_text.texi',
-            'line_nr' => 48,
-            'macro' => ''
+            'line_nr' => 48
           }
         },
         {
@@ -1465,8 +1428,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 46,
-        'macro' => ''
+        'line_nr' => 46
       }
     },
     {
@@ -1498,8 +1460,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 55,
-        'macro' => ''
+        'line_nr' => 55
       }
     },
     {
@@ -1535,8 +1496,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 56,
-        'macro' => ''
+        'line_nr' => 56
       }
     },
     {
@@ -1568,8 +1528,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 58,
-        'macro' => ''
+        'line_nr' => 58
       }
     },
     {
@@ -1605,8 +1564,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 59,
-        'macro' => ''
+        'line_nr' => 59
       }
     },
     {
@@ -1638,8 +1596,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 61,
-        'macro' => ''
+        'line_nr' => 61
       }
     },
     {
@@ -1675,8 +1632,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 62,
-        'macro' => ''
+        'line_nr' => 62
       }
     },
     {
@@ -1708,8 +1664,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 64,
-        'macro' => ''
+        'line_nr' => 64
       }
     },
     {
@@ -1745,8 +1700,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 65,
-        'macro' => ''
+        'line_nr' => 65
       }
     },
     {
@@ -1778,8 +1732,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 67,
-        'macro' => ''
+        'line_nr' => 67
       }
     },
     {
@@ -1863,8 +1816,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               },
               'type' => 'menu_entry'
             },
@@ -1896,15 +1848,13 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 72,
-                'macro' => ''
+                'line_nr' => 72
               }
             }
           ],
           'source_info' => {
             'file_name' => 'section_in_unnumbered_text.texi',
-            'line_nr' => 70,
-            'macro' => ''
+            'line_nr' => 70
           }
         },
         {
@@ -1921,8 +1871,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 68,
-        'macro' => ''
+        'line_nr' => 68
       }
     },
     {
@@ -1954,8 +1903,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 74,
-        'macro' => ''
+        'line_nr' => 74
       }
     },
     {
@@ -1996,8 +1944,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 75,
-        'macro' => ''
+        'line_nr' => 75
       }
     },
     {
@@ -2029,8 +1976,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 78,
-        'macro' => ''
+        'line_nr' => 78
       }
     },
     {
@@ -2114,8 +2060,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 82,
-                'macro' => ''
+                'line_nr' => 82
               },
               'type' => 'menu_entry'
             },
@@ -2162,8 +2107,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 83,
-                'macro' => ''
+                'line_nr' => 83
               },
               'type' => 'menu_entry'
             },
@@ -2210,8 +2154,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 84,
-                'macro' => ''
+                'line_nr' => 84
               },
               'type' => 'menu_entry'
             },
@@ -2258,8 +2201,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 85,
-                'macro' => ''
+                'line_nr' => 85
               },
               'type' => 'menu_entry'
             },
@@ -2306,8 +2248,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 86,
-                'macro' => ''
+                'line_nr' => 86
               },
               'type' => 'menu_entry'
             },
@@ -2339,15 +2280,13 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 87,
-                'macro' => ''
+                'line_nr' => 87
               }
             }
           ],
           'source_info' => {
             'file_name' => 'section_in_unnumbered_text.texi',
-            'line_nr' => 81,
-            'macro' => ''
+            'line_nr' => 81
           }
         },
         {
@@ -2366,8 +2305,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 79,
-        'macro' => ''
+        'line_nr' => 79
       }
     },
     {
@@ -2399,8 +2337,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 89,
-        'macro' => ''
+        'line_nr' => 89
       }
     },
     {
@@ -2484,8 +2421,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 93,
-                'macro' => ''
+                'line_nr' => 93
               },
               'type' => 'menu_entry'
             },
@@ -2532,8 +2468,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 94,
-                'macro' => ''
+                'line_nr' => 94
               },
               'type' => 'menu_entry'
             },
@@ -2580,8 +2515,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 95,
-                'macro' => ''
+                'line_nr' => 95
               },
               'type' => 'menu_entry'
             },
@@ -2628,8 +2562,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 96,
-                'macro' => ''
+                'line_nr' => 96
               },
               'type' => 'menu_entry'
             },
@@ -2661,15 +2594,13 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 97,
-                'macro' => ''
+                'line_nr' => 97
               }
             }
           ],
           'source_info' => {
             'file_name' => 'section_in_unnumbered_text.texi',
-            'line_nr' => 92,
-            'macro' => ''
+            'line_nr' => 92
           }
         },
         {
@@ -2686,8 +2617,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 90,
-        'macro' => ''
+        'line_nr' => 90
       }
     },
     {
@@ -2719,8 +2649,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 99,
-        'macro' => ''
+        'line_nr' => 99
       }
     },
     {
@@ -2756,8 +2685,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 100,
-        'macro' => ''
+        'line_nr' => 100
       }
     },
     {
@@ -2789,8 +2717,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 102,
-        'macro' => ''
+        'line_nr' => 102
       }
     },
     {
@@ -2826,8 +2753,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 103,
-        'macro' => ''
+        'line_nr' => 103
       }
     },
     {
@@ -2859,8 +2785,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 105,
-        'macro' => ''
+        'line_nr' => 105
       }
     },
     {
@@ -2896,8 +2821,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 106,
-        'macro' => ''
+        'line_nr' => 106
       }
     },
     {
@@ -2929,8 +2853,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 108,
-        'macro' => ''
+        'line_nr' => 108
       }
     },
     {
@@ -2966,8 +2889,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 109,
-        'macro' => ''
+        'line_nr' => 109
       }
     },
     {
@@ -2999,8 +2921,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 111,
-        'macro' => ''
+        'line_nr' => 111
       }
     },
     {
@@ -3038,8 +2959,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 112,
-        'macro' => ''
+        'line_nr' => 112
       }
     },
     {
@@ -3071,8 +2991,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 114,
-        'macro' => ''
+        'line_nr' => 114
       }
     },
     {
@@ -3156,8 +3075,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 118,
-                'macro' => ''
+                'line_nr' => 118
               },
               'type' => 'menu_entry'
             },
@@ -3189,15 +3107,13 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 119,
-                'macro' => ''
+                'line_nr' => 119
               }
             }
           ],
           'source_info' => {
             'file_name' => 'section_in_unnumbered_text.texi',
-            'line_nr' => 117,
-            'macro' => ''
+            'line_nr' => 117
           }
         },
         {
@@ -3214,8 +3130,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 115,
-        'macro' => ''
+        'line_nr' => 115
       }
     },
     {
@@ -3247,8 +3162,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 121,
-        'macro' => ''
+        'line_nr' => 121
       }
     },
     {
@@ -3284,8 +3198,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 122,
-        'macro' => ''
+        'line_nr' => 122
       }
     },
     {
@@ -3317,8 +3230,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 124,
-        'macro' => ''
+        'line_nr' => 124
       }
     },
     {
@@ -3402,8 +3314,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 128,
-                'macro' => ''
+                'line_nr' => 128
               },
               'type' => 'menu_entry'
             },
@@ -3435,15 +3346,13 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 129,
-                'macro' => ''
+                'line_nr' => 129
               }
             }
           ],
           'source_info' => {
             'file_name' => 'section_in_unnumbered_text.texi',
-            'line_nr' => 127,
-            'macro' => ''
+            'line_nr' => 127
           }
         },
         {
@@ -3462,8 +3371,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 125,
-        'macro' => ''
+        'line_nr' => 125
       }
     },
     {
@@ -3495,8 +3403,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 131,
-        'macro' => ''
+        'line_nr' => 131
       }
     },
     {
@@ -3534,8 +3441,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 132,
-        'macro' => ''
+        'line_nr' => 132
       }
     },
     {
@@ -3567,8 +3473,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 134,
-        'macro' => ''
+        'line_nr' => 134
       }
     },
     {
@@ -3652,8 +3557,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 138,
-                'macro' => ''
+                'line_nr' => 138
               },
               'type' => 'menu_entry'
             },
@@ -3685,15 +3589,13 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 139,
-                'macro' => ''
+                'line_nr' => 139
               }
             }
           ],
           'source_info' => {
             'file_name' => 'section_in_unnumbered_text.texi',
-            'line_nr' => 137,
-            'macro' => ''
+            'line_nr' => 137
           }
         },
         {
@@ -3710,8 +3612,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 135,
-        'macro' => ''
+        'line_nr' => 135
       }
     },
     {
@@ -3743,8 +3644,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 141,
-        'macro' => ''
+        'line_nr' => 141
       }
     },
     {
@@ -3780,8 +3680,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 142,
-        'macro' => ''
+        'line_nr' => 142
       }
     },
     {
@@ -3813,8 +3712,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 144,
-        'macro' => ''
+        'line_nr' => 144
       }
     },
     {
@@ -3898,8 +3796,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 148,
-                'macro' => ''
+                'line_nr' => 148
               },
               'type' => 'menu_entry'
             },
@@ -3931,15 +3828,13 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 149,
-                'macro' => ''
+                'line_nr' => 149
               }
             }
           ],
           'source_info' => {
             'file_name' => 'section_in_unnumbered_text.texi',
-            'line_nr' => 147,
-            'macro' => ''
+            'line_nr' => 147
           }
         },
         {
@@ -3956,8 +3851,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 145,
-        'macro' => ''
+        'line_nr' => 145
       }
     },
     {
@@ -3989,8 +3883,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 151,
-        'macro' => ''
+        'line_nr' => 151
       }
     },
     {
@@ -4074,8 +3967,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 155,
-                'macro' => ''
+                'line_nr' => 155
               },
               'type' => 'menu_entry'
             },
@@ -4122,8 +4014,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 156,
-                'macro' => ''
+                'line_nr' => 156
               },
               'type' => 'menu_entry'
             },
@@ -4170,8 +4061,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 157,
-                'macro' => ''
+                'line_nr' => 157
               },
               'type' => 'menu_entry'
             },
@@ -4218,8 +4108,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 158,
-                'macro' => ''
+                'line_nr' => 158
               },
               'type' => 'menu_entry'
             },
@@ -4251,15 +4140,13 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
-                'line_nr' => 159,
-                'macro' => ''
+                'line_nr' => 159
               }
             }
           ],
           'source_info' => {
             'file_name' => 'section_in_unnumbered_text.texi',
-            'line_nr' => 154,
-            'macro' => ''
+            'line_nr' => 154
           }
         },
         {
@@ -4276,8 +4163,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 152,
-        'macro' => ''
+        'line_nr' => 152
       }
     },
     {
@@ -4309,8 +4195,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 161,
-        'macro' => ''
+        'line_nr' => 161
       }
     },
     {
@@ -4346,8 +4231,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 162,
-        'macro' => ''
+        'line_nr' => 162
       }
     },
     {
@@ -4379,8 +4263,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 164,
-        'macro' => ''
+        'line_nr' => 164
       }
     },
     {
@@ -4416,8 +4299,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 165,
-        'macro' => ''
+        'line_nr' => 165
       }
     },
     {
@@ -4449,8 +4331,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 167,
-        'macro' => ''
+        'line_nr' => 167
       }
     },
     {
@@ -4486,8 +4367,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 168,
-        'macro' => ''
+        'line_nr' => 168
       }
     },
     {
@@ -4519,8 +4399,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 170,
-        'macro' => ''
+        'line_nr' => 170
       }
     },
     {
@@ -4549,8 +4428,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       },
       'source_info' => {
         'file_name' => 'section_in_unnumbered_text.texi',
-        'line_nr' => 171,
-        'macro' => ''
+        'line_nr' => 171
       }
     }
   ],
diff --git a/tp/t/results/moresectioning/sectioning_part_appendix.pl 
b/tp/t/results/moresectioning/sectioning_part_appendix.pl
index b15f822b8a..cee266d405 100644
--- a/tp/t/results/moresectioning/sectioning_part_appendix.pl
+++ b/tp/t/results/moresectioning/sectioning_part_appendix.pl
@@ -40,8 +40,7 @@ $result_trees{'sectioning_part_appendix'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     'unit_contents' => [
@@ -88,8 +87,7 @@ $result_trees{'sectioning_part_appendix'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     'unit_contents' => [
@@ -133,8 +131,7 @@ $result_trees{'sectioning_part_appendix'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     'unit_contents' => [
@@ -178,8 +175,7 @@ $result_trees{'sectioning_part_appendix'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     'unit_contents' => [
@@ -223,8 +219,7 @@ $result_trees{'sectioning_part_appendix'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     'unit_contents' => [
@@ -292,8 +287,7 @@ $result_trees{'sectioning_part_appendix'} = [
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         'section_number' => '2'
@@ -305,8 +299,7 @@ $result_trees{'sectioning_part_appendix'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     'unit_contents' => [
@@ -351,8 +344,7 @@ $result_trees{'sectioning_part_appendix'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     'unit_contents' => [
@@ -394,8 +386,7 @@ $result_trees{'sectioning_part_appendix'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     'unit_contents' => [
@@ -439,8 +430,7 @@ $result_trees{'sectioning_part_appendix'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 19,
-        'macro' => ''
+        'line_nr' => 19
       }
     },
     'unit_contents' => [
@@ -477,8 +467,7 @@ $result_trees{'sectioning_part_appendix'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 21,
-        'macro' => ''
+        'line_nr' => 21
       }
     },
     'unit_contents' => [
diff --git a/tp/t/results/moresectioning/sectioning_part_appendix_no_top.pl 
b/tp/t/results/moresectioning/sectioning_part_appendix_no_top.pl
index 9020e4bb6c..a7fd466a7e 100644
--- a/tp/t/results/moresectioning/sectioning_part_appendix_no_top.pl
+++ b/tp/t/results/moresectioning/sectioning_part_appendix_no_top.pl
@@ -42,8 +42,7 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     'unit_contents' => [
@@ -90,8 +89,7 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     'unit_contents' => [
@@ -135,8 +133,7 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     'unit_contents' => [
@@ -180,8 +177,7 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     'unit_contents' => [
@@ -249,8 +245,7 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         'section_number' => '2'
@@ -262,8 +257,7 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     'unit_contents' => [
@@ -308,8 +302,7 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     'unit_contents' => [
@@ -351,8 +344,7 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     'unit_contents' => [
@@ -396,8 +388,7 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     'unit_contents' => [
@@ -434,8 +425,7 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 19,
-        'macro' => ''
+        'line_nr' => 19
       }
     },
     'unit_contents' => [
diff --git 
a/tp/t/results/moresectioning/sectioning_part_appendix_texi2html_chapter.pl 
b/tp/t/results/moresectioning/sectioning_part_appendix_texi2html_chapter.pl
index db1ce898bd..c99145d88a 100644
--- a/tp/t/results/moresectioning/sectioning_part_appendix_texi2html_chapter.pl
+++ b/tp/t/results/moresectioning/sectioning_part_appendix_texi2html_chapter.pl
@@ -48,8 +48,7 @@ $result_trees{'sectioning_part_appendix_texi2html_chapter'} = 
{
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -87,8 +86,7 @@ $result_trees{'sectioning_part_appendix_texi2html_chapter'} = 
{
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -126,8 +124,7 @@ $result_trees{'sectioning_part_appendix_texi2html_chapter'} 
= {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -165,8 +162,7 @@ $result_trees{'sectioning_part_appendix_texi2html_chapter'} 
= {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -204,8 +200,7 @@ $result_trees{'sectioning_part_appendix_texi2html_chapter'} 
= {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -241,8 +236,7 @@ $result_trees{'sectioning_part_appendix_texi2html_chapter'} 
= {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -281,8 +275,7 @@ $result_trees{'sectioning_part_appendix_texi2html_chapter'} 
= {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -320,8 +313,7 @@ $result_trees{'sectioning_part_appendix_texi2html_chapter'} 
= {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -357,8 +349,7 @@ $result_trees{'sectioning_part_appendix_texi2html_chapter'} 
= {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -396,8 +387,7 @@ $result_trees{'sectioning_part_appendix_texi2html_chapter'} 
= {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 19,
-        'macro' => ''
+        'line_nr' => 19
       }
     },
     {
@@ -428,8 +418,7 @@ $result_trees{'sectioning_part_appendix_texi2html_chapter'} 
= {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 21,
-        'macro' => ''
+        'line_nr' => 21
       }
     }
   ],
diff --git a/tp/t/results/moresectioning/sections_test.pl 
b/tp/t/results/moresectioning/sections_test.pl
index 06030e3d3b..d6b492a14e 100644
--- a/tp/t/results/moresectioning/sections_test.pl
+++ b/tp/t/results/moresectioning/sections_test.pl
@@ -48,8 +48,7 @@ $result_trees{'sections_test'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -87,8 +86,7 @@ $result_trees{'sections_test'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -126,8 +124,7 @@ $result_trees{'sections_test'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -165,8 +162,7 @@ $result_trees{'sections_test'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -204,8 +200,7 @@ $result_trees{'sections_test'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -241,8 +236,7 @@ $result_trees{'sections_test'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -281,8 +275,7 @@ $result_trees{'sections_test'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -320,8 +313,7 @@ $result_trees{'sections_test'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -357,8 +349,7 @@ $result_trees{'sections_test'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -396,8 +387,7 @@ $result_trees{'sections_test'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 19,
-        'macro' => ''
+        'line_nr' => 19
       }
     },
     {
@@ -428,8 +418,7 @@ $result_trees{'sections_test'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 21,
-        'macro' => ''
+        'line_nr' => 21
       }
     }
   ],
diff --git a/tp/t/results/moresectioning/sections_test_no_use_nodes.pl 
b/tp/t/results/moresectioning/sections_test_no_use_nodes.pl
index 89f0e1f305..2e96f4174e 100644
--- a/tp/t/results/moresectioning/sections_test_no_use_nodes.pl
+++ b/tp/t/results/moresectioning/sections_test_no_use_nodes.pl
@@ -48,8 +48,7 @@ $result_trees{'sections_test_no_use_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -87,8 +86,7 @@ $result_trees{'sections_test_no_use_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -126,8 +124,7 @@ $result_trees{'sections_test_no_use_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -165,8 +162,7 @@ $result_trees{'sections_test_no_use_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -204,8 +200,7 @@ $result_trees{'sections_test_no_use_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -241,8 +236,7 @@ $result_trees{'sections_test_no_use_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -281,8 +275,7 @@ $result_trees{'sections_test_no_use_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -320,8 +313,7 @@ $result_trees{'sections_test_no_use_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -357,8 +349,7 @@ $result_trees{'sections_test_no_use_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -396,8 +387,7 @@ $result_trees{'sections_test_no_use_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 19,
-        'macro' => ''
+        'line_nr' => 19
       }
     },
     {
@@ -428,8 +418,7 @@ $result_trees{'sections_test_no_use_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 21,
-        'macro' => ''
+        'line_nr' => 21
       }
     }
   ],
diff --git 
a/tp/t/results/moresectioning/sections_test_no_use_nodes_use_node_directions.pl 
b/tp/t/results/moresectioning/sections_test_no_use_nodes_use_node_directions.pl
index 0833763ab4..5d8224a106 100644
--- 
a/tp/t/results/moresectioning/sections_test_no_use_nodes_use_node_directions.pl
+++ 
b/tp/t/results/moresectioning/sections_test_no_use_nodes_use_node_directions.pl
@@ -48,8 +48,7 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -87,8 +86,7 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -126,8 +124,7 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -165,8 +162,7 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -204,8 +200,7 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -241,8 +236,7 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -281,8 +275,7 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -320,8 +313,7 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -357,8 +349,7 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -396,8 +387,7 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 19,
-        'macro' => ''
+        'line_nr' => 19
       }
     },
     {
@@ -428,8 +418,7 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 21,
-        'macro' => ''
+        'line_nr' => 21
       }
     }
   ],
diff --git a/tp/t/results/moresectioning/shortcontents.pl 
b/tp/t/results/moresectioning/shortcontents.pl
index 1f08295780..e0010e2d8e 100644
--- a/tp/t/results/moresectioning/shortcontents.pl
+++ b/tp/t/results/moresectioning/shortcontents.pl
@@ -48,8 +48,7 @@ $result_trees{'shortcontents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -87,8 +86,7 @@ $result_trees{'shortcontents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -126,8 +124,7 @@ $result_trees{'shortcontents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -165,8 +162,7 @@ $result_trees{'shortcontents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -204,8 +200,7 @@ $result_trees{'shortcontents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -241,8 +236,7 @@ $result_trees{'shortcontents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -281,8 +275,7 @@ $result_trees{'shortcontents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -320,8 +313,7 @@ $result_trees{'shortcontents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -357,8 +349,7 @@ $result_trees{'shortcontents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -396,8 +387,7 @@ $result_trees{'shortcontents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 19,
-        'macro' => ''
+        'line_nr' => 19
       }
     },
     {
@@ -435,8 +425,7 @@ $result_trees{'shortcontents'} = {
           'cmdname' => 'shortcontents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           }
         }
       ],
@@ -450,8 +439,7 @@ $result_trees{'shortcontents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 21,
-        'macro' => ''
+        'line_nr' => 21
       }
     }
   ],
diff --git a/tp/t/results/moresectioning/special_spaces_in_nodes.pl 
b/tp/t/results/moresectioning/special_spaces_in_nodes.pl
index bfb659c6fc..8e6c669556 100644
--- a/tp/t/results/moresectioning/special_spaces_in_nodes.pl
+++ b/tp/t/results/moresectioning/special_spaces_in_nodes.pl
@@ -52,8 +52,7 @@ $result_trees{'special_spaces_in_nodes'} = {
       },
       "source_info" => {
         "file_name" => "special_spaces_in_nodes.texi",
-        "line_nr" => 2,
-        "macro" => ""
+        "line_nr" => 2
       }
     },
     {
@@ -87,8 +86,7 @@ $result_trees{'special_spaces_in_nodes'} = {
       },
       "source_info" => {
         "file_name" => "special_spaces_in_nodes.texi",
-        "line_nr" => 3,
-        "macro" => ""
+        "line_nr" => 3
       }
     },
     {
@@ -119,8 +117,7 @@ $result_trees{'special_spaces_in_nodes'} = {
       },
       "source_info" => {
         "file_name" => "special_spaces_in_nodes.texi",
-        "line_nr" => 5,
-        "macro" => ""
+        "line_nr" => 5
       }
     },
     {
@@ -204,8 +201,7 @@ $result_trees{'special_spaces_in_nodes'} = {
               ],
               "source_info" => {
                 "file_name" => "special_spaces_in_nodes.texi",
-                "line_nr" => 10,
-                "macro" => ""
+                "line_nr" => 10
               },
               "type" => "menu_entry"
             },
@@ -251,8 +247,7 @@ $result_trees{'special_spaces_in_nodes'} = {
               ],
               "source_info" => {
                 "file_name" => "special_spaces_in_nodes.texi",
-                "line_nr" => 11,
-                "macro" => ""
+                "line_nr" => 11
               },
               "type" => "menu_entry"
             },
@@ -298,8 +293,7 @@ $result_trees{'special_spaces_in_nodes'} = {
               ],
               "source_info" => {
                 "file_name" => "special_spaces_in_nodes.texi",
-                "line_nr" => 12,
-                "macro" => ""
+                "line_nr" => 12
               },
               "type" => "menu_entry"
             },
@@ -345,8 +339,7 @@ $result_trees{'special_spaces_in_nodes'} = {
               ],
               "source_info" => {
                 "file_name" => "special_spaces_in_nodes.texi",
-                "line_nr" => 13,
-                "macro" => ""
+                "line_nr" => 13
               },
               "type" => "menu_entry"
             },
@@ -392,8 +385,7 @@ $result_trees{'special_spaces_in_nodes'} = {
               ],
               "source_info" => {
                 "file_name" => "special_spaces_in_nodes.texi",
-                "line_nr" => 14,
-                "macro" => ""
+                "line_nr" => 14
               },
               "type" => "menu_entry"
             },
@@ -439,8 +431,7 @@ $result_trees{'special_spaces_in_nodes'} = {
               ],
               "source_info" => {
                 "file_name" => "special_spaces_in_nodes.texi",
-                "line_nr" => 15,
-                "macro" => ""
+                "line_nr" => 15
               },
               "type" => "menu_entry"
             },
@@ -486,8 +477,7 @@ $result_trees{'special_spaces_in_nodes'} = {
               ],
               "source_info" => {
                 "file_name" => "special_spaces_in_nodes.texi",
-                "line_nr" => 16,
-                "macro" => ""
+                "line_nr" => 16
               },
               "type" => "menu_entry"
             },
@@ -533,8 +523,7 @@ $result_trees{'special_spaces_in_nodes'} = {
               ],
               "source_info" => {
                 "file_name" => "special_spaces_in_nodes.texi",
-                "line_nr" => 17,
-                "macro" => ""
+                "line_nr" => 17
               },
               "type" => "menu_entry"
             },
@@ -565,15 +554,13 @@ $result_trees{'special_spaces_in_nodes'} = {
               },
               "source_info" => {
                 "file_name" => "special_spaces_in_nodes.texi",
-                "line_nr" => 18,
-                "macro" => ""
+                "line_nr" => 18
               }
             }
           ],
           "source_info" => {
             "file_name" => "special_spaces_in_nodes.texi",
-            "line_nr" => 9,
-            "macro" => ""
+            "line_nr" => 9
           }
         },
         {
@@ -591,8 +578,7 @@ $result_trees{'special_spaces_in_nodes'} = {
       },
       "source_info" => {
         "file_name" => "special_spaces_in_nodes.texi",
-        "line_nr" => 6,
-        "macro" => ""
+        "line_nr" => 6
       }
     },
     {
@@ -629,8 +615,7 @@ $result_trees{'special_spaces_in_nodes'} = {
       },
       "source_info" => {
         "file_name" => "special_spaces_in_nodes.texi",
-        "line_nr" => 20,
-        "macro" => ""
+        "line_nr" => 20
       }
     },
     {
@@ -667,8 +652,7 @@ $result_trees{'special_spaces_in_nodes'} = {
       },
       "source_info" => {
         "file_name" => "special_spaces_in_nodes.texi",
-        "line_nr" => 22,
-        "macro" => ""
+        "line_nr" => 22
       }
     },
     {
@@ -705,8 +689,7 @@ $result_trees{'special_spaces_in_nodes'} = {
       },
       "source_info" => {
         "file_name" => "special_spaces_in_nodes.texi",
-        "line_nr" => 24,
-        "macro" => ""
+        "line_nr" => 24
       }
     },
     {
@@ -743,8 +726,7 @@ $result_trees{'special_spaces_in_nodes'} = {
       },
       "source_info" => {
         "file_name" => "special_spaces_in_nodes.texi",
-        "line_nr" => 26,
-        "macro" => ""
+        "line_nr" => 26
       }
     },
     {
@@ -781,8 +763,7 @@ $result_trees{'special_spaces_in_nodes'} = {
       },
       "source_info" => {
         "file_name" => "special_spaces_in_nodes.texi",
-        "line_nr" => 28,
-        "macro" => ""
+        "line_nr" => 28
       }
     },
     {
@@ -819,8 +800,7 @@ $result_trees{'special_spaces_in_nodes'} = {
       },
       "source_info" => {
         "file_name" => "special_spaces_in_nodes.texi",
-        "line_nr" => 30,
-        "macro" => ""
+        "line_nr" => 30
       }
     },
     {
@@ -857,8 +837,7 @@ $result_trees{'special_spaces_in_nodes'} = {
       },
       "source_info" => {
         "file_name" => "special_spaces_in_nodes.texi",
-        "line_nr" => 32,
-        "macro" => ""
+        "line_nr" => 32
       }
     },
     {
@@ -907,8 +886,7 @@ $result_trees{'special_spaces_in_nodes'} = {
               "cmdname" => "ref",
               "source_info" => {
                 "file_name" => "special_spaces_in_nodes.texi",
-                "line_nr" => 36,
-                "macro" => ""
+                "line_nr" => 36
               }
             },
             {
@@ -933,8 +911,7 @@ $result_trees{'special_spaces_in_nodes'} = {
       },
       "source_info" => {
         "file_name" => "special_spaces_in_nodes.texi",
-        "line_nr" => 34,
-        "macro" => ""
+        "line_nr" => 34
       }
     },
     {
diff --git a/tp/t/results/moresectioning/top_chapter_sections.pl 
b/tp/t/results/moresectioning/top_chapter_sections.pl
index 78045adc23..033f14ec21 100644
--- a/tp/t/results/moresectioning/top_chapter_sections.pl
+++ b/tp/t/results/moresectioning/top_chapter_sections.pl
@@ -40,8 +40,7 @@ $result_trees{'top_chapter_sections'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     'unit_contents' => [
@@ -86,8 +85,7 @@ $result_trees{'top_chapter_sections'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     'unit_contents' => [
@@ -131,8 +129,7 @@ $result_trees{'top_chapter_sections'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     'unit_contents' => [
@@ -176,8 +173,7 @@ $result_trees{'top_chapter_sections'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     'unit_contents' => [
@@ -221,8 +217,7 @@ $result_trees{'top_chapter_sections'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     'unit_contents' => [
@@ -266,8 +261,7 @@ $result_trees{'top_chapter_sections'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     'unit_contents' => [
@@ -311,8 +305,7 @@ $result_trees{'top_chapter_sections'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     'unit_contents' => [
@@ -356,8 +349,7 @@ $result_trees{'top_chapter_sections'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     'unit_contents' => [
@@ -394,8 +386,7 @@ $result_trees{'top_chapter_sections'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     'unit_contents' => [
diff --git a/tp/t/results/moresectioning/top_node_up_url.pl 
b/tp/t/results/moresectioning/top_node_up_url.pl
index ba0c31f4cd..7de55c55e9 100644
--- a/tp/t/results/moresectioning/top_node_up_url.pl
+++ b/tp/t/results/moresectioning/top_node_up_url.pl
@@ -36,8 +36,7 @@ $result_trees{'top_node_up_url'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     'unit_contents' => [
@@ -126,8 +125,7 @@ $result_trees{'top_node_up_url'} = [
                 ],
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 5,
-                  'macro' => ''
+                  'line_nr' => 5
                 },
                 'type' => 'menu_entry'
               },
@@ -159,15 +157,13 @@ $result_trees{'top_node_up_url'} = [
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 6,
-                  'macro' => ''
+                  'line_nr' => 6
                 }
               }
             ],
             'source_info' => {
               'file_name' => '',
-              'line_nr' => 4,
-              'macro' => ''
+              'line_nr' => 4
             }
           },
           {
@@ -184,8 +180,7 @@ $result_trees{'top_node_up_url'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 2,
-          'macro' => ''
+          'line_nr' => 2
         }
       }
     ],
@@ -221,8 +216,7 @@ $result_trees{'top_node_up_url'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     'unit_contents' => [
diff --git a/tp/t/results/moresectioning/topic_guide.pl 
b/tp/t/results/moresectioning/topic_guide.pl
index 7077d0f629..ee757bd428 100644
--- a/tp/t/results/moresectioning/topic_guide.pl
+++ b/tp/t/results/moresectioning/topic_guide.pl
@@ -59,8 +59,7 @@ $result_trees{'topic_guide'} = {
       },
       'source_info' => {
         'file_name' => 'topic_guide.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -162,8 +161,7 @@ $result_trees{'topic_guide'} = {
               ],
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'menu_entry'
             },
@@ -210,8 +208,7 @@ $result_trees{'topic_guide'} = {
               ],
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -243,15 +240,13 @@ $result_trees{'topic_guide'} = {
               },
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => 'topic_guide.texi',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -268,8 +263,7 @@ $result_trees{'topic_guide'} = {
       },
       'source_info' => {
         'file_name' => 'topic_guide.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -301,8 +295,7 @@ $result_trees{'topic_guide'} = {
       },
       'source_info' => {
         'file_name' => 'topic_guide.texi',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -400,8 +393,7 @@ $result_trees{'topic_guide'} = {
               ],
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               },
               'type' => 'menu_entry'
             },
@@ -448,8 +440,7 @@ $result_trees{'topic_guide'} = {
               ],
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               },
               'type' => 'menu_entry'
             },
@@ -496,8 +487,7 @@ $result_trees{'topic_guide'} = {
               ],
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               },
               'type' => 'menu_entry'
             },
@@ -529,15 +519,13 @@ $result_trees{'topic_guide'} = {
               },
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             }
           ],
           'source_info' => {
             'file_name' => 'topic_guide.texi',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         },
         {
@@ -556,8 +544,7 @@ $result_trees{'topic_guide'} = {
       },
       'source_info' => {
         'file_name' => 'topic_guide.texi',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -693,8 +680,7 @@ $result_trees{'topic_guide'} = {
               ],
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               },
               'type' => 'menu_entry'
             },
@@ -726,15 +712,13 @@ $result_trees{'topic_guide'} = {
               },
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               }
             }
           ],
           'source_info' => {
             'file_name' => 'topic_guide.texi',
-            'line_nr' => 29,
-            'macro' => ''
+            'line_nr' => 29
           }
         },
         {
@@ -754,8 +738,7 @@ $result_trees{'topic_guide'} = {
       },
       'source_info' => {
         'file_name' => 'topic_guide.texi',
-        'line_nr' => 25,
-        'macro' => ''
+        'line_nr' => 25
       }
     },
     {
@@ -912,8 +895,7 @@ $result_trees{'topic_guide'} = {
               ],
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               },
               'type' => 'menu_entry'
             },
@@ -945,15 +927,13 @@ $result_trees{'topic_guide'} = {
               },
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               }
             }
           ],
           'source_info' => {
             'file_name' => 'topic_guide.texi',
-            'line_nr' => 39,
-            'macro' => ''
+            'line_nr' => 39
           }
         },
         {
@@ -973,8 +953,7 @@ $result_trees{'topic_guide'} = {
       },
       'source_info' => {
         'file_name' => 'topic_guide.texi',
-        'line_nr' => 35,
-        'macro' => ''
+        'line_nr' => 35
       }
     },
     {
@@ -1116,15 +1095,13 @@ $result_trees{'topic_guide'} = {
               },
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               }
             }
           ],
           'source_info' => {
             'file_name' => 'topic_guide.texi',
-            'line_nr' => 49,
-            'macro' => ''
+            'line_nr' => 49
           }
         },
         {
@@ -1144,8 +1121,7 @@ $result_trees{'topic_guide'} = {
       },
       'source_info' => {
         'file_name' => 'topic_guide.texi',
-        'line_nr' => 45,
-        'macro' => ''
+        'line_nr' => 45
       }
     },
     {
@@ -1262,8 +1238,7 @@ $result_trees{'topic_guide'} = {
               ],
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               },
               'type' => 'menu_entry'
             },
@@ -1295,15 +1270,13 @@ $result_trees{'topic_guide'} = {
               },
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             }
           ],
           'source_info' => {
             'file_name' => 'topic_guide.texi',
-            'line_nr' => 58,
-            'macro' => ''
+            'line_nr' => 58
           }
         },
         {
@@ -1323,8 +1296,7 @@ $result_trees{'topic_guide'} = {
       },
       'source_info' => {
         'file_name' => 'topic_guide.texi',
-        'line_nr' => 54,
-        'macro' => ''
+        'line_nr' => 54
       }
     },
     {
@@ -1468,8 +1440,7 @@ $result_trees{'topic_guide'} = {
               ],
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               },
               'type' => 'menu_entry'
             },
@@ -1516,8 +1487,7 @@ $result_trees{'topic_guide'} = {
               ],
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
-                'line_nr' => 72,
-                'macro' => ''
+                'line_nr' => 72
               },
               'type' => 'menu_entry'
             },
@@ -1549,15 +1519,13 @@ $result_trees{'topic_guide'} = {
               },
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
-                'line_nr' => 73,
-                'macro' => ''
+                'line_nr' => 73
               }
             }
           ],
           'source_info' => {
             'file_name' => 'topic_guide.texi',
-            'line_nr' => 68,
-            'macro' => ''
+            'line_nr' => 68
           }
         },
         {
@@ -1577,8 +1545,7 @@ $result_trees{'topic_guide'} = {
       },
       'source_info' => {
         'file_name' => 'topic_guide.texi',
-        'line_nr' => 64,
-        'macro' => ''
+        'line_nr' => 64
       }
     },
     {
@@ -1610,8 +1577,7 @@ $result_trees{'topic_guide'} = {
       },
       'source_info' => {
         'file_name' => 'topic_guide.texi',
-        'line_nr' => 75,
-        'macro' => ''
+        'line_nr' => 75
       }
     },
     {
@@ -1709,8 +1675,7 @@ $result_trees{'topic_guide'} = {
               ],
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
-                'line_nr' => 81,
-                'macro' => ''
+                'line_nr' => 81
               },
               'type' => 'menu_entry'
             },
@@ -1757,8 +1722,7 @@ $result_trees{'topic_guide'} = {
               ],
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
-                'line_nr' => 82,
-                'macro' => ''
+                'line_nr' => 82
               },
               'type' => 'menu_entry'
             },
@@ -1790,15 +1754,13 @@ $result_trees{'topic_guide'} = {
               },
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
-                'line_nr' => 83,
-                'macro' => ''
+                'line_nr' => 83
               }
             }
           ],
           'source_info' => {
             'file_name' => 'topic_guide.texi',
-            'line_nr' => 80,
-            'macro' => ''
+            'line_nr' => 80
           }
         },
         {
@@ -1817,8 +1779,7 @@ $result_trees{'topic_guide'} = {
       },
       'source_info' => {
         'file_name' => 'topic_guide.texi',
-        'line_nr' => 76,
-        'macro' => ''
+        'line_nr' => 76
       }
     },
     {
diff --git a/tp/t/results/multitable/empty_headitem.pl 
b/tp/t/results/multitable/empty_headitem.pl
index d56c335527..60b70e38cd 100644
--- a/tp/t/results/multitable/empty_headitem.pl
+++ b/tp/t/results/multitable/empty_headitem.pl
@@ -45,8 +45,7 @@ $result_trees{'empty_headitem'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 }
               ],
@@ -72,8 +71,7 @@ $result_trees{'empty_headitem'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -97,8 +95,7 @@ $result_trees{'empty_headitem'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -123,8 +120,7 @@ $result_trees{'empty_headitem'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -153,8 +149,7 @@ $result_trees{'empty_headitem'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     },
                     {
@@ -180,8 +175,7 @@ $result_trees{'empty_headitem'} = {
                               'cmdname' => 'code',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 3,
-                                'macro' => ''
+                                'line_nr' => 3
                               }
                             },
                             {
@@ -196,8 +190,7 @@ $result_trees{'empty_headitem'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     },
                     {
@@ -223,8 +216,7 @@ $result_trees{'empty_headitem'} = {
                               'cmdname' => 'code',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 3,
-                                'macro' => ''
+                                'line_nr' => 3
                               }
                             },
                             {
@@ -240,8 +232,7 @@ $result_trees{'empty_headitem'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -281,8 +272,7 @@ $result_trees{'empty_headitem'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -297,8 +287,7 @@ $result_trees{'empty_headitem'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/multitable/empty_item_tab.pl 
b/tp/t/results/multitable/empty_item_tab.pl
index 4812c00fb8..ad4998cad5 100644
--- a/tp/t/results/multitable/empty_item_tab.pl
+++ b/tp/t/results/multitable/empty_item_tab.pl
@@ -43,8 +43,7 @@ $result_trees{'empty_item_tab'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 }
               ],
@@ -76,8 +75,7 @@ $result_trees{'empty_item_tab'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -102,8 +100,7 @@ $result_trees{'empty_item_tab'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     }
                   ],
@@ -136,8 +133,7 @@ $result_trees{'empty_item_tab'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
@@ -162,8 +158,7 @@ $result_trees{'empty_item_tab'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     }
                   ],
@@ -203,8 +198,7 @@ $result_trees{'empty_item_tab'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -219,8 +213,7 @@ $result_trees{'empty_item_tab'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -263,8 +256,7 @@ $result_trees{'empty_item_tab'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 }
               ],
@@ -296,8 +288,7 @@ $result_trees{'empty_item_tab'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     }
                   ],
@@ -322,8 +313,7 @@ $result_trees{'empty_item_tab'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     }
                   ],
@@ -361,8 +351,7 @@ $result_trees{'empty_item_tab'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     }
                   ],
@@ -394,8 +383,7 @@ $result_trees{'empty_item_tab'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     },
                     {
@@ -412,8 +400,7 @@ $result_trees{'empty_item_tab'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     }
                   ],
@@ -446,8 +433,7 @@ $result_trees{'empty_item_tab'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -469,8 +455,7 @@ $result_trees{'empty_item_tab'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     }
                   ],
@@ -494,8 +479,7 @@ $result_trees{'empty_item_tab'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 19,
-                        'macro' => ''
+                        'line_nr' => 19
                       }
                     },
                     {
@@ -512,8 +496,7 @@ $result_trees{'empty_item_tab'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 19,
-                        'macro' => ''
+                        'line_nr' => 19
                       }
                     }
                   ],
@@ -538,8 +521,7 @@ $result_trees{'empty_item_tab'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     },
                     {
@@ -561,8 +543,7 @@ $result_trees{'empty_item_tab'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 21,
-                        'macro' => ''
+                        'line_nr' => 21
                       }
                     }
                   ],
@@ -594,8 +575,7 @@ $result_trees{'empty_item_tab'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 23,
-                        'macro' => ''
+                        'line_nr' => 23
                       }
                     },
                     {
@@ -620,8 +600,7 @@ $result_trees{'empty_item_tab'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 23,
-                        'macro' => ''
+                        'line_nr' => 23
                       }
                     }
                   ],
@@ -661,8 +640,7 @@ $result_trees{'empty_item_tab'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             }
           ],
@@ -677,8 +655,7 @@ $result_trees{'empty_item_tab'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         }
       ],
diff --git a/tp/t/results/multitable/empty_multitable_with_cells.pl 
b/tp/t/results/multitable/empty_multitable_with_cells.pl
index 83ddfb6fad..f8442ad601 100644
--- a/tp/t/results/multitable/empty_multitable_with_cells.pl
+++ b/tp/t/results/multitable/empty_multitable_with_cells.pl
@@ -106,8 +106,7 @@ $result_trees{'empty_multitable_with_cells'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -116,8 +115,7 @@ $result_trees{'empty_multitable_with_cells'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -144,7 +142,6 @@ $result_errors{'empty_multitable_with_cells'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'empty multitable',
     'type' => 'warning'
   },
@@ -153,7 +150,6 @@ $result_errors{'empty_multitable_with_cells'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@item in empty multitable',
     'type' => 'warning'
   },
@@ -162,7 +158,6 @@ $result_errors{'empty_multitable_with_cells'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@tab in empty multitable',
     'type' => 'warning'
   },
@@ -171,7 +166,6 @@ $result_errors{'empty_multitable_with_cells'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@tab in empty multitable',
     'type' => 'warning'
   },
@@ -180,7 +174,6 @@ $result_errors{'empty_multitable_with_cells'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@item in empty multitable',
     'type' => 'warning'
   },
@@ -189,7 +182,6 @@ $result_errors{'empty_multitable_with_cells'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@multitable has text but no @item',
     'type' => 'warning'
   }
diff --git a/tp/t/results/multitable/inter_item_commands_in_multitable.pl 
b/tp/t/results/multitable/inter_item_commands_in_multitable.pl
index 37a762c616..9a4c2a2613 100644
--- a/tp/t/results/multitable/inter_item_commands_in_multitable.pl
+++ b/tp/t/results/multitable/inter_item_commands_in_multitable.pl
@@ -21,8 +21,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'bracketed_arg'
                 }
@@ -115,8 +114,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 6,
-                            'macro' => ''
+                            'line_nr' => 6
                           },
                           'type' => 'index_entry_command'
                         },
@@ -131,8 +129,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     }
                   ],
@@ -175,8 +172,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     }
                   ],
@@ -216,8 +212,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
@@ -231,8 +226,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -275,8 +269,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 12,
-                    'macro' => ''
+                    'line_nr' => 12
                   }
                 }
               ],
@@ -310,8 +303,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     },
                     {
@@ -336,8 +328,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     }
                   ],
@@ -374,8 +365,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     },
                     {
@@ -410,8 +400,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     }
                   ],
@@ -443,8 +432,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -492,8 +480,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 17,
-                                'macro' => ''
+                                'line_nr' => 17
                               },
                               'type' => 'index_entry_command'
                             }
@@ -506,8 +493,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     }
                   ],
@@ -540,8 +526,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       }
                     }
                   ],
@@ -581,8 +566,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             }
           ],
@@ -597,8 +581,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           }
         },
         {
@@ -618,8 +601,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 21,
-                    'macro' => ''
+                    'line_nr' => 21
                   },
                   'type' => 'bracketed_arg'
                 }
@@ -675,8 +657,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 23,
-                        'macro' => ''
+                        'line_nr' => 23
                       },
                       'type' => 'index_entry_command'
                     }
@@ -712,8 +693,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     }
                   ],
@@ -753,8 +733,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               }
             }
           ],
@@ -768,8 +747,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 21,
-            'macro' => ''
+            'line_nr' => 21
           }
         },
         {
@@ -836,7 +814,6 @@ $result_errors{'inter_item_commands_in_multitable'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -845,7 +822,6 @@ $result_errors{'inter_item_commands_in_multitable'} = [
 ',
     'file_name' => '',
     'line_nr' => 17,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -854,7 +830,6 @@ $result_errors{'inter_item_commands_in_multitable'} = [
 ',
     'file_name' => '',
     'line_nr' => 23,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/multitable/multitable_begin_with_tab.pl 
b/tp/t/results/multitable/multitable_begin_with_tab.pl
index 84f5f56ae1..010de79c54 100644
--- a/tp/t/results/multitable/multitable_begin_with_tab.pl
+++ b/tp/t/results/multitable/multitable_begin_with_tab.pl
@@ -21,8 +21,7 @@ $result_trees{'multitable_begin_with_tab'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'bracketed_arg'
                 },
@@ -37,8 +36,7 @@ $result_trees{'multitable_begin_with_tab'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'bracketed_arg'
                 }
@@ -100,8 +98,7 @@ $result_trees{'multitable_begin_with_tab'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -115,8 +112,7 @@ $result_trees{'multitable_begin_with_tab'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -136,8 +132,7 @@ $result_trees{'multitable_begin_with_tab'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   },
                   'type' => 'bracketed_arg'
                 },
@@ -152,8 +147,7 @@ $result_trees{'multitable_begin_with_tab'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   },
                   'type' => 'bracketed_arg'
                 }
@@ -213,8 +207,7 @@ $result_trees{'multitable_begin_with_tab'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     }
                   ],
@@ -254,8 +247,7 @@ $result_trees{'multitable_begin_with_tab'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
@@ -269,8 +261,7 @@ $result_trees{'multitable_begin_with_tab'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
@@ -303,7 +294,6 @@ $result_errors{'multitable_begin_with_tab'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@tab before @item',
     'type' => 'error'
   },
@@ -312,7 +302,6 @@ $result_errors{'multitable_begin_with_tab'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@multitable has text but no @item',
     'type' => 'warning'
   },
@@ -321,7 +310,6 @@ $result_errors{'multitable_begin_with_tab'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => '@tab before @item',
     'type' => 'error'
   }
diff --git 
a/tp/t/results/multitable/multitable_bracketed_no_inter_space_prototype.pl 
b/tp/t/results/multitable/multitable_bracketed_no_inter_space_prototype.pl
index 1f61a4f703..c4af3c832b 100644
--- a/tp/t/results/multitable/multitable_bracketed_no_inter_space_prototype.pl
+++ b/tp/t/results/multitable/multitable_bracketed_no_inter_space_prototype.pl
@@ -26,8 +26,7 @@ 
$result_trees{'multitable_bracketed_no_inter_space_prototype'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   },
                   'type' => 'bracketed_arg'
                 },
@@ -39,8 +38,7 @@ 
$result_trees{'multitable_bracketed_no_inter_space_prototype'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   },
                   'type' => 'bracketed_arg'
                 }
@@ -84,8 +82,7 @@ 
$result_trees{'multitable_bracketed_no_inter_space_prototype'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -99,8 +96,7 @@ 
$result_trees{'multitable_bracketed_no_inter_space_prototype'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
diff --git 
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed.pl 
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed.pl
index c967ee21d2..a3bc914d26 100644
--- a/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed.pl
+++ b/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed.pl
@@ -27,8 +27,7 @@ 
$result_trees{'multitable_bracketed_prototype_empty_not_closed'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   },
                   'type' => 'bracketed_arg'
                 }
@@ -66,8 +65,7 @@ 
$result_trees{'multitable_bracketed_prototype_empty_not_closed'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -81,8 +79,7 @@ 
$result_trees{'multitable_bracketed_prototype_empty_not_closed'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
@@ -107,7 +104,6 @@ 
$result_errors{'multitable_bracketed_prototype_empty_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
   }
diff --git 
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed_comment.pl
 
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed_comment.pl
index 2ffe61b597..974f77b41e 100644
--- 
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed_comment.pl
+++ 
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed_comment.pl
@@ -33,8 +33,7 @@ 
$result_trees{'multitable_bracketed_prototype_empty_not_closed_comment'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   },
                   'type' => 'bracketed_arg'
                 }
@@ -72,8 +71,7 @@ 
$result_trees{'multitable_bracketed_prototype_empty_not_closed_comment'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -87,8 +85,7 @@ 
$result_trees{'multitable_bracketed_prototype_empty_not_closed_comment'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
@@ -113,7 +110,6 @@ 
$result_errors{'multitable_bracketed_prototype_empty_not_closed_comment'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
   }
diff --git 
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed.pl
 
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed.pl
index 463b119d89..d821951fcd 100644
--- 
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed.pl
+++ 
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed.pl
@@ -27,8 +27,7 @@ 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   },
                   'type' => 'bracketed_arg'
                 }
@@ -66,8 +65,7 @@ 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -81,8 +79,7 @@ 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
@@ -107,7 +104,6 @@ 
$result_errors{'multitable_bracketed_prototype_empty_spaces_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
   }
diff --git 
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed_comment.pl
 
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed_comment.pl
index 5afa643222..d4ed5b2e99 100644
--- 
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed_comment.pl
+++ 
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed_comment.pl
@@ -38,8 +38,7 @@ 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed_comment'}
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   },
                   'type' => 'bracketed_arg'
                 }
@@ -77,8 +76,7 @@ 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed_comment'}
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -92,8 +90,7 @@ 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed_comment'}
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
@@ -118,7 +115,6 @@ 
$result_errors{'multitable_bracketed_prototype_empty_spaces_not_closed_comment'}
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
   }
diff --git 
a/tp/t/results/multitable/multitable_bracketed_prototype_not_closed.pl 
b/tp/t/results/multitable/multitable_bracketed_prototype_not_closed.pl
index ea7211709d..26e82d2a62 100644
--- a/tp/t/results/multitable/multitable_bracketed_prototype_not_closed.pl
+++ b/tp/t/results/multitable/multitable_bracketed_prototype_not_closed.pl
@@ -32,8 +32,7 @@ $result_trees{'multitable_bracketed_prototype_not_closed'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   },
                   'type' => 'bracketed_arg'
                 }
@@ -71,8 +70,7 @@ $result_trees{'multitable_bracketed_prototype_not_closed'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -86,8 +84,7 @@ $result_trees{'multitable_bracketed_prototype_not_closed'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
@@ -112,7 +109,6 @@ $result_errors{'multitable_bracketed_prototype_not_closed'} 
= [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
   }
diff --git 
a/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_comment.pl 
b/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_comment.pl
index 8766ec4c3d..a049ad0de2 100644
--- 
a/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_comment.pl
+++ 
b/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_comment.pl
@@ -36,8 +36,7 @@ 
$result_trees{'multitable_bracketed_prototype_not_closed_comment'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   },
                   'type' => 'bracketed_arg'
                 }
@@ -75,8 +74,7 @@ 
$result_trees{'multitable_bracketed_prototype_not_closed_comment'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -90,8 +88,7 @@ 
$result_trees{'multitable_bracketed_prototype_not_closed_comment'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
@@ -116,7 +113,6 @@ 
$result_errors{'multitable_bracketed_prototype_not_closed_comment'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
   }
diff --git 
a/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_space_comment.pl
 
b/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_space_comment.pl
index 1ee84f0fb3..5d6c9a4433 100644
--- 
a/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_space_comment.pl
+++ 
b/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_space_comment.pl
@@ -36,8 +36,7 @@ 
$result_trees{'multitable_bracketed_prototype_not_closed_space_comment'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   },
                   'type' => 'bracketed_arg'
                 }
@@ -75,8 +74,7 @@ 
$result_trees{'multitable_bracketed_prototype_not_closed_space_comment'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -90,8 +88,7 @@ 
$result_trees{'multitable_bracketed_prototype_not_closed_space_comment'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
@@ -116,7 +113,6 @@ 
$result_errors{'multitable_bracketed_prototype_not_closed_space_comment'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
   }
diff --git a/tp/t/results/multitable/multitable_empty_bracketed_prototype.pl 
b/tp/t/results/multitable/multitable_empty_bracketed_prototype.pl
index 5bcd2819d9..9061fb29ed 100644
--- a/tp/t/results/multitable/multitable_empty_bracketed_prototype.pl
+++ b/tp/t/results/multitable/multitable_empty_bracketed_prototype.pl
@@ -21,8 +21,7 @@ $result_trees{'multitable_empty_bracketed_prototype'} = {
                 {
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   },
                   'type' => 'bracketed_arg'
                 },
@@ -37,8 +36,7 @@ $result_trees{'multitable_empty_bracketed_prototype'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   },
                   'type' => 'bracketed_arg'
                 }
@@ -82,8 +80,7 @@ $result_trees{'multitable_empty_bracketed_prototype'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -97,8 +94,7 @@ $result_trees{'multitable_empty_bracketed_prototype'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
diff --git a/tp/t/results/multitable/multitable_figure_space.pl 
b/tp/t/results/multitable/multitable_figure_space.pl
index a2d466acaf..a515118afa 100644
--- a/tp/t/results/multitable/multitable_figure_space.pl
+++ b/tp/t/results/multitable/multitable_figure_space.pl
@@ -21,8 +21,7 @@ $result_trees{'multitable_figure_space'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'bracketed_arg'
                 },
@@ -37,8 +36,7 @@ $result_trees{'multitable_figure_space'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'bracketed_arg'
                 }
@@ -79,8 +77,7 @@ $result_trees{'multitable_figure_space'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -105,8 +102,7 @@ $result_trees{'multitable_figure_space'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -138,8 +134,7 @@ $result_trees{'multitable_figure_space'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     },
                     {
@@ -164,8 +159,7 @@ $result_trees{'multitable_figure_space'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -197,8 +191,7 @@ $result_trees{'multitable_figure_space'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     },
                     {
@@ -223,8 +216,7 @@ $result_trees{'multitable_figure_space'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     }
                   ],
@@ -264,8 +256,7 @@ $result_trees{'multitable_figure_space'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -279,8 +270,7 @@ $result_trees{'multitable_figure_space'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/multitable/multitable_in_example.pl 
b/tp/t/results/multitable/multitable_in_example.pl
index 2fd4b2cdc8..01a5c34e62 100644
--- a/tp/t/results/multitable/multitable_in_example.pl
+++ b/tp/t/results/multitable/multitable_in_example.pl
@@ -35,8 +35,7 @@ $result_trees{'multitable_in_example'} = {
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -51,8 +50,7 @@ $result_trees{'multitable_in_example'} = {
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -93,8 +91,7 @@ $result_trees{'multitable_in_example'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 3,
-                            'macro' => ''
+                            'line_nr' => 3
                           }
                         },
                         {
@@ -119,8 +116,7 @@ $result_trees{'multitable_in_example'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 3,
-                            'macro' => ''
+                            'line_nr' => 3
                           }
                         }
                       ],
@@ -167,8 +163,7 @@ $result_trees{'multitable_in_example'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 4,
-                            'macro' => ''
+                            'line_nr' => 4
                           }
                         },
                         {
@@ -202,8 +197,7 @@ $result_trees{'multitable_in_example'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 8,
-                            'macro' => ''
+                            'line_nr' => 8
                           }
                         }
                       ],
@@ -243,8 +237,7 @@ $result_trees{'multitable_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 }
               ],
@@ -258,8 +251,7 @@ $result_trees{'multitable_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -284,15 +276,13 @@ $result_trees{'multitable_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/multitable/multitable_not_closed.pl 
b/tp/t/results/multitable/multitable_not_closed.pl
index 36dd02ec44..035b7bce7e 100644
--- a/tp/t/results/multitable/multitable_not_closed.pl
+++ b/tp/t/results/multitable/multitable_not_closed.pl
@@ -21,8 +21,7 @@ $result_trees{'multitable_not_closed'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'bracketed_arg'
                 },
@@ -37,8 +36,7 @@ $result_trees{'multitable_not_closed'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'bracketed_arg'
                 }
@@ -63,8 +61,7 @@ $result_trees{'multitable_not_closed'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -86,7 +83,6 @@ $result_errors{'multitable_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'no matching `@end multitable\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/multitable/multitable_not_closed_item.pl 
b/tp/t/results/multitable/multitable_not_closed_item.pl
index 4ab42bb6ba..35a968aa6e 100644
--- a/tp/t/results/multitable/multitable_not_closed_item.pl
+++ b/tp/t/results/multitable/multitable_not_closed_item.pl
@@ -21,8 +21,7 @@ $result_trees{'multitable_not_closed_item'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'bracketed_arg'
                 },
@@ -37,8 +36,7 @@ $result_trees{'multitable_not_closed_item'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'bracketed_arg'
                 }
@@ -80,8 +78,7 @@ $result_trees{'multitable_not_closed_item'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -104,8 +101,7 @@ $result_trees{'multitable_not_closed_item'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -129,7 +125,6 @@ $result_errors{'multitable_not_closed_item'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'no matching `@end multitable\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/multitable/multitable_not_closed_item_tab.pl 
b/tp/t/results/multitable/multitable_not_closed_item_tab.pl
index 63107fc3f3..d28befccbd 100644
--- a/tp/t/results/multitable/multitable_not_closed_item_tab.pl
+++ b/tp/t/results/multitable/multitable_not_closed_item_tab.pl
@@ -21,8 +21,7 @@ $result_trees{'multitable_not_closed_item_tab'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'bracketed_arg'
                 },
@@ -37,8 +36,7 @@ $result_trees{'multitable_not_closed_item_tab'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'bracketed_arg'
                 }
@@ -79,8 +77,7 @@ $result_trees{'multitable_not_closed_item_tab'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -105,8 +102,7 @@ $result_trees{'multitable_not_closed_item_tab'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -129,8 +125,7 @@ $result_trees{'multitable_not_closed_item_tab'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -154,7 +149,6 @@ $result_errors{'multitable_not_closed_item_tab'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'no matching `@end multitable\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/multitable/multitable_one_column_too_much_cells.pl 
b/tp/t/results/multitable/multitable_one_column_too_much_cells.pl
index 7eb9e767cd..cfac4ffe5c 100644
--- a/tp/t/results/multitable/multitable_one_column_too_much_cells.pl
+++ b/tp/t/results/multitable/multitable_one_column_too_much_cells.pl
@@ -21,8 +21,7 @@ $result_trees{'multitable_one_column_too_much_cells'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'bracketed_arg'
                 }
@@ -100,8 +99,7 @@ $result_trees{'multitable_one_column_too_much_cells'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -134,8 +132,7 @@ $result_trees{'multitable_one_column_too_much_cells'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -204,8 +201,7 @@ $result_trees{'multitable_one_column_too_much_cells'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     }
                   ],
@@ -250,8 +246,7 @@ $result_trees{'multitable_one_column_too_much_cells'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
@@ -291,8 +286,7 @@ $result_trees{'multitable_one_column_too_much_cells'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -306,8 +300,7 @@ $result_trees{'multitable_one_column_too_much_cells'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -338,7 +331,6 @@ $result_errors{'multitable_one_column_too_much_cells'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'too many columns in multitable item (max 1)',
     'type' => 'error'
   },
@@ -347,7 +339,6 @@ $result_errors{'multitable_one_column_too_much_cells'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'too many columns in multitable item (max 1)',
     'type' => 'error'
   },
@@ -356,7 +347,6 @@ $result_errors{'multitable_one_column_too_much_cells'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'too many columns in multitable item (max 1)',
     'type' => 'error'
   },
@@ -365,7 +355,6 @@ $result_errors{'multitable_one_column_too_much_cells'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'too many columns in multitable item (max 1)',
     'type' => 'error'
   },
@@ -374,7 +363,6 @@ $result_errors{'multitable_one_column_too_much_cells'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'too many columns in multitable item (max 1)',
     'type' => 'error'
   },
@@ -383,7 +371,6 @@ $result_errors{'multitable_one_column_too_much_cells'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'too many columns in multitable item (max 1)',
     'type' => 'error'
   },
@@ -392,7 +379,6 @@ $result_errors{'multitable_one_column_too_much_cells'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'too many columns in multitable item (max 1)',
     'type' => 'error'
   }
diff --git a/tp/t/results/multitable/multitable_two_columns_too_much_cells.pl 
b/tp/t/results/multitable/multitable_two_columns_too_much_cells.pl
index ebe798b45f..05c3d35ef9 100644
--- a/tp/t/results/multitable/multitable_two_columns_too_much_cells.pl
+++ b/tp/t/results/multitable/multitable_two_columns_too_much_cells.pl
@@ -44,8 +44,7 @@ $result_trees{'multitable_two_columns_too_much_cells'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 }
               ],
@@ -79,8 +78,7 @@ $result_trees{'multitable_two_columns_too_much_cells'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -141,8 +139,7 @@ $result_trees{'multitable_two_columns_too_much_cells'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -175,8 +172,7 @@ $result_trees{'multitable_two_columns_too_much_cells'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -208,8 +204,7 @@ $result_trees{'multitable_two_columns_too_much_cells'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     },
                     {
@@ -246,8 +241,7 @@ $result_trees{'multitable_two_columns_too_much_cells'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     }
                   ],
@@ -287,8 +281,7 @@ $result_trees{'multitable_two_columns_too_much_cells'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -303,8 +296,7 @@ $result_trees{'multitable_two_columns_too_much_cells'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -334,7 +326,6 @@ $result_errors{'multitable_two_columns_too_much_cells'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'too many columns in multitable item (max 2)',
     'type' => 'error'
   },
@@ -343,7 +334,6 @@ $result_errors{'multitable_two_columns_too_much_cells'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'too many columns in multitable item (max 2)',
     'type' => 'error'
   },
@@ -352,7 +342,6 @@ $result_errors{'multitable_two_columns_too_much_cells'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'too many columns in multitable item (max 2)',
     'type' => 'error'
   },
@@ -361,7 +350,6 @@ $result_errors{'multitable_two_columns_too_much_cells'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'too many columns in multitable item (max 2)',
     'type' => 'error'
   }
diff --git a/tp/t/results/multitable/multitable_with_empty_item_tab.pl 
b/tp/t/results/multitable/multitable_with_empty_item_tab.pl
index b3ddc03d29..c1cef18329 100644
--- a/tp/t/results/multitable/multitable_with_empty_item_tab.pl
+++ b/tp/t/results/multitable/multitable_with_empty_item_tab.pl
@@ -44,8 +44,7 @@ $result_trees{'multitable_with_empty_item_tab'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 }
               ],
@@ -79,8 +78,7 @@ $result_trees{'multitable_with_empty_item_tab'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -104,8 +102,7 @@ $result_trees{'multitable_with_empty_item_tab'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -123,8 +120,7 @@ $result_trees{'multitable_with_empty_item_tab'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -134,8 +130,7 @@ $result_trees{'multitable_with_empty_item_tab'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -167,8 +162,7 @@ $result_trees{'multitable_with_empty_item_tab'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -193,8 +187,7 @@ $result_trees{'multitable_with_empty_item_tab'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -234,8 +227,7 @@ $result_trees{'multitable_with_empty_item_tab'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -250,8 +242,7 @@ $result_trees{'multitable_with_empty_item_tab'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/multitable/not_letters_in_prototype.pl 
b/tp/t/results/multitable/not_letters_in_prototype.pl
index 2ab6eda113..015588e257 100644
--- a/tp/t/results/multitable/not_letters_in_prototype.pl
+++ b/tp/t/results/multitable/not_letters_in_prototype.pl
@@ -86,8 +86,7 @@ $result_trees{'not_letters_in_prototype'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -101,8 +100,7 @@ $result_trees{'not_letters_in_prototype'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -127,7 +125,6 @@ $result_errors{'not_letters_in_prototype'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'empty multitable',
     'type' => 'warning'
   },
@@ -136,7 +133,6 @@ $result_errors{'not_letters_in_prototype'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@item in empty multitable',
     'type' => 'warning'
   },
@@ -145,7 +141,6 @@ $result_errors{'not_letters_in_prototype'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@tab in empty multitable',
     'type' => 'warning'
   },
@@ -154,7 +149,6 @@ $result_errors{'not_letters_in_prototype'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@multitable has text but no @item',
     'type' => 'warning'
   }
diff --git a/tp/t/results/multitable/paragraph_in_cells.pl 
b/tp/t/results/multitable/paragraph_in_cells.pl
index acc8b64710..41b42023ab 100644
--- a/tp/t/results/multitable/paragraph_in_cells.pl
+++ b/tp/t/results/multitable/paragraph_in_cells.pl
@@ -21,8 +21,7 @@ $result_trees{'paragraph_in_cells'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'bracketed_arg'
                 },
@@ -37,8 +36,7 @@ $result_trees{'paragraph_in_cells'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'bracketed_arg'
                 }
@@ -79,8 +77,7 @@ $result_trees{'paragraph_in_cells'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -105,8 +102,7 @@ $result_trees{'paragraph_in_cells'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -158,8 +154,7 @@ $result_trees{'paragraph_in_cells'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     },
                     {
@@ -198,8 +193,7 @@ $result_trees{'paragraph_in_cells'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     }
                   ],
@@ -233,8 +227,7 @@ $result_trees{'paragraph_in_cells'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
@@ -248,8 +241,7 @@ $result_trees{'paragraph_in_cells'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/multitable/prototype_brace_no_brace.pl 
b/tp/t/results/multitable/prototype_brace_no_brace.pl
index f9da31cadc..2803ce166e 100644
--- a/tp/t/results/multitable/prototype_brace_no_brace.pl
+++ b/tp/t/results/multitable/prototype_brace_no_brace.pl
@@ -21,8 +21,7 @@ $result_trees{'prototype_brace_no_brace'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'bracketed_arg'
                 },
@@ -69,8 +68,7 @@ $result_trees{'prototype_brace_no_brace'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -84,8 +82,7 @@ $result_trees{'prototype_brace_no_brace'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/multitable/prototype_brace_no_brace_comment.pl 
b/tp/t/results/multitable/prototype_brace_no_brace_comment.pl
index 0ebaf5293f..73a310e919 100644
--- a/tp/t/results/multitable/prototype_brace_no_brace_comment.pl
+++ b/tp/t/results/multitable/prototype_brace_no_brace_comment.pl
@@ -21,8 +21,7 @@ $result_trees{'prototype_brace_no_brace_comment'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'bracketed_arg'
                 },
@@ -75,8 +74,7 @@ $result_trees{'prototype_brace_no_brace_comment'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -90,8 +88,7 @@ $result_trees{'prototype_brace_no_brace_comment'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/multitable/prototype_no_brace.pl 
b/tp/t/results/multitable/prototype_no_brace.pl
index 747c05a63d..c984765efa 100644
--- a/tp/t/results/multitable/prototype_no_brace.pl
+++ b/tp/t/results/multitable/prototype_no_brace.pl
@@ -30,8 +30,7 @@ $result_trees{'prototype_no_brace'} = {
                   'cmdname' => 'var',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -77,8 +76,7 @@ $result_trees{'prototype_no_brace'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -92,8 +90,7 @@ $result_trees{'prototype_no_brace'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -116,7 +113,6 @@ $result_errors{'prototype_no_brace'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'unexpected argument on @multitable line: @var{FF}',
     'type' => 'warning'
   },
@@ -125,7 +121,6 @@ $result_errors{'prototype_no_brace'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'empty multitable',
     'type' => 'warning'
   }
diff --git a/tp/t/results/multitable/ref_in_multitable.pl 
b/tp/t/results/multitable/ref_in_multitable.pl
index 34dbef34eb..96be2b96cc 100644
--- a/tp/t/results/multitable/ref_in_multitable.pl
+++ b/tp/t/results/multitable/ref_in_multitable.pl
@@ -20,8 +20,7 @@ $result_trees{'ref_in_multitable'} = {
           'cmdname' => 'novalidate',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -58,8 +57,7 @@ $result_trees{'ref_in_multitable'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -109,8 +107,7 @@ $result_trees{'ref_in_multitable'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   }
                 }
               ],
@@ -145,8 +142,7 @@ $result_trees{'ref_in_multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     },
                     {
@@ -183,8 +179,7 @@ $result_trees{'ref_in_multitable'} = {
                               'cmdname' => 'ref',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 8,
-                                'macro' => ''
+                                'line_nr' => 8
                               }
                             },
                             {
@@ -200,8 +195,7 @@ $result_trees{'ref_in_multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     }
                   ],
@@ -234,8 +228,7 @@ $result_trees{'ref_in_multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -272,8 +265,7 @@ $result_trees{'ref_in_multitable'} = {
                               'cmdname' => 'ref',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 10,
-                                'macro' => ''
+                                'line_nr' => 10
                               }
                             },
                             {
@@ -289,8 +281,7 @@ $result_trees{'ref_in_multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     }
                   ],
@@ -346,8 +337,7 @@ $result_trees{'ref_in_multitable'} = {
                                           'cmdname' => 'ref',
                                           'source_info' => {
                                             'file_name' => '',
-                                            'line_nr' => 11,
-                                            'macro' => ''
+                                            'line_nr' => 11
                                           }
                                         }
                                       ],
@@ -360,8 +350,7 @@ $result_trees{'ref_in_multitable'} = {
                               'cmdname' => 'footnote',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 11,
-                                'macro' => ''
+                                'line_nr' => 11
                               }
                             },
                             {
@@ -376,8 +365,7 @@ $result_trees{'ref_in_multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     },
                     {
@@ -403,8 +391,7 @@ $result_trees{'ref_in_multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     }
                   ],
@@ -444,8 +431,7 @@ $result_trees{'ref_in_multitable'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
@@ -460,8 +446,7 @@ $result_trees{'ref_in_multitable'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -498,8 +483,7 @@ $result_trees{'ref_in_multitable'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
diff --git a/tp/t/results/multitable/w_in_multitable.pl 
b/tp/t/results/multitable/w_in_multitable.pl
index 238ef84de1..8b1dc6cf9e 100644
--- a/tp/t/results/multitable/w_in_multitable.pl
+++ b/tp/t/results/multitable/w_in_multitable.pl
@@ -21,8 +21,7 @@ $result_trees{'w_in_multitable'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'bracketed_arg'
                 },
@@ -37,8 +36,7 @@ $result_trees{'w_in_multitable'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'bracketed_arg'
                 }
@@ -85,8 +83,7 @@ $result_trees{'w_in_multitable'} = {
                               'cmdname' => 'w',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 2,
-                                'macro' => ''
+                                'line_nr' => 2
                               }
                             },
                             {
@@ -102,8 +99,7 @@ $result_trees{'w_in_multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -128,8 +124,7 @@ $result_trees{'w_in_multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     }
                   ],
@@ -169,8 +164,7 @@ $result_trees{'w_in_multitable'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -184,8 +178,7 @@ $result_trees{'w_in_multitable'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/paragraph/close_paragraph_command.pl 
b/tp/t/results/paragraph/close_paragraph_command.pl
index cd944eced5..4229701c85 100644
--- a/tp/t/results/paragraph/close_paragraph_command.pl
+++ b/tp/t/results/paragraph/close_paragraph_command.pl
@@ -31,8 +31,7 @@ $result_trees{'close_paragraph_command'} = {
           'cmdname' => 'titlefont',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -88,8 +87,7 @@ $result_trees{'close_paragraph_command'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
diff --git a/tp/t/results/paragraph/commands_in_flushright.pl 
b/tp/t/results/paragraph/commands_in_flushright.pl
index 39a364ea66..81cad9bae3 100644
--- a/tp/t/results/paragraph/commands_in_flushright.pl
+++ b/tp/t/results/paragraph/commands_in_flushright.pl
@@ -79,15 +79,13 @@ $result_trees{'commands_in_flushright'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -151,8 +149,7 @@ $result_trees{'commands_in_flushright'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 }
               ],
@@ -163,8 +160,7 @@ $result_trees{'commands_in_flushright'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -213,8 +209,7 @@ $result_trees{'commands_in_flushright'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 12,
-                    'macro' => ''
+                    'line_nr' => 12
                   }
                 },
                 {
@@ -239,8 +234,7 @@ $result_trees{'commands_in_flushright'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 14,
-                    'macro' => ''
+                    'line_nr' => 14
                   }
                 },
                 {
@@ -271,8 +265,7 @@ $result_trees{'commands_in_flushright'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 15,
-                    'macro' => ''
+                    'line_nr' => 15
                   }
                 }
               ],
@@ -281,8 +274,7 @@ $result_trees{'commands_in_flushright'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -298,8 +290,7 @@ $result_trees{'commands_in_flushright'} = {
                       'cmdname' => 'emph',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       },
                       'type' => 'command_as_argument'
                     }
@@ -344,8 +335,7 @@ $result_trees{'commands_in_flushright'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 18,
-                            'macro' => ''
+                            'line_nr' => 18
                           }
                         },
                         {
@@ -373,8 +363,7 @@ $result_trees{'commands_in_flushright'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 19,
-                            'macro' => ''
+                            'line_nr' => 19
                           }
                         }
                       ],
@@ -439,8 +428,7 @@ $result_trees{'commands_in_flushright'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 23,
-                    'macro' => ''
+                    'line_nr' => 23
                   }
                 }
               ],
@@ -454,8 +442,7 @@ $result_trees{'commands_in_flushright'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -498,8 +485,7 @@ $result_trees{'commands_in_flushright'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 25,
-                        'macro' => ''
+                        'line_nr' => 25
                       }
                     }
                   ],
@@ -533,8 +519,7 @@ $result_trees{'commands_in_flushright'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 26,
-                            'macro' => ''
+                            'line_nr' => 26
                           }
                         },
                         {
@@ -559,8 +544,7 @@ $result_trees{'commands_in_flushright'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 26,
-                            'macro' => ''
+                            'line_nr' => 26
                           }
                         }
                       ],
@@ -607,8 +591,7 @@ $result_trees{'commands_in_flushright'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 27,
-                            'macro' => ''
+                            'line_nr' => 27
                           }
                         },
                         {
@@ -639,8 +622,7 @@ $result_trees{'commands_in_flushright'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 30,
-                            'macro' => ''
+                            'line_nr' => 30
                           }
                         }
                       ],
@@ -680,8 +662,7 @@ $result_trees{'commands_in_flushright'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 33,
-                    'macro' => ''
+                    'line_nr' => 33
                   }
                 }
               ],
@@ -696,8 +677,7 @@ $result_trees{'commands_in_flushright'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               }
             },
             {
@@ -776,8 +756,7 @@ $result_trees{'commands_in_flushright'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 39,
-                    'macro' => ''
+                    'line_nr' => 39
                   }
                 },
                 {
@@ -813,8 +792,7 @@ $result_trees{'commands_in_flushright'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 40,
-                    'macro' => ''
+                    'line_nr' => 40
                   }
                 }
               ],
@@ -831,8 +809,7 @@ $result_trees{'commands_in_flushright'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             },
             {
@@ -879,8 +856,7 @@ $result_trees{'commands_in_flushright'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               }
             },
             {
@@ -939,15 +915,13 @@ $result_trees{'commands_in_flushright'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 47,
-                    'macro' => ''
+                    'line_nr' => 47
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 45,
-                'macro' => ''
+                'line_nr' => 45
               }
             },
             {
@@ -1006,15 +980,13 @@ $result_trees{'commands_in_flushright'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 51,
-                    'macro' => ''
+                    'line_nr' => 51
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             },
             {
@@ -1073,15 +1045,13 @@ $result_trees{'commands_in_flushright'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 55,
-                    'macro' => ''
+                    'line_nr' => 55
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               }
             },
             {
@@ -1114,8 +1084,7 @@ $result_trees{'commands_in_flushright'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 57,
-                'macro' => ''
+                'line_nr' => 57
               }
             },
             {
@@ -1151,15 +1120,13 @@ $result_trees{'commands_in_flushright'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/paragraph/comment_in_quotation.pl 
b/tp/t/results/paragraph/comment_in_quotation.pl
index 4bd4ec2d6a..524fdb47f0 100644
--- a/tp/t/results/paragraph/comment_in_quotation.pl
+++ b/tp/t/results/paragraph/comment_in_quotation.pl
@@ -74,15 +74,13 @@ $result_trees{'comment_in_quotation'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -150,15 +148,13 @@ $result_trees{'comment_in_quotation'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         }
       ],
diff --git a/tp/t/results/paragraph/double_style_paragraph.pl 
b/tp/t/results/paragraph/double_style_paragraph.pl
index 0a9d2fa1be..264f770569 100644
--- a/tp/t/results/paragraph/double_style_paragraph.pl
+++ b/tp/t/results/paragraph/double_style_paragraph.pl
@@ -39,8 +39,7 @@ $result_trees{'double_style_paragraph'} = {
                       'cmdname' => 'strong',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     }
                   ],
@@ -50,8 +49,7 @@ $result_trees{'double_style_paragraph'} = {
               'cmdname' => 'emph',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -106,7 +104,6 @@ $result_errors{'double_style_paragraph'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@strong missing closing brace',
     'type' => 'error'
   },
@@ -115,7 +112,6 @@ $result_errors{'double_style_paragraph'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@emph missing closing brace',
     'type' => 'error'
   },
@@ -124,7 +120,6 @@ $result_errors{'double_style_paragraph'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   },
@@ -133,7 +128,6 @@ $result_errors{'double_style_paragraph'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/paragraph/image_in_paragraph.pl 
b/tp/t/results/paragraph/image_in_paragraph.pl
index 9bbdf5dffe..6fbab17aae 100644
--- a/tp/t/results/paragraph/image_in_paragraph.pl
+++ b/tp/t/results/paragraph/image_in_paragraph.pl
@@ -63,8 +63,7 @@ $result_trees{'image_in_paragraph'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -108,7 +107,6 @@ 
$result_converted_errors{'html_text'}->{'image_in_paragraph'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@image file `aa\' (for HTML) not found, using `aa.ee\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/paragraph/no_paragraph_commands.pl 
b/tp/t/results/paragraph/no_paragraph_commands.pl
index 831b05a660..289d1269be 100644
--- a/tp/t/results/paragraph/no_paragraph_commands.pl
+++ b/tp/t/results/paragraph/no_paragraph_commands.pl
@@ -30,8 +30,7 @@ $result_trees{'no_paragraph_commands'} = {
           'cmdname' => 'titlefont',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -87,8 +86,7 @@ $result_trees{'no_paragraph_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -140,7 +138,6 @@ 
$result_converted_errors{'html_text'}->{'no_paragraph_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@image file `aa\' (for HTML) not found, using `aa.ee\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/paragraph/paragraph_command.pl 
b/tp/t/results/paragraph/paragraph_command.pl
index 7960c29c6f..61afc646f5 100644
--- a/tp/t/results/paragraph/paragraph_command.pl
+++ b/tp/t/results/paragraph/paragraph_command.pl
@@ -42,8 +42,7 @@ $result_trees{'paragraph_command'} = {
               'cmdname' => 'b',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -74,8 +73,7 @@ $result_trees{'paragraph_command'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -106,8 +104,7 @@ $result_trees{'paragraph_command'} = {
               'cmdname' => 'U',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -138,8 +135,7 @@ $result_trees{'paragraph_command'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -186,8 +182,7 @@ $result_trees{'paragraph_command'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -216,8 +211,7 @@ $result_trees{'paragraph_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               },
               'type' => 'definfoenclose_command'
             },
@@ -254,8 +248,7 @@ $result_trees{'paragraph_command'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -317,7 +310,6 @@ $result_errors{'paragraph_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => '@definfoenclose is obsolete',
     'type' => 'warning'
   }
diff --git a/tp/t/results/paragraph/paragraph_count_and_example.pl 
b/tp/t/results/paragraph/paragraph_count_and_example.pl
index 4f3113ba0d..84d5e46468 100644
--- a/tp/t/results/paragraph/paragraph_count_and_example.pl
+++ b/tp/t/results/paragraph/paragraph_count_and_example.pl
@@ -60,15 +60,13 @@ $result_trees{'paragraph_count_and_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/paragraph/paragraph_in_style_command.pl 
b/tp/t/results/paragraph/paragraph_in_style_command.pl
index 80ea510ad0..23678963df 100644
--- a/tp/t/results/paragraph/paragraph_in_style_command.pl
+++ b/tp/t/results/paragraph/paragraph_in_style_command.pl
@@ -34,8 +34,7 @@ $result_trees{'paragraph_in_style_command'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -80,8 +79,7 @@ $result_trees{'paragraph_in_style_command'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -146,7 +144,6 @@ $result_errors{'paragraph_in_style_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@samp missing closing brace',
     'type' => 'error'
   },
@@ -155,7 +152,6 @@ $result_errors{'paragraph_in_style_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   },
@@ -164,7 +160,6 @@ $result_errors{'paragraph_in_style_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@samp missing closing brace',
     'type' => 'error'
   },
@@ -173,7 +168,6 @@ $result_errors{'paragraph_in_style_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/paragraph/paragraph_indent_asis.pl 
b/tp/t/results/paragraph/paragraph_indent_asis.pl
index b7d4780338..a411fcf012 100644
--- a/tp/t/results/paragraph/paragraph_indent_asis.pl
+++ b/tp/t/results/paragraph/paragraph_indent_asis.pl
@@ -39,8 +39,7 @@ $result_trees{'paragraph_indent_asis'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -125,15 +124,13 @@ $result_trees{'paragraph_indent_asis'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
diff --git a/tp/t/results/paragraph/sole_image.pl 
b/tp/t/results/paragraph/sole_image.pl
index 6af93714a4..50432fc31a 100644
--- a/tp/t/results/paragraph/sole_image.pl
+++ b/tp/t/results/paragraph/sole_image.pl
@@ -26,8 +26,7 @@ $result_trees{'sole_image'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -90,7 +89,6 @@ $result_converted_errors{'html_text'}->{'sole_image'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@image file `aa\' (for HTML) not found, using `aa.jpg\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/plaintext_tests/U_with_utf8_enable_encoding.pl 
b/tp/t/results/plaintext_tests/U_with_utf8_enable_encoding.pl
index 109601a61a..adc76b5ef7 100644
--- a/tp/t/results/plaintext_tests/U_with_utf8_enable_encoding.pl
+++ b/tp/t/results/plaintext_tests/U_with_utf8_enable_encoding.pl
@@ -38,8 +38,7 @@ $result_trees{'U_with_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -58,8 +57,7 @@ $result_trees{'U_with_utf8_enable_encoding'} = {
               'cmdname' => 'U',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
diff --git a/tp/t/results/plaintext_tests/accent_command_punctuation.pl 
b/tp/t/results/plaintext_tests/accent_command_punctuation.pl
index ef8bafda91..9c4cb06d45 100644
--- a/tp/t/results/plaintext_tests/accent_command_punctuation.pl
+++ b/tp/t/results/plaintext_tests/accent_command_punctuation.pl
@@ -25,8 +25,7 @@ $result_trees{'accent_command_punctuation'} = {
               'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
diff --git a/tp/t/results/plaintext_tests/accents_in_var_enable_encoding.pl 
b/tp/t/results/plaintext_tests/accents_in_var_enable_encoding.pl
index 5047166c4a..8b661709ec 100644
--- a/tp/t/results/plaintext_tests/accents_in_var_enable_encoding.pl
+++ b/tp/t/results/plaintext_tests/accents_in_var_enable_encoding.pl
@@ -38,8 +38,7 @@ $result_trees{'accents_in_var_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -70,8 +69,7 @@ $result_trees{'accents_in_var_enable_encoding'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     },
                     {
@@ -91,8 +89,7 @@ $result_trees{'accents_in_var_enable_encoding'} = {
                       'cmdname' => 'u',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     },
                     {
@@ -112,8 +109,7 @@ $result_trees{'accents_in_var_enable_encoding'} = {
                       'cmdname' => '`',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -123,8 +119,7 @@ $result_trees{'accents_in_var_enable_encoding'} = {
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
diff --git 
a/tp/t/results/plaintext_tests/after_punctuation_character_in_command.pl 
b/tp/t/results/plaintext_tests/after_punctuation_character_in_command.pl
index 37a93fbfee..9f82d9c17d 100644
--- a/tp/t/results/plaintext_tests/after_punctuation_character_in_command.pl
+++ b/tp/t/results/plaintext_tests/after_punctuation_character_in_command.pl
@@ -32,8 +32,7 @@ $result_trees{'after_punctuation_character_in_command'} = {
               'cmdname' => 'asis',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
diff --git a/tp/t/results/plaintext_tests/all_spaces.pl 
b/tp/t/results/plaintext_tests/all_spaces.pl
index d0c7f09632..b9a69071cc 100644
--- a/tp/t/results/plaintext_tests/all_spaces.pl
+++ b/tp/t/results/plaintext_tests/all_spaces.pl
@@ -39,8 +39,7 @@ $result_trees{'all_spaces'} = {
               },
               "source_info" => {
                 "file_name" => "all_spaces.texi",
-                "line_nr" => 1,
-                "macro" => ""
+                "line_nr" => 1
               }
             },
             {
@@ -81,8 +80,7 @@ $result_trees{'all_spaces'} = {
       },
       "source_info" => {
         "file_name" => "all_spaces.texi",
-        "line_nr" => 3,
-        "macro" => ""
+        "line_nr" => 3
       }
     },
     {
@@ -446,8 +444,7 @@ $result_trees{'all_spaces'} = {
       },
       "source_info" => {
         "file_name" => "all_spaces.texi",
-        "line_nr" => 4,
-        "macro" => ""
+        "line_nr" => 4
       }
     }
   ],
diff --git a/tp/t/results/plaintext_tests/anchor_and_empty_lines.pl 
b/tp/t/results/plaintext_tests/anchor_and_empty_lines.pl
index ea41fafe8d..a4d082a3b4 100644
--- a/tp/t/results/plaintext_tests/anchor_and_empty_lines.pl
+++ b/tp/t/results/plaintext_tests/anchor_and_empty_lines.pl
@@ -41,8 +41,7 @@ $result_trees{'anchor_and_empty_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
diff --git a/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl 
b/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl
index d22bd1f3ae..1e7438409b 100644
--- a/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl
+++ b/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl
@@ -47,8 +47,7 @@ $result_trees{'at_commands_glued_in_example'} = {
                   'cmdname' => 'TeX',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 },
                 {
@@ -72,8 +71,7 @@ $result_trees{'at_commands_glued_in_example'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 },
                 {
@@ -110,8 +108,7 @@ $result_trees{'at_commands_glued_in_example'} = {
                   'cmdname' => 'acronym',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 },
                 {
@@ -135,8 +132,7 @@ $result_trees{'at_commands_glued_in_example'} = {
                   'cmdname' => 'acronym',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   }
                 },
                 {
@@ -173,8 +169,7 @@ $result_trees{'at_commands_glued_in_example'} = {
                   'cmdname' => 'email',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 },
                 {
@@ -206,8 +201,7 @@ $result_trees{'at_commands_glued_in_example'} = {
                   'cmdname' => 'ref',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 8,
-                    'macro' => ''
+                    'line_nr' => 8
                   }
                 },
                 {
@@ -236,8 +230,7 @@ $result_trees{'at_commands_glued_in_example'} = {
                   'cmdname' => 'footnote',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 },
                 {
@@ -265,8 +258,7 @@ $result_trees{'at_commands_glued_in_example'} = {
                           'cmdname' => 'dotless',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 10,
-                            'macro' => ''
+                            'line_nr' => 10
                           }
                         }
                       ],
@@ -276,8 +268,7 @@ $result_trees{'at_commands_glued_in_example'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 },
                 {
@@ -301,8 +292,7 @@ $result_trees{'at_commands_glued_in_example'} = {
                   'cmdname' => 'noindent',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 12,
-                    'macro' => ''
+                    'line_nr' => 12
                   }
                 },
                 {
@@ -346,8 +336,7 @@ $result_trees{'at_commands_glued_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 13,
-                    'macro' => ''
+                    'line_nr' => 13
                   }
                 },
                 {
@@ -371,8 +360,7 @@ $result_trees{'at_commands_glued_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 14,
-                    'macro' => ''
+                    'line_nr' => 14
                   }
                 },
                 {
@@ -414,8 +402,7 @@ $result_trees{'at_commands_glued_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 15,
-                    'macro' => ''
+                    'line_nr' => 15
                   },
                   'type' => 'index_entry_command'
                 }
@@ -450,15 +437,13 @@ $result_trees{'at_commands_glued_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -513,7 +498,6 @@ $result_errors{'at_commands_glued_in_example'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => '@sp should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -522,7 +506,6 @@ $result_errors{'at_commands_glued_in_example'} = [
 ',
     'file_name' => '',
     'line_nr' => 15,
-    'macro' => '',
     'text' => '@cindex should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -531,7 +514,6 @@ $result_errors{'at_commands_glued_in_example'} = [
 ',
     'file_name' => '',
     'line_nr' => 15,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -540,7 +522,6 @@ $result_errors{'at_commands_glued_in_example'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => '@ref reference to nonexistent node `Top\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl 
b/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
index 0ec730a2f5..dfb35f47d7 100644
--- a/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
+++ b/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
@@ -33,8 +33,7 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
               'cmdname' => 'TeX',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -58,8 +57,7 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -96,8 +94,7 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -121,8 +118,7 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -159,8 +155,7 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -192,8 +187,7 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -222,8 +216,7 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -251,8 +244,7 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     }
                   ],
@@ -262,8 +254,7 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -287,8 +278,7 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
               'cmdname' => 'noindent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -335,8 +325,7 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           }
         },
         {
@@ -362,8 +351,7 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -405,8 +393,7 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               },
               'type' => 'index_entry_command'
             }
@@ -463,7 +450,6 @@ $result_errors{'at_commands_glued_in_paragraph'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => '@noindent is useless inside of a paragraph',
     'type' => 'warning'
   },
@@ -472,7 +458,6 @@ $result_errors{'at_commands_glued_in_paragraph'} = [
 ',
     'file_name' => '',
     'line_nr' => 12,
-    'macro' => '',
     'text' => '@sp should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -481,7 +466,6 @@ $result_errors{'at_commands_glued_in_paragraph'} = [
 ',
     'file_name' => '',
     'line_nr' => 14,
-    'macro' => '',
     'text' => '@cindex should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -490,7 +474,6 @@ $result_errors{'at_commands_glued_in_paragraph'} = [
 ',
     'file_name' => '',
     'line_nr' => 14,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   },
@@ -499,7 +482,6 @@ $result_errors{'at_commands_glued_in_paragraph'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '@ref reference to nonexistent node `Top\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/plaintext_tests/before_accent_punctuation.pl 
b/tp/t/results/plaintext_tests/before_accent_punctuation.pl
index 1e9fa226fe..89951862dc 100644
--- a/tp/t/results/plaintext_tests/before_accent_punctuation.pl
+++ b/tp/t/results/plaintext_tests/before_accent_punctuation.pl
@@ -28,8 +28,7 @@ $result_trees{'before_accent_punctuation'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
diff --git a/tp/t/results/plaintext_tests/characters_and_commands_in_var.pl 
b/tp/t/results/plaintext_tests/characters_and_commands_in_var.pl
index 6b34b671cd..a09208ffc0 100644
--- a/tp/t/results/plaintext_tests/characters_and_commands_in_var.pl
+++ b/tp/t/results/plaintext_tests/characters_and_commands_in_var.pl
@@ -25,8 +25,7 @@ $result_trees{'characters_and_commands_in_var'} = {
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -46,8 +45,7 @@ $result_trees{'characters_and_commands_in_var'} = {
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -67,8 +65,7 @@ $result_trees{'characters_and_commands_in_var'} = {
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -88,8 +85,7 @@ $result_trees{'characters_and_commands_in_var'} = {
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -133,8 +129,7 @@ $result_trees{'characters_and_commands_in_var'} = {
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -172,8 +167,7 @@ $result_trees{'characters_and_commands_in_var'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     },
                     {
@@ -193,8 +187,7 @@ $result_trees{'characters_and_commands_in_var'} = {
                       'cmdname' => 'u',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     },
                     {
@@ -214,8 +207,7 @@ $result_trees{'characters_and_commands_in_var'} = {
                       'cmdname' => '`',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     },
                     {
@@ -230,8 +222,7 @@ $result_trees{'characters_and_commands_in_var'} = {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     }
                   ],
@@ -241,8 +232,7 @@ $result_trees{'characters_and_commands_in_var'} = {
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -293,8 +283,7 @@ $result_trees{'characters_and_commands_in_var'} = {
                           'cmdname' => 'var',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 10,
-                            'macro' => ''
+                            'line_nr' => 10
                           }
                         },
                         {
@@ -314,8 +303,7 @@ $result_trees{'characters_and_commands_in_var'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
diff --git a/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl 
b/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl
index b9dc159964..251382b592 100644
--- a/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl
+++ b/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl
@@ -50,8 +50,7 @@ $result_trees{'chinese_mixed_with_en'} = {
               },
               'source_info' => {
                 'file_name' => 'chinese_mixed_with_en.texi',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -79,8 +78,7 @@ $result_trees{'chinese_mixed_with_en'} = {
               },
               'source_info' => {
                 'file_name' => 'chinese_mixed_with_en.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -123,8 +121,7 @@ $result_trees{'chinese_mixed_with_en'} = {
       },
       'source_info' => {
         'file_name' => 'chinese_mixed_with_en.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -174,8 +171,7 @@ $result_trees{'chinese_mixed_with_en'} = {
       },
       'source_info' => {
         'file_name' => 'chinese_mixed_with_en.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -207,8 +203,7 @@ $result_trees{'chinese_mixed_with_en'} = {
       },
       'source_info' => {
         'file_name' => 'chinese_mixed_with_en.texi',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -399,8 +394,7 @@ $result_trees{'chinese_mixed_with_en'} = {
       },
       'source_info' => {
         'file_name' => 'chinese_mixed_with_en.texi',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
diff --git a/tp/t/results/plaintext_tests/code_commands_and_punctuation.pl 
b/tp/t/results/plaintext_tests/code_commands_and_punctuation.pl
index 41d845f244..2310873b2f 100644
--- a/tp/t/results/plaintext_tests/code_commands_and_punctuation.pl
+++ b/tp/t/results/plaintext_tests/code_commands_and_punctuation.pl
@@ -25,8 +25,7 @@ $result_trees{'code_commands_and_punctuation'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -46,8 +45,7 @@ $result_trees{'code_commands_and_punctuation'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
diff --git a/tp/t/results/plaintext_tests/command_brace_no_arg_punctuation.pl 
b/tp/t/results/plaintext_tests/command_brace_no_arg_punctuation.pl
index cd0c909c93..6d744c97c5 100644
--- a/tp/t/results/plaintext_tests/command_brace_no_arg_punctuation.pl
+++ b/tp/t/results/plaintext_tests/command_brace_no_arg_punctuation.pl
@@ -20,8 +20,7 @@ $result_trees{'command_brace_no_arg_punctuation'} = {
               'cmdname' => 'TeX',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -36,8 +35,7 @@ $result_trees{'command_brace_no_arg_punctuation'} = {
               'cmdname' => 'LaTeX',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -52,8 +50,7 @@ $result_trees{'command_brace_no_arg_punctuation'} = {
               'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -68,8 +65,7 @@ $result_trees{'command_brace_no_arg_punctuation'} = {
               'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
diff --git a/tp/t/results/plaintext_tests/commands_and_punctuation.pl 
b/tp/t/results/plaintext_tests/commands_and_punctuation.pl
index 2906b29181..c036403b7e 100644
--- a/tp/t/results/plaintext_tests/commands_and_punctuation.pl
+++ b/tp/t/results/plaintext_tests/commands_and_punctuation.pl
@@ -35,8 +35,7 @@ $result_trees{'commands_and_punctuation'} = {
               'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -51,8 +50,7 @@ $result_trees{'commands_and_punctuation'} = {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
diff --git a/tp/t/results/plaintext_tests/del_quote_linebreaking.pl 
b/tp/t/results/plaintext_tests/del_quote_linebreaking.pl
index dfcb26597b..3e81386234 100644
--- a/tp/t/results/plaintext_tests/del_quote_linebreaking.pl
+++ b/tp/t/results/plaintext_tests/del_quote_linebreaking.pl
@@ -76,8 +76,7 @@ $result_trees{'del_quote_linebreaking'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -145,8 +144,7 @@ $result_trees{'del_quote_linebreaking'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -214,8 +212,7 @@ $result_trees{'del_quote_linebreaking'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -297,8 +294,7 @@ $result_trees{'del_quote_linebreaking'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -366,8 +362,7 @@ $result_trees{'del_quote_linebreaking'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -435,8 +430,7 @@ $result_trees{'del_quote_linebreaking'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
diff --git a/tp/t/results/plaintext_tests/east_asian_in_w.pl 
b/tp/t/results/plaintext_tests/east_asian_in_w.pl
index ea373e5dc8..5a0d9c916e 100644
--- a/tp/t/results/plaintext_tests/east_asian_in_w.pl
+++ b/tp/t/results/plaintext_tests/east_asian_in_w.pl
@@ -40,8 +40,7 @@ $result_trees{'east_asian_in_w'} = {
               },
               'source_info' => {
                 'file_name' => 'east_asian_in_w.texi',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -75,8 +74,7 @@ $result_trees{'east_asian_in_w'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => 'east_asian_in_w.texi',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -95,8 +93,7 @@ $result_trees{'east_asian_in_w'} = {
           'cmdname' => 'noindent',
           'source_info' => {
             'file_name' => 'east_asian_in_w.texi',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
diff --git a/tp/t/results/plaintext_tests/empty_line_in_example_end.pl 
b/tp/t/results/plaintext_tests/empty_line_in_example_end.pl
index 7c2f888a84..298ef2867f 100644
--- a/tp/t/results/plaintext_tests/empty_line_in_example_end.pl
+++ b/tp/t/results/plaintext_tests/empty_line_in_example_end.pl
@@ -65,15 +65,13 @@ $result_trees{'empty_line_in_example_end'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl 
b/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl
index dd15befb74..97871e36b8 100644
--- a/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl
+++ b/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl
@@ -91,8 +91,7 @@ $result_trees{'empty_multitable_in_itemize'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
@@ -101,8 +100,7 @@ $result_trees{'empty_multitable_in_itemize'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 },
                 {
@@ -116,8 +114,7 @@ $result_trees{'empty_multitable_in_itemize'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -148,8 +145,7 @@ $result_trees{'empty_multitable_in_itemize'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -160,8 +156,7 @@ $result_trees{'empty_multitable_in_itemize'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -192,7 +187,6 @@ $result_errors{'empty_multitable_in_itemize'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'empty multitable',
     'type' => 'warning'
   }
diff --git a/tp/t/results/plaintext_tests/expanded_tex.pl 
b/tp/t/results/plaintext_tests/expanded_tex.pl
index 9430d85950..6cb8d7876e 100644
--- a/tp/t/results/plaintext_tests/expanded_tex.pl
+++ b/tp/t/results/plaintext_tests/expanded_tex.pl
@@ -74,15 +74,13 @@ $result_trees{'expanded_tex'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
diff --git a/tp/t/results/plaintext_tests/flushright_not_closed_and_format.pl 
b/tp/t/results/plaintext_tests/flushright_not_closed_and_format.pl
index 7e9e7b0e7c..28aba20dd5 100644
--- a/tp/t/results/plaintext_tests/flushright_not_closed_and_format.pl
+++ b/tp/t/results/plaintext_tests/flushright_not_closed_and_format.pl
@@ -88,22 +88,19 @@ $result_trees{'flushright_not_closed_and_format'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -133,7 +130,6 @@ $result_errors{'flushright_not_closed_and_format'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'no matching `@end flushright\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/plaintext_tests/html_expanded.pl 
b/tp/t/results/plaintext_tests/html_expanded.pl
index bd466bd427..66e56ae611 100644
--- a/tp/t/results/plaintext_tests/html_expanded.pl
+++ b/tp/t/results/plaintext_tests/html_expanded.pl
@@ -66,15 +66,13 @@ $result_trees{'html_expanded'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
diff --git a/tp/t/results/plaintext_tests/insert_copying_and_paragraph.pl 
b/tp/t/results/plaintext_tests/insert_copying_and_paragraph.pl
index b3c8e67b74..12ecccb73c 100644
--- a/tp/t/results/plaintext_tests/insert_copying_and_paragraph.pl
+++ b/tp/t/results/plaintext_tests/insert_copying_and_paragraph.pl
@@ -60,15 +60,13 @@ $result_trees{'insert_copying_and_paragraph'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -96,8 +94,7 @@ $result_trees{'insert_copying_and_paragraph'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         }
       ],
diff --git a/tp/t/results/plaintext_tests/invalid_accent_punctuation.pl 
b/tp/t/results/plaintext_tests/invalid_accent_punctuation.pl
index 4d3fd3df90..d5aa7d9895 100644
--- a/tp/t/results/plaintext_tests/invalid_accent_punctuation.pl
+++ b/tp/t/results/plaintext_tests/invalid_accent_punctuation.pl
@@ -18,8 +18,7 @@ $result_trees{'invalid_accent_punctuation'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -46,7 +45,6 @@ $result_errors{'invalid_accent_punctuation'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@^ expected braces',
     'type' => 'error'
   }
diff --git a/tp/t/results/plaintext_tests/isolated_html_expanded.pl 
b/tp/t/results/plaintext_tests/isolated_html_expanded.pl
index 334268ead1..4d174abe8e 100644
--- a/tp/t/results/plaintext_tests/isolated_html_expanded.pl
+++ b/tp/t/results/plaintext_tests/isolated_html_expanded.pl
@@ -65,15 +65,13 @@ $result_trees{'isolated_html_expanded'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
diff --git a/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl 
b/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl
index edfa12b4d5..540d4abaa6 100644
--- a/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl
+++ b/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl
@@ -89,8 +89,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 }
               ],
@@ -99,8 +98,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -168,8 +166,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 },
                 {
@@ -200,8 +197,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 }
               ],
@@ -210,8 +206,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -284,8 +279,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 13,
-                    'macro' => ''
+                    'line_nr' => 13
                   }
                 },
                 {
@@ -316,8 +310,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 14,
-                    'macro' => ''
+                    'line_nr' => 14
                   }
                 }
               ],
@@ -326,8 +319,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -395,8 +387,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 17,
-                    'macro' => ''
+                    'line_nr' => 17
                   }
                 },
                 {
@@ -421,8 +412,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 19,
-                    'macro' => ''
+                    'line_nr' => 19
                   }
                 },
                 {
@@ -453,8 +443,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 20,
-                    'macro' => ''
+                    'line_nr' => 20
                   }
                 }
               ],
@@ -463,8 +452,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -505,15 +493,13 @@ $result_trees{'itemize_in_headitem_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -572,7 +558,6 @@ $result_errors{'itemize_in_headitem_in_example'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@headitem not meaningful inside `@itemize\' block',
     'type' => 'error'
   },
@@ -581,7 +566,6 @@ $result_errors{'itemize_in_headitem_in_example'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@itemize has text but no @item',
     'type' => 'warning'
   },
@@ -590,7 +574,6 @@ $result_errors{'itemize_in_headitem_in_example'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => '@headitem not meaningful inside `@itemize\' block',
     'type' => 'error'
   },
@@ -599,7 +582,6 @@ $result_errors{'itemize_in_headitem_in_example'} = [
 ',
     'file_name' => '',
     'line_nr' => 12,
-    'macro' => '',
     'text' => '@headitem not meaningful inside `@itemize\' block',
     'type' => 'error'
   },
@@ -608,7 +590,6 @@ $result_errors{'itemize_in_headitem_in_example'} = [
 ',
     'file_name' => '',
     'line_nr' => 18,
-    'macro' => '',
     'text' => '@headitem not meaningful inside `@itemize\' block',
     'type' => 'error'
   }
diff --git a/tp/t/results/plaintext_tests/japanese_utf8.pl 
b/tp/t/results/plaintext_tests/japanese_utf8.pl
index 2955000235..e26fb520a6 100644
--- a/tp/t/results/plaintext_tests/japanese_utf8.pl
+++ b/tp/t/results/plaintext_tests/japanese_utf8.pl
@@ -50,8 +50,7 @@ $result_trees{'japanese_utf8'} = {
               },
               'source_info' => {
                 'file_name' => 'japanese_utf8.texi',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -87,8 +86,7 @@ $result_trees{'japanese_utf8'} = {
               },
               'source_info' => {
                 'file_name' => 'japanese_utf8.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -116,8 +114,7 @@ $result_trees{'japanese_utf8'} = {
               },
               'source_info' => {
                 'file_name' => 'japanese_utf8.texi',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -153,8 +150,7 @@ $result_trees{'japanese_utf8'} = {
               },
               'source_info' => {
                 'file_name' => 'japanese_utf8.texi',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -197,8 +193,7 @@ $result_trees{'japanese_utf8'} = {
       },
       'source_info' => {
         'file_name' => 'japanese_utf8.texi',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -253,8 +248,7 @@ $result_trees{'japanese_utf8'} = {
                   'cmdname' => 'copyright',
                   'source_info' => {
                     'file_name' => 'japanese_utf8.texi',
-                    'line_nr' => 12,
-                    'macro' => ''
+                    'line_nr' => 12
                   }
                 },
                 {
@@ -293,8 +287,7 @@ $result_trees{'japanese_utf8'} = {
                   'cmdname' => 'emph',
                   'source_info' => {
                     'file_name' => 'japanese_utf8.texi',
-                    'line_nr' => 14,
-                    'macro' => ''
+                    'line_nr' => 14
                   }
                 },
                 {
@@ -329,8 +322,7 @@ $result_trees{'japanese_utf8'} = {
                   'cmdname' => 'emph',
                   'source_info' => {
                     'file_name' => 'japanese_utf8.texi',
-                    'line_nr' => 18,
-                    'macro' => ''
+                    'line_nr' => 18
                   }
                 },
                 {
@@ -368,15 +360,13 @@ $result_trees{'japanese_utf8'} = {
               },
               'source_info' => {
                 'file_name' => 'japanese_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             }
           ],
           'source_info' => {
             'file_name' => 'japanese_utf8.texi',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -460,8 +450,7 @@ $result_trees{'japanese_utf8'} = {
               ],
               'source_info' => {
                 'file_name' => 'japanese_utf8.texi',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               },
               'type' => 'menu_entry'
             },
@@ -508,8 +497,7 @@ $result_trees{'japanese_utf8'} = {
               ],
               'source_info' => {
                 'file_name' => 'japanese_utf8.texi',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               },
               'type' => 'menu_entry'
             },
@@ -541,15 +529,13 @@ $result_trees{'japanese_utf8'} = {
               },
               'source_info' => {
                 'file_name' => 'japanese_utf8.texi',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             }
           ],
           'source_info' => {
             'file_name' => 'japanese_utf8.texi',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           }
         },
         {
@@ -566,8 +552,7 @@ $result_trees{'japanese_utf8'} = {
       },
       'source_info' => {
         'file_name' => 'japanese_utf8.texi',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -599,8 +584,7 @@ $result_trees{'japanese_utf8'} = {
       },
       'source_info' => {
         'file_name' => 'japanese_utf8.texi',
-        'line_nr' => 30,
-        'macro' => ''
+        'line_nr' => 30
       }
     },
     {
@@ -657,8 +641,7 @@ $result_trees{'japanese_utf8'} = {
       },
       'source_info' => {
         'file_name' => 'japanese_utf8.texi',
-        'line_nr' => 31,
-        'macro' => ''
+        'line_nr' => 31
       }
     },
     {
@@ -690,8 +673,7 @@ $result_trees{'japanese_utf8'} = {
       },
       'source_info' => {
         'file_name' => 'japanese_utf8.texi',
-        'line_nr' => 36,
-        'macro' => ''
+        'line_nr' => 36
       }
     },
     {
@@ -743,8 +725,7 @@ $result_trees{'japanese_utf8'} = {
       },
       'source_info' => {
         'file_name' => 'japanese_utf8.texi',
-        'line_nr' => 37,
-        'macro' => ''
+        'line_nr' => 37
       }
     },
     {
diff --git a/tp/t/results/plaintext_tests/line_passed_and_formats.pl 
b/tp/t/results/plaintext_tests/line_passed_and_formats.pl
index 8c749dcd75..df9025ea5a 100644
--- a/tp/t/results/plaintext_tests/line_passed_and_formats.pl
+++ b/tp/t/results/plaintext_tests/line_passed_and_formats.pl
@@ -117,15 +117,13 @@ $result_trees{'line_passed_and_formats'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 8,
-                    'macro' => ''
+                    'line_nr' => 8
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -156,8 +154,7 @@ $result_trees{'line_passed_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
@@ -168,8 +165,7 @@ $result_trees{'line_passed_and_formats'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -251,15 +247,13 @@ $result_trees{'line_passed_and_formats'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 15,
-                    'macro' => ''
+                    'line_nr' => 15
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -290,15 +284,13 @@ $result_trees{'line_passed_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -380,15 +372,13 @@ $result_trees{'line_passed_and_formats'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 22,
-                    'macro' => ''
+                    'line_nr' => 22
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -419,15 +409,13 @@ $result_trees{'line_passed_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           }
         },
         {
@@ -486,15 +474,13 @@ $result_trees{'line_passed_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           }
         },
         {
@@ -548,15 +534,13 @@ $result_trees{'line_passed_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 28,
-            'macro' => ''
+            'line_nr' => 28
           }
         },
         {
@@ -615,15 +599,13 @@ $result_trees{'line_passed_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 32,
-            'macro' => ''
+            'line_nr' => 32
           }
         },
         {
@@ -677,15 +659,13 @@ $result_trees{'line_passed_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 37,
-                'macro' => ''
+                'line_nr' => 37
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 35,
-            'macro' => ''
+            'line_nr' => 35
           }
         },
         {
@@ -767,15 +747,13 @@ $result_trees{'line_passed_and_formats'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 43,
-                    'macro' => ''
+                    'line_nr' => 43
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 41,
-                'macro' => ''
+                'line_nr' => 41
               }
             },
             {
@@ -815,15 +793,13 @@ $result_trees{'line_passed_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 45,
-                'macro' => ''
+                'line_nr' => 45
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 39,
-            'macro' => ''
+            'line_nr' => 39
           }
         },
         {
@@ -905,15 +881,13 @@ $result_trees{'line_passed_and_formats'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 51,
-                    'macro' => ''
+                    'line_nr' => 51
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             },
             {
@@ -953,15 +927,13 @@ $result_trees{'line_passed_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 47,
-            'macro' => ''
+            'line_nr' => 47
           }
         },
         {
@@ -1043,15 +1015,13 @@ $result_trees{'line_passed_and_formats'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 59,
-                    'macro' => ''
+                    'line_nr' => 59
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 57,
-                'macro' => ''
+                'line_nr' => 57
               }
             },
             {
@@ -1091,15 +1061,13 @@ $result_trees{'line_passed_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 55,
-            'macro' => ''
+            'line_nr' => 55
           }
         },
         {
@@ -1167,15 +1135,13 @@ $result_trees{'line_passed_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 66,
-                'macro' => ''
+                'line_nr' => 66
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 64,
-            'macro' => ''
+            'line_nr' => 64
           }
         },
         {
@@ -1252,15 +1218,13 @@ $result_trees{'line_passed_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 72,
-                'macro' => ''
+                'line_nr' => 72
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 70,
-            'macro' => ''
+            'line_nr' => 70
           }
         },
         {
@@ -1347,15 +1311,13 @@ $result_trees{'line_passed_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 80,
-                'macro' => ''
+                'line_nr' => 80
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 76,
-            'macro' => ''
+            'line_nr' => 76
           }
         },
         {
@@ -1442,15 +1404,13 @@ $result_trees{'line_passed_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 88,
-                'macro' => ''
+                'line_nr' => 88
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 84,
-            'macro' => ''
+            'line_nr' => 84
           }
         },
         {
@@ -1570,15 +1530,13 @@ $result_trees{'line_passed_and_formats'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 100,
-                    'macro' => ''
+                    'line_nr' => 100
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 96,
-                'macro' => ''
+                'line_nr' => 96
               }
             },
             {
@@ -1614,15 +1572,13 @@ $result_trees{'line_passed_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 102,
-                'macro' => ''
+                'line_nr' => 102
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 94,
-            'macro' => ''
+            'line_nr' => 94
           }
         },
         {
@@ -1709,15 +1665,13 @@ $result_trees{'line_passed_and_formats'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 109,
-                    'macro' => ''
+                    'line_nr' => 109
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 107,
-                'macro' => ''
+                'line_nr' => 107
               }
             },
             {
@@ -1753,15 +1707,13 @@ $result_trees{'line_passed_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 111,
-                'macro' => ''
+                'line_nr' => 111
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 105,
-            'macro' => ''
+            'line_nr' => 105
           }
         },
         {
@@ -1863,15 +1815,13 @@ $result_trees{'line_passed_and_formats'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 120,
-                    'macro' => ''
+                    'line_nr' => 120
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 116,
-                'macro' => ''
+                'line_nr' => 116
               }
             },
             {
@@ -1912,15 +1862,13 @@ $result_trees{'line_passed_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 122,
-                'macro' => ''
+                'line_nr' => 122
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 114,
-            'macro' => ''
+            'line_nr' => 114
           }
         },
         {
@@ -2012,15 +1960,13 @@ $result_trees{'line_passed_and_formats'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 129,
-                    'macro' => ''
+                    'line_nr' => 129
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 127,
-                'macro' => ''
+                'line_nr' => 127
               }
             },
             {
@@ -2061,15 +2007,13 @@ $result_trees{'line_passed_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 131,
-                'macro' => ''
+                'line_nr' => 131
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 125,
-            'macro' => ''
+            'line_nr' => 125
           }
         },
         {
@@ -2157,8 +2101,7 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 135,
-                'macro' => ''
+                'line_nr' => 135
               },
               'type' => 'menu_entry'
             },
@@ -2190,15 +2133,13 @@ $result_trees{'line_passed_and_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 136,
-                'macro' => ''
+                'line_nr' => 136
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 134,
-            'macro' => ''
+            'line_nr' => 134
           }
         },
         {
@@ -2222,8 +2163,7 @@ $result_trees{'line_passed_and_formats'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
diff --git a/tp/t/results/plaintext_tests/lone_braces_in_inlineraw.pl 
b/tp/t/results/plaintext_tests/lone_braces_in_inlineraw.pl
index 8306bd2a87..fbd0824982 100644
--- a/tp/t/results/plaintext_tests/lone_braces_in_inlineraw.pl
+++ b/tp/t/results/plaintext_tests/lone_braces_in_inlineraw.pl
@@ -31,8 +31,7 @@ $result_trees{'lone_braces_in_inlineraw'} = {
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       },
                       'type' => 'balanced_braces'
                     }
@@ -52,8 +51,7 @@ $result_trees{'lone_braces_in_inlineraw'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
diff --git a/tp/t/results/plaintext_tests/long_uref_after_item.pl 
b/tp/t/results/plaintext_tests/long_uref_after_item.pl
index 8c022661e6..7da66b7614 100644
--- a/tp/t/results/plaintext_tests/long_uref_after_item.pl
+++ b/tp/t/results/plaintext_tests/long_uref_after_item.pl
@@ -53,8 +53,7 @@ $result_trees{'long_uref_after_item'} = {
                       'cmdname' => 'uref',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     },
                     {
@@ -70,8 +69,7 @@ $result_trees{'long_uref_after_item'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -102,8 +100,7 @@ $result_trees{'long_uref_after_item'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -112,8 +109,7 @@ $result_trees{'long_uref_after_item'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/plaintext_tests/multiline_image_and_align.pl 
b/tp/t/results/plaintext_tests/multiline_image_and_align.pl
index 571d247422..8765c745a1 100644
--- a/tp/t/results/plaintext_tests/multiline_image_and_align.pl
+++ b/tp/t/results/plaintext_tests/multiline_image_and_align.pl
@@ -30,8 +30,7 @@ $result_trees{'multiline_image_and_align'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 }
               ],
@@ -52,8 +51,7 @@ $result_trees{'multiline_image_and_align'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -85,8 +83,7 @@ $result_trees{'multiline_image_and_align'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 }
               ],
@@ -107,8 +104,7 @@ $result_trees{'multiline_image_and_align'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -140,8 +136,7 @@ $result_trees{'multiline_image_and_align'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 }
               ],
@@ -162,8 +157,7 @@ $result_trees{'multiline_image_and_align'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -195,8 +189,7 @@ $result_trees{'multiline_image_and_align'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 },
                 {
@@ -220,8 +213,7 @@ $result_trees{'multiline_image_and_align'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -266,8 +258,7 @@ $result_trees{'multiline_image_and_align'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 },
                 {
@@ -304,8 +295,7 @@ $result_trees{'multiline_image_and_align'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 13,
-                    'macro' => ''
+                    'line_nr' => 13
                   }
                 },
                 {
@@ -328,8 +318,7 @@ $result_trees{'multiline_image_and_align'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 13,
-                    'macro' => ''
+                    'line_nr' => 13
                   }
                 },
                 {
@@ -367,8 +356,7 @@ $result_trees{'multiline_image_and_align'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 16,
-                    'macro' => ''
+                    'line_nr' => 16
                   }
                 },
                 {
@@ -406,15 +394,13 @@ $result_trees{'multiline_image_and_align'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         }
       ],
diff --git a/tp/t/results/plaintext_tests/multiline_verb_after_space.pl 
b/tp/t/results/plaintext_tests/multiline_verb_after_space.pl
index cf2a6a9b5c..4315d30405 100644
--- a/tp/t/results/plaintext_tests/multiline_verb_after_space.pl
+++ b/tp/t/results/plaintext_tests/multiline_verb_after_space.pl
@@ -37,8 +37,7 @@ $result_trees{'multiline_verb_after_space'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
diff --git a/tp/t/results/plaintext_tests/multitable.pl 
b/tp/t/results/plaintext_tests/multitable.pl
index 9cf6c9d9ba..200c5a4d90 100644
--- a/tp/t/results/plaintext_tests/multitable.pl
+++ b/tp/t/results/plaintext_tests/multitable.pl
@@ -21,8 +21,7 @@ $result_trees{'multitable'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'bracketed_arg'
                 },
@@ -37,8 +36,7 @@ $result_trees{'multitable'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'bracketed_arg'
                 }
@@ -79,8 +77,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -105,8 +102,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -138,8 +134,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     },
                     {
@@ -164,8 +159,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -205,8 +199,7 @@ $result_trees{'multitable'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -220,8 +213,7 @@ $result_trees{'multitable'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -241,8 +233,7 @@ $result_trees{'multitable'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   },
                   'type' => 'bracketed_arg'
                 },
@@ -257,8 +248,7 @@ $result_trees{'multitable'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   },
                   'type' => 'bracketed_arg'
                 }
@@ -299,8 +289,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     },
                     {
@@ -325,8 +314,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     }
                   ],
@@ -358,8 +346,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     },
                     {
@@ -384,8 +371,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     }
                   ],
@@ -417,8 +403,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     },
                     {
@@ -443,8 +428,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     }
                   ],
@@ -476,8 +460,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     },
                     {
@@ -502,8 +485,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       }
                     }
                   ],
@@ -535,8 +517,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     },
                     {
@@ -561,8 +542,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     }
                   ],
@@ -594,8 +574,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     },
                     {
@@ -620,8 +599,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     }
                   ],
@@ -653,8 +631,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     },
                     {
@@ -679,8 +656,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     }
                   ],
@@ -712,8 +688,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     },
                     {
@@ -738,8 +713,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     }
                   ],
@@ -771,8 +745,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     },
                     {
@@ -797,8 +770,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     }
                   ],
@@ -830,8 +802,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     },
                     {
@@ -856,8 +827,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     }
                   ],
@@ -889,8 +859,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -915,8 +884,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     }
                   ],
@@ -948,8 +916,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       }
                     },
                     {
@@ -974,8 +941,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       }
                     }
                   ],
@@ -1007,8 +973,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 19,
-                        'macro' => ''
+                        'line_nr' => 19
                       }
                     },
                     {
@@ -1033,8 +998,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 19,
-                        'macro' => ''
+                        'line_nr' => 19
                       }
                     }
                   ],
@@ -1071,8 +1035,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     },
                     {
@@ -1097,8 +1060,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     }
                   ],
@@ -1138,8 +1100,7 @@ $result_trees{'multitable'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             }
           ],
@@ -1153,8 +1114,7 @@ $result_trees{'multitable'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -1174,8 +1134,7 @@ $result_trees{'multitable'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 23,
-                    'macro' => ''
+                    'line_nr' => 23
                   },
                   'type' => 'bracketed_arg'
                 },
@@ -1190,8 +1149,7 @@ $result_trees{'multitable'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 23,
-                    'macro' => ''
+                    'line_nr' => 23
                   },
                   'type' => 'bracketed_arg'
                 }
@@ -1232,8 +1190,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1258,8 +1215,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     }
                   ],
@@ -1291,8 +1247,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 25,
-                        'macro' => ''
+                        'line_nr' => 25
                       }
                     },
                     {
@@ -1317,8 +1272,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 25,
-                        'macro' => ''
+                        'line_nr' => 25
                       }
                     }
                   ],
@@ -1350,8 +1304,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 26,
-                        'macro' => ''
+                        'line_nr' => 26
                       }
                     },
                     {
@@ -1376,8 +1329,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 26,
-                        'macro' => ''
+                        'line_nr' => 26
                       }
                     }
                   ],
@@ -1417,8 +1369,7 @@ $result_trees{'multitable'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             }
           ],
@@ -1432,8 +1383,7 @@ $result_trees{'multitable'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           }
         },
         {
@@ -1453,8 +1403,7 @@ $result_trees{'multitable'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 29,
-                    'macro' => ''
+                    'line_nr' => 29
                   },
                   'type' => 'bracketed_arg'
                 }
@@ -1500,8 +1449,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 30,
-                        'macro' => ''
+                        'line_nr' => 30
                       }
                     }
                   ],
@@ -1534,8 +1482,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 32,
-                        'macro' => ''
+                        'line_nr' => 32
                       }
                     }
                   ],
@@ -1575,8 +1522,7 @@ $result_trees{'multitable'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               }
             }
           ],
@@ -1590,8 +1536,7 @@ $result_trees{'multitable'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 29,
-            'macro' => ''
+            'line_nr' => 29
           }
         },
         {
@@ -1611,8 +1556,7 @@ $result_trees{'multitable'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 35,
-                    'macro' => ''
+                    'line_nr' => 35
                   },
                   'type' => 'bracketed_arg'
                 },
@@ -1627,8 +1571,7 @@ $result_trees{'multitable'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 35,
-                    'macro' => ''
+                    'line_nr' => 35
                   },
                   'type' => 'bracketed_arg'
                 }
@@ -1674,8 +1617,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 36,
-                        'macro' => ''
+                        'line_nr' => 36
                       }
                     },
                     {
@@ -1704,8 +1646,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 38,
-                        'macro' => ''
+                        'line_nr' => 38
                       }
                     }
                   ],
@@ -1738,8 +1679,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 40,
-                        'macro' => ''
+                        'line_nr' => 40
                       }
                     },
                     {
@@ -1764,8 +1704,7 @@ $result_trees{'multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 41,
-                        'macro' => ''
+                        'line_nr' => 41
                       }
                     }
                   ],
@@ -1805,8 +1744,7 @@ $result_trees{'multitable'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               }
             }
           ],
@@ -1820,8 +1758,7 @@ $result_trees{'multitable'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 35,
-            'macro' => ''
+            'line_nr' => 35
           }
         }
       ],
diff --git 
a/tp/t/results/plaintext_tests/multitable_in_example_extraneous_item_tab.pl 
b/tp/t/results/plaintext_tests/multitable_in_example_extraneous_item_tab.pl
index b262e132a4..68d4da2f20 100644
--- a/tp/t/results/plaintext_tests/multitable_in_example_extraneous_item_tab.pl
+++ b/tp/t/results/plaintext_tests/multitable_in_example_extraneous_item_tab.pl
@@ -122,8 +122,7 @@ $result_trees{'multitable_in_example_extraneous_item_tab'} 
= {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 }
               ],
@@ -137,8 +136,7 @@ $result_trees{'multitable_in_example_extraneous_item_tab'} 
= {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -169,15 +167,13 @@ 
$result_trees{'multitable_in_example_extraneous_item_tab'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -205,7 +201,6 @@ $result_errors{'multitable_in_example_extraneous_item_tab'} 
= [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'empty multitable',
     'type' => 'warning'
   },
@@ -214,7 +209,6 @@ $result_errors{'multitable_in_example_extraneous_item_tab'} 
= [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@item in empty multitable',
     'type' => 'warning'
   },
@@ -223,7 +217,6 @@ $result_errors{'multitable_in_example_extraneous_item_tab'} 
= [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@tab in empty multitable',
     'type' => 'warning'
   },
@@ -232,7 +225,6 @@ $result_errors{'multitable_in_example_extraneous_item_tab'} 
= [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '@item in empty multitable',
     'type' => 'warning'
   },
@@ -241,7 +233,6 @@ $result_errors{'multitable_in_example_extraneous_item_tab'} 
= [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '@tab in empty multitable',
     'type' => 'warning'
   },
@@ -250,7 +241,6 @@ $result_errors{'multitable_in_example_extraneous_item_tab'} 
= [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@multitable has text but no @item',
     'type' => 'warning'
   }
diff --git 
a/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl 
b/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl
index 65c6714513..8cfb811c2f 100644
--- a/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl
+++ b/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl
@@ -35,8 +35,7 @@ $result_trees{'multitable_in_example_extraneous_tab'} = {
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -90,8 +89,7 @@ $result_trees{'multitable_in_example_extraneous_tab'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 3,
-                            'macro' => ''
+                            'line_nr' => 3
                           }
                         }
                       ],
@@ -133,8 +131,7 @@ $result_trees{'multitable_in_example_extraneous_tab'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 4,
-                            'macro' => ''
+                            'line_nr' => 4
                           }
                         }
                       ],
@@ -174,8 +171,7 @@ $result_trees{'multitable_in_example_extraneous_tab'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 }
               ],
@@ -189,8 +185,7 @@ $result_trees{'multitable_in_example_extraneous_tab'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -221,15 +216,13 @@ $result_trees{'multitable_in_example_extraneous_tab'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -257,7 +250,6 @@ $result_errors{'multitable_in_example_extraneous_tab'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'too many columns in multitable item (max 1)',
     'type' => 'error'
   },
@@ -266,7 +258,6 @@ $result_errors{'multitable_in_example_extraneous_tab'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'too many columns in multitable item (max 1)',
     'type' => 'error'
   }
diff --git a/tp/t/results/plaintext_tests/nested_code_commands.pl 
b/tp/t/results/plaintext_tests/nested_code_commands.pl
index 947b1dbb6d..fecb93002d 100644
--- a/tp/t/results/plaintext_tests/nested_code_commands.pl
+++ b/tp/t/results/plaintext_tests/nested_code_commands.pl
@@ -32,8 +32,7 @@ $result_trees{'nested_code_commands'} = {
                       'cmdname' => 'kbd',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     }
                   ],
@@ -43,8 +42,7 @@ $result_trees{'nested_code_commands'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -72,8 +70,7 @@ $result_trees{'nested_code_commands'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -83,8 +80,7 @@ $result_trees{'nested_code_commands'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -112,8 +108,7 @@ $result_trees{'nested_code_commands'} = {
                       'cmdname' => 'kbd',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -123,8 +118,7 @@ $result_trees{'nested_code_commands'} = {
               'cmdname' => 'command',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -152,8 +146,7 @@ $result_trees{'nested_code_commands'} = {
                       'cmdname' => 'command',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     }
                   ],
@@ -163,8 +156,7 @@ $result_trees{'nested_code_commands'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -192,8 +184,7 @@ $result_trees{'nested_code_commands'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
@@ -203,8 +194,7 @@ $result_trees{'nested_code_commands'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -232,8 +222,7 @@ $result_trees{'nested_code_commands'} = {
                       'cmdname' => 'samp',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     }
                   ],
@@ -243,8 +232,7 @@ $result_trees{'nested_code_commands'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -272,8 +260,7 @@ $result_trees{'nested_code_commands'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     }
                   ],
@@ -283,8 +270,7 @@ $result_trees{'nested_code_commands'} = {
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -312,8 +298,7 @@ $result_trees{'nested_code_commands'} = {
                       'cmdname' => 'var',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     }
                   ],
@@ -323,8 +308,7 @@ $result_trees{'nested_code_commands'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -369,8 +353,7 @@ $result_trees{'nested_code_commands'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 },
                 {
@@ -398,8 +381,7 @@ $result_trees{'nested_code_commands'} = {
                           'cmdname' => 'kbd',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 12,
-                            'macro' => ''
+                            'line_nr' => 12
                           }
                         }
                       ],
@@ -409,8 +391,7 @@ $result_trees{'nested_code_commands'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 12,
-                    'macro' => ''
+                    'line_nr' => 12
                   }
                 },
                 {
@@ -431,8 +412,7 @@ $result_trees{'nested_code_commands'} = {
                   'cmdname' => 'kbd',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 13,
-                    'macro' => ''
+                    'line_nr' => 13
                   }
                 },
                 {
@@ -460,8 +440,7 @@ $result_trees{'nested_code_commands'} = {
                           'cmdname' => 'kbd',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 14,
-                            'macro' => ''
+                            'line_nr' => 14
                           }
                         }
                       ],
@@ -471,8 +450,7 @@ $result_trees{'nested_code_commands'} = {
                   'cmdname' => 'command',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 14,
-                    'macro' => ''
+                    'line_nr' => 14
                   }
                 },
                 {
@@ -500,8 +478,7 @@ $result_trees{'nested_code_commands'} = {
                           'cmdname' => 'command',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 15,
-                            'macro' => ''
+                            'line_nr' => 15
                           }
                         }
                       ],
@@ -511,8 +488,7 @@ $result_trees{'nested_code_commands'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 15,
-                    'macro' => ''
+                    'line_nr' => 15
                   }
                 },
                 {
@@ -540,8 +516,7 @@ $result_trees{'nested_code_commands'} = {
                           'cmdname' => 'code',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 16,
-                            'macro' => ''
+                            'line_nr' => 16
                           }
                         }
                       ],
@@ -551,8 +526,7 @@ $result_trees{'nested_code_commands'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 16,
-                    'macro' => ''
+                    'line_nr' => 16
                   }
                 },
                 {
@@ -580,8 +554,7 @@ $result_trees{'nested_code_commands'} = {
                           'cmdname' => 'samp',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 17,
-                            'macro' => ''
+                            'line_nr' => 17
                           }
                         }
                       ],
@@ -591,8 +564,7 @@ $result_trees{'nested_code_commands'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 17,
-                    'macro' => ''
+                    'line_nr' => 17
                   }
                 },
                 {
@@ -620,8 +592,7 @@ $result_trees{'nested_code_commands'} = {
                           'cmdname' => 'code',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 18,
-                            'macro' => ''
+                            'line_nr' => 18
                           }
                         }
                       ],
@@ -631,8 +602,7 @@ $result_trees{'nested_code_commands'} = {
                   'cmdname' => 'var',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 18,
-                    'macro' => ''
+                    'line_nr' => 18
                   }
                 },
                 {
@@ -660,8 +630,7 @@ $result_trees{'nested_code_commands'} = {
                           'cmdname' => 'var',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 19,
-                            'macro' => ''
+                            'line_nr' => 19
                           }
                         }
                       ],
@@ -671,8 +640,7 @@ $result_trees{'nested_code_commands'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 19,
-                    'macro' => ''
+                    'line_nr' => 19
                   }
                 },
                 {
@@ -710,15 +678,13 @@ $result_trees{'nested_code_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -756,8 +722,7 @@ $result_trees{'nested_code_commands'} = {
                   'cmdname' => 'kbd',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 23,
-                    'macro' => ''
+                    'line_nr' => 23
                   }
                 },
                 {
@@ -785,8 +750,7 @@ $result_trees{'nested_code_commands'} = {
                           'cmdname' => 'kbd',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 24,
-                            'macro' => ''
+                            'line_nr' => 24
                           }
                         }
                       ],
@@ -796,8 +760,7 @@ $result_trees{'nested_code_commands'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 24,
-                    'macro' => ''
+                    'line_nr' => 24
                   }
                 },
                 {
@@ -825,8 +788,7 @@ $result_trees{'nested_code_commands'} = {
                           'cmdname' => 'kbd',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 25,
-                            'macro' => ''
+                            'line_nr' => 25
                           }
                         }
                       ],
@@ -836,8 +798,7 @@ $result_trees{'nested_code_commands'} = {
                   'cmdname' => 'command',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 25,
-                    'macro' => ''
+                    'line_nr' => 25
                   }
                 },
                 {
@@ -865,8 +826,7 @@ $result_trees{'nested_code_commands'} = {
                           'cmdname' => 'command',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 26,
-                            'macro' => ''
+                            'line_nr' => 26
                           }
                         }
                       ],
@@ -876,8 +836,7 @@ $result_trees{'nested_code_commands'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 26,
-                    'macro' => ''
+                    'line_nr' => 26
                   }
                 },
                 {
@@ -905,8 +864,7 @@ $result_trees{'nested_code_commands'} = {
                           'cmdname' => 'code',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 27,
-                            'macro' => ''
+                            'line_nr' => 27
                           }
                         }
                       ],
@@ -916,8 +874,7 @@ $result_trees{'nested_code_commands'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 27,
-                    'macro' => ''
+                    'line_nr' => 27
                   }
                 },
                 {
@@ -945,8 +902,7 @@ $result_trees{'nested_code_commands'} = {
                           'cmdname' => 'samp',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 28,
-                            'macro' => ''
+                            'line_nr' => 28
                           }
                         }
                       ],
@@ -956,8 +912,7 @@ $result_trees{'nested_code_commands'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 28,
-                    'macro' => ''
+                    'line_nr' => 28
                   }
                 },
                 {
@@ -985,8 +940,7 @@ $result_trees{'nested_code_commands'} = {
                           'cmdname' => 'code',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 29,
-                            'macro' => ''
+                            'line_nr' => 29
                           }
                         }
                       ],
@@ -996,8 +950,7 @@ $result_trees{'nested_code_commands'} = {
                   'cmdname' => 'var',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 29,
-                    'macro' => ''
+                    'line_nr' => 29
                   }
                 },
                 {
@@ -1025,8 +978,7 @@ $result_trees{'nested_code_commands'} = {
                           'cmdname' => 'var',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 30,
-                            'macro' => ''
+                            'line_nr' => 30
                           }
                         }
                       ],
@@ -1036,8 +988,7 @@ $result_trees{'nested_code_commands'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 30,
-                    'macro' => ''
+                    'line_nr' => 30
                   }
                 },
                 {
@@ -1075,15 +1026,13 @@ $result_trees{'nested_code_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 22,
-            'macro' => ''
+            'line_nr' => 22
           }
         }
       ],
diff --git a/tp/t/results/plaintext_tests/nested_indentedblock.pl 
b/tp/t/results/plaintext_tests/nested_indentedblock.pl
index 16f2cb89e4..f75b9a8995 100644
--- a/tp/t/results/plaintext_tests/nested_indentedblock.pl
+++ b/tp/t/results/plaintext_tests/nested_indentedblock.pl
@@ -83,15 +83,13 @@ $result_trees{'nested_indentedblock'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -122,15 +120,13 @@ $result_trees{'nested_indentedblock'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -216,15 +212,13 @@ $result_trees{'nested_indentedblock'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 12,
-                    'macro' => ''
+                    'line_nr' => 12
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -255,15 +249,13 @@ $result_trees{'nested_indentedblock'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         }
       ],
diff --git a/tp/t/results/plaintext_tests/nested_multitable.pl 
b/tp/t/results/plaintext_tests/nested_multitable.pl
index 9508b74dfa..194fa85207 100644
--- a/tp/t/results/plaintext_tests/nested_multitable.pl
+++ b/tp/t/results/plaintext_tests/nested_multitable.pl
@@ -32,8 +32,7 @@ $result_trees{'nested_multitable'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   },
                   'type' => 'bracketed_arg'
                 },
@@ -48,8 +47,7 @@ $result_trees{'nested_multitable'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   },
                   'type' => 'bracketed_arg'
                 }
@@ -89,8 +87,7 @@ $result_trees{'nested_multitable'} = {
                                   ],
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 4,
-                                    'macro' => ''
+                                    'line_nr' => 4
                                   },
                                   'type' => 'bracketed_arg'
                                 },
@@ -105,8 +102,7 @@ $result_trees{'nested_multitable'} = {
                                   ],
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 4,
-                                    'macro' => ''
+                                    'line_nr' => 4
                                   },
                                   'type' => 'bracketed_arg'
                                 }
@@ -147,8 +143,7 @@ $result_trees{'nested_multitable'} = {
                                       },
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 5,
-                                        'macro' => ''
+                                        'line_nr' => 5
                                       }
                                     },
                                     {
@@ -173,8 +168,7 @@ $result_trees{'nested_multitable'} = {
                                       },
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 5,
-                                        'macro' => ''
+                                        'line_nr' => 5
                                       }
                                     }
                                   ],
@@ -214,8 +208,7 @@ $result_trees{'nested_multitable'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 6,
-                                'macro' => ''
+                                'line_nr' => 6
                               }
                             }
                           ],
@@ -229,8 +222,7 @@ $result_trees{'nested_multitable'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 4,
-                            'macro' => ''
+                            'line_nr' => 4
                           }
                         },
                         {
@@ -243,8 +235,7 @@ $result_trees{'nested_multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     },
                     {
@@ -269,8 +260,7 @@ $result_trees{'nested_multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     }
                   ],
@@ -302,8 +292,7 @@ $result_trees{'nested_multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     },
                     {
@@ -328,8 +317,7 @@ $result_trees{'nested_multitable'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     }
                   ],
@@ -369,8 +357,7 @@ $result_trees{'nested_multitable'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
@@ -384,8 +371,7 @@ $result_trees{'nested_multitable'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
diff --git a/tp/t/results/plaintext_tests/no_empty_line_after_section.pl 
b/tp/t/results/plaintext_tests/no_empty_line_after_section.pl
index ed0d4829c1..7fbfd9739b 100644
--- a/tp/t/results/plaintext_tests/no_empty_line_after_section.pl
+++ b/tp/t/results/plaintext_tests/no_empty_line_after_section.pl
@@ -63,8 +63,7 @@ $result_trees{'no_empty_line_after_section'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -131,8 +130,7 @@ $result_trees{'no_empty_line_after_section'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -170,8 +168,7 @@ $result_trees{'no_empty_line_after_section'} = {
               'cmdname' => 'uref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -216,8 +213,7 @@ $result_trees{'no_empty_line_after_section'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         }
       ],
@@ -231,8 +227,7 @@ $result_trees{'no_empty_line_after_section'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -258,8 +253,7 @@ $result_trees{'no_empty_line_after_section'} = {
           'cmdname' => 'indent',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         },
         {
@@ -295,8 +289,7 @@ $result_trees{'no_empty_line_after_section'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     }
   ],
diff --git 
a/tp/t/results/plaintext_tests/no_punctuation_commands_frenchspacing.pl 
b/tp/t/results/plaintext_tests/no_punctuation_commands_frenchspacing.pl
index 5875c35b45..f03f8d7670 100644
--- a/tp/t/results/plaintext_tests/no_punctuation_commands_frenchspacing.pl
+++ b/tp/t/results/plaintext_tests/no_punctuation_commands_frenchspacing.pl
@@ -39,8 +39,7 @@ $result_trees{'no_punctuation_commands_frenchspacing'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/plaintext_tests/non_break_spaces.pl 
b/tp/t/results/plaintext_tests/non_break_spaces.pl
index 7255814ec1..20069bc3f6 100644
--- a/tp/t/results/plaintext_tests/non_break_spaces.pl
+++ b/tp/t/results/plaintext_tests/non_break_spaces.pl
@@ -40,8 +40,7 @@ $result_trees{'non_break_spaces'} = {
               },
               'source_info' => {
                 'file_name' => 'non_break_spaces.texi',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -104,8 +103,7 @@ $result_trees{'non_break_spaces'} = {
       },
       'source_info' => {
         'file_name' => 'non_break_spaces.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     }
   ],
diff --git a/tp/t/results/plaintext_tests/paragraphindent.pl 
b/tp/t/results/plaintext_tests/paragraphindent.pl
index 8b55d835f3..9c49acded7 100644
--- a/tp/t/results/plaintext_tests/paragraphindent.pl
+++ b/tp/t/results/plaintext_tests/paragraphindent.pl
@@ -71,8 +71,7 @@ $result_trees{'paragraphindent'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -128,8 +127,7 @@ $result_trees{'paragraphindent'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -185,8 +183,7 @@ $result_trees{'paragraphindent'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
diff --git a/tp/t/results/plaintext_tests/protect_spaces_on_line.pl 
b/tp/t/results/plaintext_tests/protect_spaces_on_line.pl
index e87a1d0823..2828f15c05 100644
--- a/tp/t/results/plaintext_tests/protect_spaces_on_line.pl
+++ b/tp/t/results/plaintext_tests/protect_spaces_on_line.pl
@@ -33,8 +33,7 @@ $result_trees{'protect_spaces_on_line'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -54,8 +53,7 @@ $result_trees{'protect_spaces_on_line'} = {
               'cmdname' => 'w',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -105,8 +103,7 @@ $result_trees{'protect_spaces_on_line'} = {
                       'cmdname' => 'samp',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -126,8 +123,7 @@ $result_trees{'protect_spaces_on_line'} = {
                       'cmdname' => 'w',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -151,8 +147,7 @@ $result_trees{'protect_spaces_on_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -183,15 +178,13 @@ $result_trees{'protect_spaces_on_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         }
       ],
diff --git a/tp/t/results/plaintext_tests/punctuation_abbr_acronym.pl 
b/tp/t/results/plaintext_tests/punctuation_abbr_acronym.pl
index c985706e4a..d4998de408 100644
--- a/tp/t/results/plaintext_tests/punctuation_abbr_acronym.pl
+++ b/tp/t/results/plaintext_tests/punctuation_abbr_acronym.pl
@@ -25,8 +25,7 @@ $result_trees{'punctuation_abbr_acronym'} = {
               'cmdname' => 'abbr',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -46,8 +45,7 @@ $result_trees{'punctuation_abbr_acronym'} = {
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -67,8 +65,7 @@ $result_trees{'punctuation_abbr_acronym'} = {
               'cmdname' => 'abbr',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -88,8 +85,7 @@ $result_trees{'punctuation_abbr_acronym'} = {
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -123,8 +119,7 @@ $result_trees{'punctuation_abbr_acronym'} = {
               'cmdname' => 'abbr',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -157,8 +152,7 @@ $result_trees{'punctuation_abbr_acronym'} = {
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -191,8 +185,7 @@ $result_trees{'punctuation_abbr_acronym'} = {
               'cmdname' => 'abbr',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -226,8 +219,7 @@ $result_trees{'punctuation_abbr_acronym'} = {
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
diff --git 
a/tp/t/results/plaintext_tests/punctuation_and_code_style_commands.pl 
b/tp/t/results/plaintext_tests/punctuation_and_code_style_commands.pl
index 54d1b44955..6ab134c3a0 100644
--- a/tp/t/results/plaintext_tests/punctuation_and_code_style_commands.pl
+++ b/tp/t/results/plaintext_tests/punctuation_and_code_style_commands.pl
@@ -25,8 +25,7 @@ $result_trees{'punctuation_and_code_style_commands'} = {
               'cmdname' => 'command',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -50,8 +49,7 @@ $result_trees{'punctuation_and_code_style_commands'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     }
                   ],
@@ -61,8 +59,7 @@ $result_trees{'punctuation_and_code_style_commands'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -81,8 +78,7 @@ $result_trees{'punctuation_and_code_style_commands'} = {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     }
                   ],
@@ -92,8 +88,7 @@ $result_trees{'punctuation_and_code_style_commands'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -114,8 +109,7 @@ $result_trees{'punctuation_and_code_style_commands'} = {
               'cmdname' => 'command',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -139,8 +133,7 @@ $result_trees{'punctuation_and_code_style_commands'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -150,8 +143,7 @@ $result_trees{'punctuation_and_code_style_commands'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -170,8 +162,7 @@ $result_trees{'punctuation_and_code_style_commands'} = {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -181,8 +172,7 @@ $result_trees{'punctuation_and_code_style_commands'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -203,8 +193,7 @@ $result_trees{'punctuation_and_code_style_commands'} = {
               'cmdname' => 'command',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -231,8 +220,7 @@ $result_trees{'punctuation_and_code_style_commands'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -242,8 +230,7 @@ $result_trees{'punctuation_and_code_style_commands'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -265,8 +252,7 @@ $result_trees{'punctuation_and_code_style_commands'} = {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -276,8 +262,7 @@ $result_trees{'punctuation_and_code_style_commands'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
diff --git 
a/tp/t/results/plaintext_tests/punctuation_and_code_style_commands_utf8.pl 
b/tp/t/results/plaintext_tests/punctuation_and_code_style_commands_utf8.pl
index 1eb247443e..97d2428b9f 100644
--- a/tp/t/results/plaintext_tests/punctuation_and_code_style_commands_utf8.pl
+++ b/tp/t/results/plaintext_tests/punctuation_and_code_style_commands_utf8.pl
@@ -38,8 +38,7 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -58,8 +57,7 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = {
               'cmdname' => 'command',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -83,8 +81,7 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -94,8 +91,7 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -114,8 +110,7 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = 
{
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -125,8 +120,7 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = 
{
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -147,8 +141,7 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = 
{
               'cmdname' => 'command',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -172,8 +165,7 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = 
{
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -183,8 +175,7 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = 
{
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -203,8 +194,7 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = 
{
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -214,8 +204,7 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = 
{
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -236,8 +225,7 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = 
{
               'cmdname' => 'command',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -264,8 +252,7 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = 
{
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     }
                   ],
@@ -275,8 +262,7 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = 
{
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -298,8 +284,7 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = 
{
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     }
                   ],
@@ -309,8 +294,7 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = 
{
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
diff --git a/tp/t/results/plaintext_tests/punctuation_and_footnotes.pl 
b/tp/t/results/plaintext_tests/punctuation_and_footnotes.pl
index f444efbc1f..3a136a1b15 100644
--- a/tp/t/results/plaintext_tests/punctuation_and_footnotes.pl
+++ b/tp/t/results/plaintext_tests/punctuation_and_footnotes.pl
@@ -38,8 +38,7 @@ $result_trees{'punctuation_and_footnotes'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -68,8 +67,7 @@ $result_trees{'punctuation_and_footnotes'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -94,8 +92,7 @@ $result_trees{'punctuation_and_footnotes'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -134,8 +131,7 @@ $result_trees{'punctuation_and_footnotes'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -160,8 +156,7 @@ $result_trees{'punctuation_and_footnotes'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -190,8 +185,7 @@ $result_trees{'punctuation_and_footnotes'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -233,8 +227,7 @@ $result_trees{'punctuation_and_footnotes'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -266,8 +259,7 @@ $result_trees{'punctuation_and_footnotes'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -299,8 +291,7 @@ $result_trees{'punctuation_and_footnotes'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -342,8 +333,7 @@ $result_trees{'punctuation_and_footnotes'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -375,8 +365,7 @@ $result_trees{'punctuation_and_footnotes'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -408,8 +397,7 @@ $result_trees{'punctuation_and_footnotes'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
diff --git 
a/tp/t/results/plaintext_tests/punctuation_and_footnotes_frenchspacing.pl 
b/tp/t/results/plaintext_tests/punctuation_and_footnotes_frenchspacing.pl
index 136f4897de..fdf3ceb655 100644
--- a/tp/t/results/plaintext_tests/punctuation_and_footnotes_frenchspacing.pl
+++ b/tp/t/results/plaintext_tests/punctuation_and_footnotes_frenchspacing.pl
@@ -39,8 +39,7 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -72,8 +71,7 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -102,8 +100,7 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -128,8 +125,7 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -168,8 +164,7 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -194,8 +189,7 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -224,8 +218,7 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -267,8 +260,7 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -300,8 +292,7 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -333,8 +324,7 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -376,8 +366,7 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -409,8 +398,7 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -442,8 +430,7 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
diff --git 
a/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands.pl 
b/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands.pl
index d8d5091e24..41a094f190 100644
--- a/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands.pl
+++ b/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands.pl
@@ -30,8 +30,7 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -55,8 +54,7 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -66,8 +64,7 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -86,8 +83,7 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -97,8 +93,7 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -119,8 +114,7 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -144,8 +138,7 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -155,8 +148,7 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -175,8 +167,7 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -186,8 +177,7 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -208,8 +198,7 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -236,8 +225,7 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     }
                   ],
@@ -247,8 +235,7 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -270,8 +257,7 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     }
                   ],
@@ -281,8 +267,7 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -313,8 +298,7 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -338,8 +322,7 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     }
                   ],
@@ -349,8 +332,7 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -369,8 +351,7 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     }
                   ],
@@ -380,8 +361,7 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -402,8 +382,7 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -427,8 +406,7 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     }
                   ],
@@ -438,8 +416,7 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -458,8 +435,7 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     }
                   ],
@@ -469,8 +445,7 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -491,8 +466,7 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -519,8 +493,7 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     }
                   ],
@@ -530,8 +503,7 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -553,8 +525,7 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     }
                   ],
@@ -564,8 +535,7 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
diff --git 
a/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands_utf8.pl 
b/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands_utf8.pl
index c47d8c84ac..78624e7cd7 100644
--- a/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands_utf8.pl
+++ b/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands_utf8.pl
@@ -38,8 +38,7 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -58,8 +57,7 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = {
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -83,8 +81,7 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -94,8 +91,7 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = {
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -114,8 +110,7 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -125,8 +120,7 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -147,8 +141,7 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -172,8 +165,7 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -183,8 +175,7 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -203,8 +194,7 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -214,8 +204,7 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -236,8 +225,7 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -264,8 +252,7 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     }
                   ],
@@ -275,8 +262,7 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -298,8 +284,7 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     }
                   ],
@@ -309,8 +294,7 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
               'cmdname' => 'var',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -341,8 +325,7 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -366,8 +349,7 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     }
                   ],
@@ -377,8 +359,7 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -397,8 +378,7 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     }
                   ],
@@ -408,8 +388,7 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -430,8 +409,7 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -455,8 +433,7 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     }
                   ],
@@ -466,8 +443,7 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -486,8 +462,7 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     }
                   ],
@@ -497,8 +472,7 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -519,8 +493,7 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -547,8 +520,7 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     }
                   ],
@@ -558,8 +530,7 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -581,8 +552,7 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     }
                   ],
@@ -592,8 +562,7 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
diff --git a/tp/t/results/plaintext_tests/punctuation_at_end_command.pl 
b/tp/t/results/plaintext_tests/punctuation_at_end_command.pl
index 48dfd751ff..9cef215270 100644
--- a/tp/t/results/plaintext_tests/punctuation_at_end_command.pl
+++ b/tp/t/results/plaintext_tests/punctuation_at_end_command.pl
@@ -41,8 +41,7 @@ $result_trees{'punctuation_at_end_command'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -62,8 +61,7 @@ $result_trees{'punctuation_at_end_command'} = {
               'cmdname' => 'dmn',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -83,8 +81,7 @@ $result_trees{'punctuation_at_end_command'} = {
               'cmdname' => 'indicateurl',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -108,8 +105,7 @@ $result_trees{'punctuation_at_end_command'} = {
               'cmdname' => 'kbd',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -129,8 +125,7 @@ $result_trees{'punctuation_at_end_command'} = {
               'cmdname' => 'math',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -150,8 +145,7 @@ $result_trees{'punctuation_at_end_command'} = {
               'cmdname' => 'cite',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -171,8 +165,7 @@ $result_trees{'punctuation_at_end_command'} = {
               'cmdname' => 'emph',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -200,8 +193,7 @@ $result_trees{'punctuation_at_end_command'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     }
                   ],
@@ -211,8 +203,7 @@ $result_trees{'punctuation_at_end_command'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -232,8 +223,7 @@ $result_trees{'punctuation_at_end_command'} = {
               'cmdname' => 'emph',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
diff --git a/tp/t/results/plaintext_tests/punctuation_commands.pl 
b/tp/t/results/plaintext_tests/punctuation_commands.pl
index 16a6b85d52..fc72cb55b8 100644
--- a/tp/t/results/plaintext_tests/punctuation_commands.pl
+++ b/tp/t/results/plaintext_tests/punctuation_commands.pl
@@ -78,8 +78,7 @@ $result_trees{'punctuation_commands'} = {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -94,8 +93,7 @@ $result_trees{'punctuation_commands'} = {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -154,8 +152,7 @@ $result_trees{'punctuation_commands'} = {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -222,8 +219,7 @@ $result_trees{'punctuation_commands'} = {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
diff --git a/tp/t/results/plaintext_tests/punctuation_commands_frenchspacing.pl 
b/tp/t/results/plaintext_tests/punctuation_commands_frenchspacing.pl
index 3b1e9ad1e5..90d2b529dd 100644
--- a/tp/t/results/plaintext_tests/punctuation_commands_frenchspacing.pl
+++ b/tp/t/results/plaintext_tests/punctuation_commands_frenchspacing.pl
@@ -39,8 +39,7 @@ $result_trees{'punctuation_commands_frenchspacing'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -112,8 +111,7 @@ $result_trees{'punctuation_commands_frenchspacing'} = {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -128,8 +126,7 @@ $result_trees{'punctuation_commands_frenchspacing'} = {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -188,8 +185,7 @@ $result_trees{'punctuation_commands_frenchspacing'} = {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -256,8 +252,7 @@ $result_trees{'punctuation_commands_frenchspacing'} = {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
diff --git a/tp/t/results/plaintext_tests/punctuation_frenchspacing.pl 
b/tp/t/results/plaintext_tests/punctuation_frenchspacing.pl
index e3d2dfef34..b8a1baa61a 100644
--- a/tp/t/results/plaintext_tests/punctuation_frenchspacing.pl
+++ b/tp/t/results/plaintext_tests/punctuation_frenchspacing.pl
@@ -39,8 +39,7 @@ $result_trees{'punctuation_frenchspacing'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/plaintext_tests/punctuation_in_command.pl 
b/tp/t/results/plaintext_tests/punctuation_in_command.pl
index 43b3564971..1df5f11a18 100644
--- a/tp/t/results/plaintext_tests/punctuation_in_command.pl
+++ b/tp/t/results/plaintext_tests/punctuation_in_command.pl
@@ -41,8 +41,7 @@ $result_trees{'punctuation_in_command'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -62,8 +61,7 @@ $result_trees{'punctuation_in_command'} = {
               'cmdname' => 'dmn',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -83,8 +81,7 @@ $result_trees{'punctuation_in_command'} = {
               'cmdname' => 'indicateurl',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -104,8 +101,7 @@ $result_trees{'punctuation_in_command'} = {
               'cmdname' => 'kbd',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -125,8 +121,7 @@ $result_trees{'punctuation_in_command'} = {
               'cmdname' => 'math',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -146,8 +141,7 @@ $result_trees{'punctuation_in_command'} = {
               'cmdname' => 'cite',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -167,8 +161,7 @@ $result_trees{'punctuation_in_command'} = {
               'cmdname' => 'emph',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -196,8 +189,7 @@ $result_trees{'punctuation_in_command'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -207,8 +199,7 @@ $result_trees{'punctuation_in_command'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
diff --git a/tp/t/results/plaintext_tests/punctuation_in_command_end_line.pl 
b/tp/t/results/plaintext_tests/punctuation_in_command_end_line.pl
index 99602e9cc2..fcde4a2c80 100644
--- a/tp/t/results/plaintext_tests/punctuation_in_command_end_line.pl
+++ b/tp/t/results/plaintext_tests/punctuation_in_command_end_line.pl
@@ -36,8 +36,7 @@ $result_trees{'punctuation_in_command_end_line'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -61,8 +60,7 @@ $result_trees{'punctuation_in_command_end_line'} = {
               'cmdname' => 'dmn',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -86,8 +84,7 @@ $result_trees{'punctuation_in_command_end_line'} = {
               'cmdname' => 'indicateurl',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -111,8 +108,7 @@ $result_trees{'punctuation_in_command_end_line'} = {
               'cmdname' => 'kbd',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -136,8 +132,7 @@ $result_trees{'punctuation_in_command_end_line'} = {
               'cmdname' => 'math',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -161,8 +156,7 @@ $result_trees{'punctuation_in_command_end_line'} = {
               'cmdname' => 'cite',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -186,8 +180,7 @@ $result_trees{'punctuation_in_command_end_line'} = {
               'cmdname' => 'emph',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -215,8 +208,7 @@ $result_trees{'punctuation_in_command_end_line'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     }
                   ],
@@ -226,8 +218,7 @@ $result_trees{'punctuation_in_command_end_line'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -255,8 +246,7 @@ $result_trees{'punctuation_in_command_end_line'} = {
               'cmdname' => 'emph',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
diff --git a/tp/t/results/plaintext_tests/punctuation_in_sc.pl 
b/tp/t/results/plaintext_tests/punctuation_in_sc.pl
index f56cc060ee..3d9167ba7f 100644
--- a/tp/t/results/plaintext_tests/punctuation_in_sc.pl
+++ b/tp/t/results/plaintext_tests/punctuation_in_sc.pl
@@ -28,8 +28,7 @@ $result_trees{'punctuation_in_sc'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -49,8 +48,7 @@ $result_trees{'punctuation_in_sc'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
diff --git a/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph.pl 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph.pl
index 6aa374f15f..99e57d4724 100644
--- a/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph.pl
+++ b/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph.pl
@@ -59,8 +59,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_utf8.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -96,8 +95,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_utf8.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -129,8 +127,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_utf8.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -187,8 +184,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -208,8 +204,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -229,8 +224,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -250,8 +244,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -266,8 +259,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -282,8 +274,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -298,8 +289,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -325,8 +315,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -341,8 +330,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -357,8 +345,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -378,8 +365,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -399,8 +385,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -415,8 +400,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -431,8 +415,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -447,8 +430,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -464,8 +446,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -480,8 +461,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -496,8 +476,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -513,8 +492,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -529,8 +507,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -566,8 +543,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -588,8 +564,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -605,8 +580,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -621,8 +595,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -642,8 +615,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -663,8 +635,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -688,8 +659,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     }
                   ],
@@ -699,8 +669,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -720,8 +689,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -741,8 +709,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -766,8 +733,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     }
                   ],
@@ -777,8 +743,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -806,8 +771,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                               'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                                'line_nr' => 20,
-                                'macro' => ''
+                                'line_nr' => 20
                               }
                             }
                           ],
@@ -817,8 +781,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     }
                   ],
@@ -828,8 +791,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -845,8 +807,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -866,8 +827,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -882,8 +842,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -903,8 +862,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -924,8 +882,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -949,8 +906,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                                'line_nr' => 22,
-                                'macro' => ''
+                                'line_nr' => 22
                               }
                             }
                           ],
@@ -960,8 +916,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -981,8 +936,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -1002,8 +956,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                       'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -1027,8 +980,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                               'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                                'line_nr' => 22,
-                                'macro' => ''
+                                'line_nr' => 22
                               }
                             }
                           ],
@@ -1038,8 +990,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                       'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -1067,8 +1018,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                                       'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                                        'line_nr' => 22,
-                                        'macro' => ''
+                                        'line_nr' => 22
                                       }
                                     }
                                   ],
@@ -1078,8 +1028,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                               'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                                'line_nr' => 22,
-                                'macro' => ''
+                                'line_nr' => 22
                               }
                             }
                           ],
@@ -1089,8 +1038,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -1100,8 +1048,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -1127,8 +1074,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_utf8.texi',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     }
   ],
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph_latin1.pl 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph_latin1.pl
index 77df0aa3ac..dd0169effc 100644
--- a/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph_latin1.pl
+++ b/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph_latin1.pl
@@ -55,8 +55,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
               },
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -99,8 +98,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_latin1.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -136,8 +134,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_latin1.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -169,8 +166,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_latin1.texi',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -227,8 +223,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -248,8 +243,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -269,8 +263,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -290,8 +283,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -306,8 +298,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -322,8 +313,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -338,8 +328,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -365,8 +354,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -381,8 +369,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -397,8 +384,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -418,8 +404,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -439,8 +424,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -455,8 +439,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -471,8 +454,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -487,8 +469,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -504,8 +485,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -520,8 +500,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -536,8 +515,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -553,8 +531,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -569,8 +546,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -606,8 +582,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -628,8 +603,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -645,8 +619,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -661,8 +634,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -682,8 +654,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -703,8 +674,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -728,8 +698,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -739,8 +708,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -760,8 +728,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -781,8 +748,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -806,8 +772,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -817,8 +782,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -846,8 +810,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                               'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                'line_nr' => 22,
-                                'macro' => ''
+                                'line_nr' => 22
                               }
                             }
                           ],
@@ -857,8 +820,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -868,8 +830,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -885,8 +846,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -906,8 +866,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -922,8 +881,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -943,8 +901,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -964,8 +921,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -989,8 +945,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1000,8 +955,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1021,8 +975,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1042,8 +995,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                       'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1067,8 +1019,7 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
                               'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1078,8 +1029,7 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
                       'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1107,8 +1057,7 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
                                       'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                        'line_nr' => 24,
-                                        'macro' => ''
+                                        'line_nr' => 24
                                       }
                                     }
                                   ],
@@ -1118,8 +1067,7 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
                               'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1129,8 +1077,7 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     }
                   ],
@@ -1140,8 +1087,7 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -1167,8 +1113,7 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_latin1.texi',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     }
   ],
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph_usascii.pl 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph_usascii.pl
index 5dd2912ce3..1d6994160e 100644
--- a/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph_usascii.pl
+++ b/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph_usascii.pl
@@ -55,8 +55,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = 
{
               },
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -99,8 +98,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = 
{
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -136,8 +134,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -169,8 +166,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -227,8 +223,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -248,8 +243,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -269,8 +263,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -290,8 +283,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -311,8 +303,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -327,8 +318,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -343,8 +333,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -359,8 +348,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -386,8 +374,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -402,8 +389,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -418,8 +404,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -439,8 +424,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -460,8 +444,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -476,8 +459,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -492,8 +474,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -508,8 +489,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -525,8 +505,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -541,8 +520,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -557,8 +535,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -574,8 +551,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -590,8 +566,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -627,8 +602,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -649,8 +623,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -666,8 +639,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -682,8 +654,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -703,8 +674,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -724,8 +694,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -749,8 +718,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -760,8 +728,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -781,8 +748,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -802,8 +768,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -827,8 +792,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -838,8 +802,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -867,8 +830,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
                               'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                'line_nr' => 22,
-                                'macro' => ''
+                                'line_nr' => 22
                               }
                             }
                           ],
@@ -878,8 +840,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -889,8 +850,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -906,8 +866,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -927,8 +886,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -943,8 +901,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -964,8 +921,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -985,8 +941,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1010,8 +965,7 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1021,8 +975,7 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1042,8 +995,7 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1063,8 +1015,7 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
                       'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1088,8 +1039,7 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
                               'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1099,8 +1049,7 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
                       'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1128,8 +1077,7 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
                                       'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                        'line_nr' => 24,
-                                        'macro' => ''
+                                        'line_nr' => 24
                                       }
                                     }
                                   ],
@@ -1139,8 +1087,7 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
                               'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1150,8 +1097,7 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     }
                   ],
@@ -1161,8 +1107,7 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -1188,8 +1133,7 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     }
   ],
diff --git a/tp/t/results/plaintext_tests/punctuation_sc_accents_default.pl 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_default.pl
index 1351fc07c3..3d764dc12e 100644
--- a/tp/t/results/plaintext_tests/punctuation_sc_accents_default.pl
+++ b/tp/t/results/plaintext_tests/punctuation_sc_accents_default.pl
@@ -59,8 +59,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_utf8.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -96,8 +95,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_utf8.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -129,8 +127,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_utf8.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -187,8 +184,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -208,8 +204,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -229,8 +224,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -250,8 +244,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -266,8 +259,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -282,8 +274,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -298,8 +289,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -325,8 +315,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -341,8 +330,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -357,8 +345,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -378,8 +365,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -399,8 +385,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -415,8 +400,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -431,8 +415,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -447,8 +430,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -464,8 +446,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -480,8 +461,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -496,8 +476,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -513,8 +492,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -529,8 +507,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -566,8 +543,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -588,8 +564,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -605,8 +580,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -621,8 +595,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -642,8 +615,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -663,8 +635,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -688,8 +659,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     }
                   ],
@@ -699,8 +669,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -720,8 +689,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -741,8 +709,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -766,8 +733,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     }
                   ],
@@ -777,8 +743,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -806,8 +771,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
                               'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                                'line_nr' => 20,
-                                'macro' => ''
+                                'line_nr' => 20
                               }
                             }
                           ],
@@ -817,8 +781,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     }
                   ],
@@ -828,8 +791,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -845,8 +807,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -866,8 +827,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -882,8 +842,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -903,8 +862,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -924,8 +882,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -949,8 +906,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                                'line_nr' => 22,
-                                'macro' => ''
+                                'line_nr' => 22
                               }
                             }
                           ],
@@ -960,8 +916,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -981,8 +936,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -1002,8 +956,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
                       'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -1027,8 +980,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
                               'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                                'line_nr' => 22,
-                                'macro' => ''
+                                'line_nr' => 22
                               }
                             }
                           ],
@@ -1038,8 +990,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
                       'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -1067,8 +1018,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
                                       'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                                        'line_nr' => 22,
-                                        'macro' => ''
+                                        'line_nr' => 22
                                       }
                                     }
                                   ],
@@ -1078,8 +1028,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
                               'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                                'line_nr' => 22,
-                                'macro' => ''
+                                'line_nr' => 22
                               }
                             }
                           ],
@@ -1089,8 +1038,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -1100,8 +1048,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -1127,8 +1074,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_utf8.texi',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     }
   ],
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_default_latin1.pl 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_default_latin1.pl
index 2a2cda6c69..eb17ad6bfa 100644
--- a/tp/t/results/plaintext_tests/punctuation_sc_accents_default_latin1.pl
+++ b/tp/t/results/plaintext_tests/punctuation_sc_accents_default_latin1.pl
@@ -55,8 +55,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               },
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -99,8 +98,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_latin1.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -136,8 +134,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_latin1.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -169,8 +166,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_latin1.texi',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -227,8 +223,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -248,8 +243,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -269,8 +263,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -290,8 +283,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -306,8 +298,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -322,8 +313,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -338,8 +328,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -365,8 +354,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -381,8 +369,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -397,8 +384,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -418,8 +404,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -439,8 +424,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -455,8 +439,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -471,8 +454,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -487,8 +469,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -504,8 +485,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -520,8 +500,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -536,8 +515,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -553,8 +531,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -569,8 +546,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -606,8 +582,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -628,8 +603,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -645,8 +619,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -661,8 +634,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -682,8 +654,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -703,8 +674,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -728,8 +698,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -739,8 +708,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -760,8 +728,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -781,8 +748,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -806,8 +772,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -817,8 +782,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -846,8 +810,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                               'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                'line_nr' => 22,
-                                'macro' => ''
+                                'line_nr' => 22
                               }
                             }
                           ],
@@ -857,8 +820,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -868,8 +830,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -885,8 +846,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -906,8 +866,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -922,8 +881,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -943,8 +901,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -964,8 +921,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -989,8 +945,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1000,8 +955,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1021,8 +975,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1042,8 +995,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                       'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1067,8 +1019,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                               'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1078,8 +1029,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                       'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1107,8 +1057,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                                       'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                        'line_nr' => 24,
-                                        'macro' => ''
+                                        'line_nr' => 24
                                       }
                                     }
                                   ],
@@ -1118,8 +1067,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                               'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1129,8 +1077,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     }
                   ],
@@ -1140,8 +1087,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -1167,8 +1113,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_latin1.texi',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     }
   ],
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_default_usascii.pl 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_default_usascii.pl
index 2ffede97e3..7ac6317c42 100644
--- a/tp/t/results/plaintext_tests/punctuation_sc_accents_default_usascii.pl
+++ b/tp/t/results/plaintext_tests/punctuation_sc_accents_default_usascii.pl
@@ -55,8 +55,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               },
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -99,8 +98,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -136,8 +134,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -169,8 +166,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -227,8 +223,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -248,8 +243,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -269,8 +263,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -290,8 +283,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -311,8 +303,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -327,8 +318,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -343,8 +333,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -359,8 +348,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -386,8 +374,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -402,8 +389,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -418,8 +404,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -439,8 +424,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -460,8 +444,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -476,8 +459,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -492,8 +474,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -508,8 +489,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -525,8 +505,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -541,8 +520,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -557,8 +535,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -574,8 +551,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -590,8 +566,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -627,8 +602,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -649,8 +623,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -666,8 +639,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -682,8 +654,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -703,8 +674,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -724,8 +694,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -749,8 +718,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -760,8 +728,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -781,8 +748,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -802,8 +768,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -827,8 +792,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -838,8 +802,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -867,8 +830,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                               'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                'line_nr' => 22,
-                                'macro' => ''
+                                'line_nr' => 22
                               }
                             }
                           ],
@@ -878,8 +840,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -889,8 +850,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -906,8 +866,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -927,8 +886,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -943,8 +901,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -964,8 +921,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -985,8 +941,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1010,8 +965,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1021,8 +975,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1042,8 +995,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1063,8 +1015,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
                       'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1088,8 +1039,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
                               'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1099,8 +1049,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
                       'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1128,8 +1077,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
                                       'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                        'line_nr' => 24,
-                                        'macro' => ''
+                                        'line_nr' => 24
                                       }
                                     }
                                   ],
@@ -1139,8 +1087,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
                               'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1150,8 +1097,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     }
                   ],
@@ -1161,8 +1107,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -1188,8 +1133,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     }
   ],
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding.pl 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding.pl
index 107e6475a6..dfe5563c5d 100644
--- a/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding.pl
+++ b/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding.pl
@@ -59,8 +59,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_utf8.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -96,8 +95,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_utf8.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -129,8 +127,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_utf8.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -187,8 +184,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -208,8 +204,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -229,8 +224,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -250,8 +244,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -266,8 +259,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -282,8 +274,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -298,8 +289,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -325,8 +315,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -341,8 +330,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -357,8 +345,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -378,8 +365,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -399,8 +385,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -415,8 +400,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -431,8 +415,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -447,8 +430,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -464,8 +446,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -480,8 +461,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -496,8 +476,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -513,8 +492,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -529,8 +507,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -566,8 +543,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -588,8 +564,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -605,8 +580,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -621,8 +595,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -642,8 +615,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -663,8 +635,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -688,8 +659,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     }
                   ],
@@ -699,8 +669,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -720,8 +689,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -741,8 +709,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -766,8 +733,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     }
                   ],
@@ -777,8 +743,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -806,8 +771,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                               'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                                'line_nr' => 20,
-                                'macro' => ''
+                                'line_nr' => 20
                               }
                             }
                           ],
@@ -817,8 +781,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     }
                   ],
@@ -828,8 +791,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -845,8 +807,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -866,8 +827,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -882,8 +842,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -903,8 +862,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -924,8 +882,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -949,8 +906,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                                'line_nr' => 22,
-                                'macro' => ''
+                                'line_nr' => 22
                               }
                             }
                           ],
@@ -960,8 +916,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -981,8 +936,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -1002,8 +956,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = 
{
                       'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -1027,8 +980,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = 
{
                               'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                                'line_nr' => 22,
-                                'macro' => ''
+                                'line_nr' => 22
                               }
                             }
                           ],
@@ -1038,8 +990,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = 
{
                       'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     },
                     {
@@ -1067,8 +1018,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} 
= {
                                       'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                                        'line_nr' => 22,
-                                        'macro' => ''
+                                        'line_nr' => 22
                                       }
                                     }
                                   ],
@@ -1078,8 +1028,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} 
= {
                               'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                                'line_nr' => 22,
-                                'macro' => ''
+                                'line_nr' => 22
                               }
                             }
                           ],
@@ -1089,8 +1038,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} 
= {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -1100,8 +1048,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} 
= {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -1127,8 +1074,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} 
= {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_utf8.texi',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     }
   ],
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding_latin1.pl
 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding_latin1.pl
index 6e945cd916..0e7367a574 100644
--- 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding_latin1.pl
+++ 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding_latin1.pl
@@ -55,8 +55,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               },
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -99,8 +98,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_latin1.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -136,8 +134,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_latin1.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -169,8 +166,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_latin1.texi',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -227,8 +223,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -248,8 +243,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -269,8 +263,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -290,8 +283,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -306,8 +298,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -322,8 +313,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -338,8 +328,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -365,8 +354,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -381,8 +369,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -397,8 +384,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -418,8 +404,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -439,8 +424,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -455,8 +439,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -471,8 +454,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -487,8 +469,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -504,8 +485,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -520,8 +500,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -536,8 +515,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -553,8 +531,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -569,8 +546,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -606,8 +582,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -628,8 +603,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -645,8 +619,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -661,8 +634,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -682,8 +654,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -703,8 +674,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -728,8 +698,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -739,8 +708,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -760,8 +728,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -781,8 +748,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -806,8 +772,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -817,8 +782,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -846,8 +810,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                               'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                'line_nr' => 22,
-                                'macro' => ''
+                                'line_nr' => 22
                               }
                             }
                           ],
@@ -857,8 +820,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -868,8 +830,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -885,8 +846,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -906,8 +866,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -922,8 +881,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -943,8 +901,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -964,8 +921,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -989,8 +945,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1000,8 +955,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1021,8 +975,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1042,8 +995,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                       'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1067,8 +1019,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                               'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1078,8 +1029,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                       'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1107,8 +1057,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                                       'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                        'line_nr' => 24,
-                                        'macro' => ''
+                                        'line_nr' => 24
                                       }
                                     }
                                   ],
@@ -1118,8 +1067,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                               'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1129,8 +1077,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     }
                   ],
@@ -1140,8 +1087,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -1167,8 +1113,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_latin1.texi',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     }
   ],
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding_usascii.pl
 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding_usascii.pl
index 6651f23599..9e96d96a2d 100644
--- 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding_usascii.pl
+++ 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding_usascii.pl
@@ -55,8 +55,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               },
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -99,8 +98,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -136,8 +134,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -169,8 +166,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -227,8 +223,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -248,8 +243,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -269,8 +263,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -290,8 +283,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -311,8 +303,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -327,8 +318,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -343,8 +333,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -359,8 +348,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -386,8 +374,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -402,8 +389,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -418,8 +404,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -439,8 +424,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -460,8 +444,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -476,8 +459,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -492,8 +474,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -508,8 +489,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -525,8 +505,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -541,8 +520,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -557,8 +535,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -574,8 +551,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -590,8 +566,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -627,8 +602,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -649,8 +623,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -666,8 +639,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -682,8 +654,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -703,8 +674,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -724,8 +694,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -749,8 +718,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -760,8 +728,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -781,8 +748,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -802,8 +768,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -827,8 +792,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -838,8 +802,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -867,8 +830,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                               'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                'line_nr' => 22,
-                                'macro' => ''
+                                'line_nr' => 22
                               }
                             }
                           ],
@@ -878,8 +840,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -889,8 +850,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -906,8 +866,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -927,8 +886,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -943,8 +901,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -964,8 +921,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -985,8 +941,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1010,8 +965,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1021,8 +975,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1042,8 +995,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1063,8 +1015,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                       'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1088,8 +1039,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                               'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1099,8 +1049,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                       'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1128,8 +1077,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                                       'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                        'line_nr' => 24,
-                                        'macro' => ''
+                                        'line_nr' => 24
                                       }
                                     }
                                   ],
@@ -1139,8 +1087,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                               'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1150,8 +1097,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     }
                   ],
@@ -1161,8 +1107,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -1188,8 +1133,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     }
   ],
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_ascii_glyph_latin1.pl
 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_ascii_glyph_latin1.pl
index ee1a628ec6..aab702a60f 100644
--- 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_ascii_glyph_latin1.pl
+++ 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_ascii_glyph_latin1.pl
@@ -55,8 +55,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               },
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -99,8 +98,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_latin1.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -136,8 +134,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_latin1.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -169,8 +166,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_latin1.texi',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -227,8 +223,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -248,8 +243,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -269,8 +263,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -290,8 +283,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -306,8 +298,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -322,8 +313,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -338,8 +328,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -365,8 +354,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -381,8 +369,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -397,8 +384,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -418,8 +404,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -439,8 +424,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -455,8 +439,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -471,8 +454,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -487,8 +469,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -504,8 +485,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -520,8 +500,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -536,8 +515,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -553,8 +531,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -569,8 +546,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -606,8 +582,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -628,8 +603,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -645,8 +619,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -661,8 +634,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -682,8 +654,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -703,8 +674,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -728,8 +698,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -739,8 +708,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -760,8 +728,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -781,8 +748,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -806,8 +772,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -817,8 +782,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -846,8 +810,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                               'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                'line_nr' => 22,
-                                'macro' => ''
+                                'line_nr' => 22
                               }
                             }
                           ],
@@ -857,8 +820,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -868,8 +830,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -885,8 +846,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -906,8 +866,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -922,8 +881,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -943,8 +901,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -964,8 +921,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -989,8 +945,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1000,8 +955,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1021,8 +975,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1042,8 +995,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                       'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1067,8 +1019,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                               'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1078,8 +1029,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                       'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1107,8 +1057,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                                       'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                        'line_nr' => 24,
-                                        'macro' => ''
+                                        'line_nr' => 24
                                       }
                                     }
                                   ],
@@ -1118,8 +1067,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                               'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1129,8 +1077,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     }
                   ],
@@ -1140,8 +1087,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -1167,8 +1113,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_latin1.texi',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     }
   ],
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_ascii_glyph_usascii.pl
 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_ascii_glyph_usascii.pl
index dfb21b71ec..a0aaf94e2c 100644
--- 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_ascii_glyph_usascii.pl
+++ 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_ascii_glyph_usascii.pl
@@ -55,8 +55,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               },
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -99,8 +98,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -136,8 +134,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -169,8 +166,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -227,8 +223,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -248,8 +243,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -269,8 +263,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -290,8 +283,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -311,8 +303,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -327,8 +318,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -343,8 +333,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -359,8 +348,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -386,8 +374,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -402,8 +389,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -418,8 +404,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -439,8 +424,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -460,8 +444,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -476,8 +459,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -492,8 +474,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -508,8 +489,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -525,8 +505,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -541,8 +520,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -557,8 +535,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -574,8 +551,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -590,8 +566,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -627,8 +602,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -649,8 +623,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -666,8 +639,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -682,8 +654,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -703,8 +674,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -724,8 +694,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -749,8 +718,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -760,8 +728,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -781,8 +748,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -802,8 +768,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -827,8 +792,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -838,8 +802,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -867,8 +830,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                               'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                'line_nr' => 22,
-                                'macro' => ''
+                                'line_nr' => 22
                               }
                             }
                           ],
@@ -878,8 +840,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -889,8 +850,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -906,8 +866,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -927,8 +886,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -943,8 +901,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -964,8 +921,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -985,8 +941,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1010,8 +965,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1021,8 +975,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1042,8 +995,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1063,8 +1015,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                       'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1088,8 +1039,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                               'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1099,8 +1049,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                       'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1128,8 +1077,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                                       'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                        'line_nr' => 24,
-                                        'macro' => ''
+                                        'line_nr' => 24
                                       }
                                     }
                                   ],
@@ -1139,8 +1087,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                               'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1150,8 +1097,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     }
                   ],
@@ -1161,8 +1107,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -1188,8 +1133,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     }
   ],
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_latin1.pl 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_latin1.pl
index 0eba5b94bd..51ab8f98e5 100644
--- a/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_latin1.pl
+++ b/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_latin1.pl
@@ -55,8 +55,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               },
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -99,8 +98,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_latin1.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -136,8 +134,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_latin1.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -169,8 +166,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_latin1.texi',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -227,8 +223,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -248,8 +243,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -269,8 +263,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -290,8 +283,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -306,8 +298,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -322,8 +313,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -338,8 +328,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -365,8 +354,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -381,8 +369,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -397,8 +384,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -418,8 +404,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -439,8 +424,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -455,8 +439,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -471,8 +454,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -487,8 +469,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -504,8 +485,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -520,8 +500,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -536,8 +515,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -553,8 +531,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -569,8 +546,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -606,8 +582,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -628,8 +603,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -645,8 +619,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -661,8 +634,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -682,8 +654,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -703,8 +674,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -728,8 +698,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -739,8 +708,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -760,8 +728,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -781,8 +748,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -806,8 +772,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -817,8 +782,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -846,8 +810,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                               'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                'line_nr' => 22,
-                                'macro' => ''
+                                'line_nr' => 22
                               }
                             }
                           ],
@@ -857,8 +820,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -868,8 +830,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -885,8 +846,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -906,8 +866,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -922,8 +881,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -943,8 +901,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -964,8 +921,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -989,8 +945,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1000,8 +955,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1021,8 +975,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1042,8 +995,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                       'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1067,8 +1019,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                               'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1078,8 +1029,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                       'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1107,8 +1057,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                                       'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                        'line_nr' => 24,
-                                        'macro' => ''
+                                        'line_nr' => 24
                                       }
                                     }
                                   ],
@@ -1118,8 +1067,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                               'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1129,8 +1077,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     }
                   ],
@@ -1140,8 +1087,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -1167,8 +1113,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_latin1.texi',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     }
   ],
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_usascii.pl 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_usascii.pl
index 71d22bb2c9..26a639f0fe 100644
--- a/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_usascii.pl
+++ b/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_usascii.pl
@@ -55,8 +55,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               },
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -99,8 +98,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -136,8 +134,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -169,8 +166,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -227,8 +223,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -248,8 +243,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -269,8 +263,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -290,8 +283,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -311,8 +303,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -327,8 +318,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -343,8 +333,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -359,8 +348,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -386,8 +374,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -402,8 +389,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -418,8 +404,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -439,8 +424,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -460,8 +444,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -476,8 +459,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -492,8 +474,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -508,8 +489,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -525,8 +505,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -541,8 +520,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -557,8 +535,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -574,8 +551,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -590,8 +566,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -627,8 +602,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -649,8 +623,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -666,8 +639,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -682,8 +654,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -703,8 +674,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -724,8 +694,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -749,8 +718,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -760,8 +728,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -781,8 +748,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -802,8 +768,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -827,8 +792,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -838,8 +802,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -867,8 +830,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                               'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                'line_nr' => 22,
-                                'macro' => ''
+                                'line_nr' => 22
                               }
                             }
                           ],
@@ -878,8 +840,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                       'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -889,8 +850,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -906,8 +866,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -927,8 +886,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                       'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -943,8 +901,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                       'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -964,8 +921,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -985,8 +941,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1010,8 +965,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                               'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1021,8 +975,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1042,8 +995,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1063,8 +1015,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
                       'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1088,8 +1039,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
                               'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1099,8 +1049,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
                       'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     },
                     {
@@ -1128,8 +1077,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
                                       'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                        'line_nr' => 24,
-                                        'macro' => ''
+                                        'line_nr' => 24
                                       }
                                     }
                                   ],
@@ -1139,8 +1087,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
                               'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                                'line_nr' => 24,
-                                'macro' => ''
+                                'line_nr' => 24
                               }
                             }
                           ],
@@ -1150,8 +1097,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     }
                   ],
@@ -1161,8 +1107,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             },
             {
@@ -1188,8 +1133,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
       },
       'source_info' => {
         'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     }
   ],
diff --git a/tp/t/results/plaintext_tests/quote_node_names.pl 
b/tp/t/results/plaintext_tests/quote_node_names.pl
index 7bccef41bc..619092cc28 100644
--- a/tp/t/results/plaintext_tests/quote_node_names.pl
+++ b/tp/t/results/plaintext_tests/quote_node_names.pl
@@ -44,8 +44,7 @@ $result_trees{'quote_node_names'} = {
       },
       'source_info' => {
         'file_name' => 'nodequote.texi',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -104,8 +103,7 @@ $result_trees{'quote_node_names'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -147,8 +145,7 @@ $result_trees{'quote_node_names'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -200,8 +197,7 @@ $result_trees{'quote_node_names'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -243,8 +239,7 @@ $result_trees{'quote_node_names'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -296,8 +291,7 @@ $result_trees{'quote_node_names'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -339,8 +333,7 @@ $result_trees{'quote_node_names'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -379,8 +372,7 @@ $result_trees{'quote_node_names'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -415,8 +407,7 @@ $result_trees{'quote_node_names'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => 'nodequote.texi',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     }
                   ],
@@ -434,8 +425,7 @@ $result_trees{'quote_node_names'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             },
             {
@@ -477,8 +467,7 @@ $result_trees{'quote_node_names'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -538,8 +527,7 @@ $result_trees{'quote_node_names'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -599,8 +587,7 @@ $result_trees{'quote_node_names'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -675,8 +662,7 @@ $result_trees{'quote_node_names'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             },
             {
@@ -751,8 +737,7 @@ $result_trees{'quote_node_names'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               }
             },
             {
@@ -832,8 +817,7 @@ $result_trees{'quote_node_names'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             },
             {
@@ -913,8 +897,7 @@ $result_trees{'quote_node_names'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             },
             {
@@ -994,8 +977,7 @@ $result_trees{'quote_node_names'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               }
             },
             {
@@ -1049,8 +1031,7 @@ $result_trees{'quote_node_names'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => 'nodequote.texi',
-                        'line_nr' => 34,
-                        'macro' => ''
+                        'line_nr' => 34
                       }
                     },
                     {
@@ -1090,8 +1071,7 @@ $result_trees{'quote_node_names'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               },
               'type' => 'menu_entry'
             },
@@ -1132,8 +1112,7 @@ $result_trees{'quote_node_names'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => 'nodequote.texi',
-                        'line_nr' => 35,
-                        'macro' => ''
+                        'line_nr' => 35
                       }
                     },
                     {
@@ -1173,8 +1152,7 @@ $result_trees{'quote_node_names'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               },
               'type' => 'menu_entry'
             },
@@ -1221,8 +1199,7 @@ $result_trees{'quote_node_names'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               },
               'type' => 'menu_entry'
             },
@@ -1251,8 +1228,7 @@ $result_trees{'quote_node_names'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => 'nodequote.texi',
-                        'line_nr' => 37,
-                        'macro' => ''
+                        'line_nr' => 37
                       }
                     },
                     {
@@ -1281,8 +1257,7 @@ $result_trees{'quote_node_names'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => 'nodequote.texi',
-                        'line_nr' => 37,
-                        'macro' => ''
+                        'line_nr' => 37
                       }
                     }
                   ],
@@ -1317,8 +1292,7 @@ $result_trees{'quote_node_names'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 37,
-                'macro' => ''
+                'line_nr' => 37
               },
               'type' => 'menu_entry'
             },
@@ -1368,8 +1342,7 @@ $result_trees{'quote_node_names'} = {
               ],
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               },
               'type' => 'menu_entry'
             },
@@ -1416,15 +1389,13 @@ $result_trees{'quote_node_names'} = {
               },
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodequote.texi',
-            'line_nr' => 33,
-            'macro' => ''
+            'line_nr' => 33
           }
         },
         {
@@ -1436,8 +1407,7 @@ $result_trees{'quote_node_names'} = {
       'extra' => {},
       'source_info' => {
         'file_name' => 'nodequote.texi',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -1469,8 +1439,7 @@ $result_trees{'quote_node_names'} = {
       },
       'source_info' => {
         'file_name' => 'nodequote.texi',
-        'line_nr' => 42,
-        'macro' => ''
+        'line_nr' => 42
       }
     },
     {
@@ -1522,8 +1491,7 @@ $result_trees{'quote_node_names'} = {
       },
       'source_info' => {
         'file_name' => 'nodequote.texi',
-        'line_nr' => 43,
-        'macro' => ''
+        'line_nr' => 43
       }
     },
     {
@@ -1555,8 +1523,7 @@ $result_trees{'quote_node_names'} = {
       },
       'source_info' => {
         'file_name' => 'nodequote.texi',
-        'line_nr' => 47,
-        'macro' => ''
+        'line_nr' => 47
       }
     },
     {
@@ -1594,8 +1561,7 @@ $result_trees{'quote_node_names'} = {
       },
       'source_info' => {
         'file_name' => 'nodequote.texi',
-        'line_nr' => 48,
-        'macro' => ''
+        'line_nr' => 48
       }
     },
     {
@@ -1625,8 +1591,7 @@ $result_trees{'quote_node_names'} = {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             },
             {
@@ -1684,8 +1649,7 @@ $result_trees{'quote_node_names'} = {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             },
             {
@@ -1766,8 +1730,7 @@ $result_trees{'quote_node_names'} = {
       },
       'source_info' => {
         'file_name' => 'nodequote.texi',
-        'line_nr' => 50,
-        'macro' => ''
+        'line_nr' => 50
       }
     },
     {
@@ -1805,8 +1768,7 @@ $result_trees{'quote_node_names'} = {
       },
       'source_info' => {
         'file_name' => 'nodequote.texi',
-        'line_nr' => 51,
-        'macro' => ''
+        'line_nr' => 51
       }
     },
     {
@@ -1827,8 +1789,7 @@ $result_trees{'quote_node_names'} = {
               'cmdname' => 'asis',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 53,
-                'macro' => ''
+                'line_nr' => 53
               }
             }
           ],
@@ -1853,8 +1814,7 @@ $result_trees{'quote_node_names'} = {
       },
       'source_info' => {
         'file_name' => 'nodequote.texi',
-        'line_nr' => 53,
-        'macro' => ''
+        'line_nr' => 53
       }
     },
     {
@@ -1875,8 +1835,7 @@ $result_trees{'quote_node_names'} = {
               'cmdname' => 'asis',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
-                'line_nr' => 54,
-                'macro' => ''
+                'line_nr' => 54
               }
             }
           ],
@@ -1907,8 +1866,7 @@ $result_trees{'quote_node_names'} = {
       },
       'source_info' => {
         'file_name' => 'nodequote.texi',
-        'line_nr' => 54,
-        'macro' => ''
+        'line_nr' => 54
       }
     },
     {
@@ -1956,8 +1914,7 @@ $result_trees{'quote_node_names'} = {
       },
       'source_info' => {
         'file_name' => 'nodequote.texi',
-        'line_nr' => 56,
-        'macro' => ''
+        'line_nr' => 56
       }
     }
   ],
@@ -2425,7 +2382,6 @@ $result_errors{'quote_node_names'} = [
 ',
     'file_name' => 'nodequote.texi',
     'line_nr' => 34,
-    'macro' => '',
     'text' => '@menu entry node name `blah@asis{:}blah\' different from node 
name `blah:blah\'',
     'type' => 'warning'
   },
@@ -2434,7 +2390,6 @@ $result_errors{'quote_node_names'} = [
 ',
     'file_name' => 'nodequote.texi',
     'line_nr' => 35,
-    'macro' => '',
     'text' => '@menu entry node name `blumpty@asis{.}fump\' different from 
node name `blumpty.fump\'',
     'type' => 'warning'
   },
@@ -2444,7 +2399,6 @@ $result_errors{'quote_node_names'} = [
 ',
     'file_name' => 'nodequote.texi',
     'line_nr' => 38,
-    'macro' => '',
     'text' => '@menu reference to nonexistent node `u.al)ext::
 \'',
     'type' => 'error'
@@ -2454,7 +2408,6 @@ $result_errors{'quote_node_names'} = [
 ',
     'file_name' => 'nodequote.texi',
     'line_nr' => 56,
-    'macro' => '',
     'text' => 'node `top secret node\' unreferenced',
     'type' => 'warning'
   }
@@ -2470,7 +2423,6 @@ 
$result_converted_errors{'file_plaintext'}->{'quote_node_names'} = [
 ',
     'file_name' => 'nodequote.texi',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '`.\' or `,\' must follow @xref',
     'type' => 'warning'
   },
@@ -2479,7 +2431,6 @@ 
$result_converted_errors{'file_plaintext'}->{'quote_node_names'} = [
 ',
     'file_name' => 'nodequote.texi',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '`.\' or `,\' must follow @xref',
     'type' => 'warning'
   },
@@ -2488,7 +2439,6 @@ 
$result_converted_errors{'file_plaintext'}->{'quote_node_names'} = [
 ',
     'file_name' => 'nodequote.texi',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '`.\' or `,\' must follow @xref',
     'type' => 'warning'
   },
@@ -2497,7 +2447,6 @@ 
$result_converted_errors{'file_plaintext'}->{'quote_node_names'} = [
 ',
     'file_name' => 'nodequote.texi',
     'line_nr' => 8,
-    'macro' => '',
     'text' => '`.\' or `,\' must follow @xref',
     'type' => 'warning'
   },
@@ -2506,7 +2455,6 @@ 
$result_converted_errors{'file_plaintext'}->{'quote_node_names'} = [
 ',
     'file_name' => 'nodequote.texi',
     'line_nr' => 10,
-    'macro' => '',
     'text' => '`.\' or `,\' must follow @xref',
     'type' => 'warning'
   }
diff --git a/tp/t/results/plaintext_tests/sc_with_utf8_enable_encoding.pl 
b/tp/t/results/plaintext_tests/sc_with_utf8_enable_encoding.pl
index f6c07e22c2..0a1d79689d 100644
--- a/tp/t/results/plaintext_tests/sc_with_utf8_enable_encoding.pl
+++ b/tp/t/results/plaintext_tests/sc_with_utf8_enable_encoding.pl
@@ -38,8 +38,7 @@ $result_trees{'sc_with_utf8_enable_encoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -58,8 +57,7 @@ $result_trees{'sc_with_utf8_enable_encoding'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
diff --git a/tp/t/results/plaintext_tests/settitle_and_empty_top.pl 
b/tp/t/results/plaintext_tests/settitle_and_empty_top.pl
index 3c0e6f1bb3..8a143f2759 100644
--- a/tp/t/results/plaintext_tests/settitle_and_empty_top.pl
+++ b/tp/t/results/plaintext_tests/settitle_and_empty_top.pl
@@ -34,8 +34,7 @@ $result_trees{'settitle_and_empty_top'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -69,8 +68,7 @@ $result_trees{'settitle_and_empty_top'} = {
       'extra' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     }
   ],
diff --git a/tp/t/results/plaintext_tests/sp_with_text_before_in_example.pl 
b/tp/t/results/plaintext_tests/sp_with_text_before_in_example.pl
index a04a89004e..c1554f6918 100644
--- a/tp/t/results/plaintext_tests/sp_with_text_before_in_example.pl
+++ b/tp/t/results/plaintext_tests/sp_with_text_before_in_example.pl
@@ -63,8 +63,7 @@ $result_trees{'sp_with_text_before_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 },
                 {
@@ -102,15 +101,13 @@ $result_trees{'sp_with_text_before_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
@@ -142,7 +139,6 @@ $result_errors{'sp_with_text_before_in_example'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@sp should only appear at the beginning of a line',
     'type' => 'warning'
   }
diff --git 
a/tp/t/results/plaintext_tests/split_punctuation_detection_in_commands.pl 
b/tp/t/results/plaintext_tests/split_punctuation_detection_in_commands.pl
index 7062a49c90..c13470ece8 100644
--- a/tp/t/results/plaintext_tests/split_punctuation_detection_in_commands.pl
+++ b/tp/t/results/plaintext_tests/split_punctuation_detection_in_commands.pl
@@ -28,8 +28,7 @@ $result_trees{'split_punctuation_detection_in_commands'} = {
               'cmdname' => 'asis',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -46,8 +45,7 @@ $result_trees{'split_punctuation_detection_in_commands'} = {
               'cmdname' => 'asis',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -64,8 +62,7 @@ $result_trees{'split_punctuation_detection_in_commands'} = {
               'cmdname' => 'asis',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -85,8 +82,7 @@ $result_trees{'split_punctuation_detection_in_commands'} = {
               'cmdname' => 'strong',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -103,8 +99,7 @@ $result_trees{'split_punctuation_detection_in_commands'} = {
               'cmdname' => 'emph',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
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 f6d7f6edb4..db18d284d0 100644
--- a/tp/t/results/plaintext_tests/star_at_command_formatting.pl
+++ b/tp/t/results/plaintext_tests/star_at_command_formatting.pl
@@ -106,8 +106,7 @@ $result_trees{'star_at_command_formatting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
@@ -117,8 +116,7 @@ $result_trees{'star_at_command_formatting'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -666,15 +664,13 @@ $result_trees{'star_at_command_formatting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           }
         },
         {
@@ -975,15 +971,13 @@ $result_trees{'star_at_command_formatting'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           }
         },
         {
diff --git a/tp/t/results/plaintext_tests/tab_in_table_in_example.pl 
b/tp/t/results/plaintext_tests/tab_in_table_in_example.pl
index a956e966bb..3e7fa62520 100644
--- a/tp/t/results/plaintext_tests/tab_in_table_in_example.pl
+++ b/tp/t/results/plaintext_tests/tab_in_table_in_example.pl
@@ -31,8 +31,7 @@ $result_trees{'tab_in_table_in_example'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       },
                       'type' => 'command_as_argument'
                     }
@@ -95,8 +94,7 @@ $result_trees{'tab_in_table_in_example'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 4,
-                            'macro' => ''
+                            'line_nr' => 4
                           }
                         }
                       ],
@@ -160,8 +158,7 @@ $result_trees{'tab_in_table_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
@@ -175,8 +172,7 @@ $result_trees{'tab_in_table_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -207,15 +203,13 @@ $result_trees{'tab_in_table_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -249,7 +243,6 @@ $result_errors{'tab_in_table_in_example'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@tab not meaningful inside `@table\' block',
     'type' => 'error'
   },
@@ -258,7 +251,6 @@ $result_errors{'tab_in_table_in_example'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => '@tab not meaningful inside `@table\' block',
     'type' => 'error'
   }
diff --git a/tp/t/results/plaintext_tests/tab_item_in_example.pl 
b/tp/t/results/plaintext_tests/tab_item_in_example.pl
index 13d231f9f2..39fcfa9353 100644
--- a/tp/t/results/plaintext_tests/tab_item_in_example.pl
+++ b/tp/t/results/plaintext_tests/tab_item_in_example.pl
@@ -77,15 +77,13 @@ $result_trees{'tab_item_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -112,7 +110,6 @@ $result_errors{'tab_item_in_example'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'ignoring @tab outside of multitable',
     'type' => 'error'
   },
@@ -121,7 +118,6 @@ $result_errors{'tab_item_in_example'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@item outside of table or list',
     'type' => 'error'
   }
diff --git a/tp/t/results/plaintext_tests/transparent_text.pl 
b/tp/t/results/plaintext_tests/transparent_text.pl
index aec47954b7..c01d9ca318 100644
--- a/tp/t/results/plaintext_tests/transparent_text.pl
+++ b/tp/t/results/plaintext_tests/transparent_text.pl
@@ -33,8 +33,7 @@ $result_trees{'transparent_text'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -54,8 +53,7 @@ $result_trees{'transparent_text'} = {
               'cmdname' => 'emph',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
diff --git a/tp/t/results/plaintext_tests/xref_quote_long_item.pl 
b/tp/t/results/plaintext_tests/xref_quote_long_item.pl
index 284b938105..83f3b11739 100644
--- a/tp/t/results/plaintext_tests/xref_quote_long_item.pl
+++ b/tp/t/results/plaintext_tests/xref_quote_long_item.pl
@@ -17,8 +17,7 @@ $result_trees{'xref_quote_long_item'} = {
                   'cmdname' => 'asis',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'command_as_argument'
                 }
@@ -69,8 +68,7 @@ $result_trees{'xref_quote_long_item'} = {
                               'cmdname' => 'code',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 3,
-                                'macro' => ''
+                                'line_nr' => 3
                               }
                             }
                           ],
@@ -91,8 +89,7 @@ $result_trees{'xref_quote_long_item'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -118,8 +115,7 @@ $result_trees{'xref_quote_long_item'} = {
                                   'cmdname' => 'comma',
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 4,
-                                    'macro' => ''
+                                    'line_nr' => 4
                                   }
                                 },
                                 {
@@ -134,8 +130,7 @@ $result_trees{'xref_quote_long_item'} = {
                                   'cmdname' => 'comma',
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 4,
-                                    'macro' => ''
+                                    'line_nr' => 4
                                   }
                                 },
                                 {
@@ -189,8 +184,7 @@ $result_trees{'xref_quote_long_item'} = {
                           'cmdname' => 'xref',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 4,
-                            'macro' => ''
+                            'line_nr' => 4
                           }
                         },
                         {
@@ -239,8 +233,7 @@ $result_trees{'xref_quote_long_item'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -254,8 +247,7 @@ $result_trees{'xref_quote_long_item'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/preformatted/caption_in_example.pl 
b/tp/t/results/preformatted/caption_in_example.pl
index 69c7370f30..52b14c767a 100644
--- a/tp/t/results/preformatted/caption_in_example.pl
+++ b/tp/t/results/preformatted/caption_in_example.pl
@@ -83,8 +83,7 @@ $result_trees{'caption_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   }
                 },
                 {
@@ -137,15 +136,13 @@ $result_trees{'caption_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -176,8 +173,7 @@ $result_trees{'caption_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
@@ -192,8 +188,7 @@ $result_trees{'caption_in_example'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -233,7 +228,6 @@ $result_errors{'caption_in_example'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => '@caption should be right below `@float\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/preformatted/comment_example_and_blank_lines.pl 
b/tp/t/results/preformatted/comment_example_and_blank_lines.pl
index b6564e2a18..0c061fc668 100644
--- a/tp/t/results/preformatted/comment_example_and_blank_lines.pl
+++ b/tp/t/results/preformatted/comment_example_and_blank_lines.pl
@@ -83,15 +83,13 @@ $result_trees{'comment_example_and_blank_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -173,15 +171,13 @@ $result_trees{'comment_example_and_blank_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -249,15 +245,13 @@ $result_trees{'comment_example_and_blank_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           }
         },
         {
@@ -330,15 +324,13 @@ $result_trees{'comment_example_and_blank_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
diff --git a/tp/t/results/preformatted/comments_in_example.pl 
b/tp/t/results/preformatted/comments_in_example.pl
index 1a29222ea0..5615554b73 100644
--- a/tp/t/results/preformatted/comments_in_example.pl
+++ b/tp/t/results/preformatted/comments_in_example.pl
@@ -91,15 +91,13 @@ $result_trees{'comments_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -176,15 +174,13 @@ $result_trees{'comments_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -270,15 +266,13 @@ $result_trees{'comments_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         }
       ],
diff --git a/tp/t/results/preformatted/def_in_example.pl 
b/tp/t/results/preformatted/def_in_example.pl
index 84b6146e35..4c40104d2e 100644
--- a/tp/t/results/preformatted/def_in_example.pl
+++ b/tp/t/results/preformatted/def_in_example.pl
@@ -88,8 +88,7 @@ $result_trees{'def_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   },
                   'type' => 'def_line'
                 },
@@ -135,8 +134,7 @@ $result_trees{'def_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 }
               ],
@@ -147,8 +145,7 @@ $result_trees{'def_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -179,15 +176,13 @@ $result_trees{'def_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -216,7 +211,6 @@ $result_errors{'def_in_example'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'entry for index `fn\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/preformatted/empty_line.pl 
b/tp/t/results/preformatted/empty_line.pl
index bfa6195c26..1bbdd39bfb 100644
--- a/tp/t/results/preformatted/empty_line.pl
+++ b/tp/t/results/preformatted/empty_line.pl
@@ -69,15 +69,13 @@ $result_trees{'empty_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/preformatted/empty_line_style_command.pl 
b/tp/t/results/preformatted/empty_line_style_command.pl
index 77b4ea1932..4b38c288bf 100644
--- a/tp/t/results/preformatted/empty_line_style_command.pl
+++ b/tp/t/results/preformatted/empty_line_style_command.pl
@@ -51,8 +51,7 @@ $result_trees{'empty_line_style_command'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   }
                 },
                 {
@@ -90,15 +89,13 @@ $result_trees{'empty_line_style_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/preformatted/example_at_commands_arguments.pl 
b/tp/t/results/preformatted/example_at_commands_arguments.pl
index d071a5c7d0..631e4523cd 100644
--- a/tp/t/results/preformatted/example_at_commands_arguments.pl
+++ b/tp/t/results/preformatted/example_at_commands_arguments.pl
@@ -30,8 +30,7 @@ $result_trees{'example_at_commands_arguments'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -46,8 +45,7 @@ $result_trees{'example_at_commands_arguments'} = {
                   'cmdname' => 'TeX',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -62,8 +60,7 @@ $result_trees{'example_at_commands_arguments'} = {
                   'cmdname' => 'exclamdown',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -83,8 +80,7 @@ $result_trees{'example_at_commands_arguments'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -99,8 +95,7 @@ $result_trees{'example_at_commands_arguments'} = {
                   'cmdname' => 'enddots',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -118,8 +113,7 @@ $result_trees{'example_at_commands_arguments'} = {
                   'cmdname' => 'comma',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 }
               ],
@@ -193,8 +187,7 @@ $result_trees{'example_at_commands_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -205,8 +198,7 @@ $result_trees{'example_at_commands_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/preformatted/example_class.pl 
b/tp/t/results/preformatted/example_class.pl
index 3b68eaeb26..8caad7aa65 100644
--- a/tp/t/results/preformatted/example_class.pl
+++ b/tp/t/results/preformatted/example_class.pl
@@ -132,8 +132,7 @@ $result_trees{'example_class'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
@@ -144,8 +143,7 @@ $result_trees{'example_class'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/preformatted/example_empty_arguments.pl 
b/tp/t/results/preformatted/example_empty_arguments.pl
index 6c19fbf5cc..0298ba7363 100644
--- a/tp/t/results/preformatted/example_empty_arguments.pl
+++ b/tp/t/results/preformatted/example_empty_arguments.pl
@@ -78,8 +78,7 @@ $result_trees{'example_empty_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -90,8 +89,7 @@ $result_trees{'example_empty_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -178,8 +176,7 @@ $result_trees{'example_empty_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -190,8 +187,7 @@ $result_trees{'example_empty_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -273,8 +269,7 @@ $result_trees{'example_empty_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
@@ -285,8 +280,7 @@ $result_trees{'example_empty_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         }
       ],
diff --git a/tp/t/results/preformatted/example_invalid_at_commands_arguments.pl 
b/tp/t/results/preformatted/example_invalid_at_commands_arguments.pl
index e7cc3ec97b..19b3fc8e04 100644
--- a/tp/t/results/preformatted/example_invalid_at_commands_arguments.pl
+++ b/tp/t/results/preformatted/example_invalid_at_commands_arguments.pl
@@ -58,8 +58,7 @@ $result_trees{'example_invalid_at_commands_arguments'} = {
                   'cmdname' => 'ref',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -88,8 +87,7 @@ $result_trees{'example_invalid_at_commands_arguments'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 },
                 {
@@ -134,8 +132,7 @@ $result_trees{'example_invalid_at_commands_arguments'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 }
               ],
@@ -177,8 +174,7 @@ $result_trees{'example_invalid_at_commands_arguments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -189,8 +185,7 @@ $result_trees{'example_invalid_at_commands_arguments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -214,7 +209,6 @@ $result_errors{'example_invalid_at_commands_arguments'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@ref should not appear on @example line',
     'type' => 'warning'
   },
@@ -223,7 +217,6 @@ $result_errors{'example_invalid_at_commands_arguments'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@anchor should not appear on @example line',
     'type' => 'warning'
   },
@@ -232,7 +225,6 @@ $result_errors{'example_invalid_at_commands_arguments'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@center should not appear on @example line',
     'type' => 'warning'
   }
diff --git a/tp/t/results/preformatted/example_multi_class.pl 
b/tp/t/results/preformatted/example_multi_class.pl
index 102940858a..05b633eb24 100644
--- a/tp/t/results/preformatted/example_multi_class.pl
+++ b/tp/t/results/preformatted/example_multi_class.pl
@@ -204,8 +204,7 @@ $result_trees{'example_multi_class'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
@@ -216,8 +215,7 @@ $result_trees{'example_multi_class'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/preformatted/insertcopying_in_example.pl 
b/tp/t/results/preformatted/insertcopying_in_example.pl
index 37878a761d..111ed57bbf 100644
--- a/tp/t/results/preformatted/insertcopying_in_example.pl
+++ b/tp/t/results/preformatted/insertcopying_in_example.pl
@@ -34,8 +34,7 @@ $result_trees{'insertcopying_in_example'} = {
               'cmdname' => 'insertcopying',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -75,15 +74,13 @@ $result_trees{'insertcopying_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/preformatted/nested_example_and_comment.pl 
b/tp/t/results/preformatted/nested_example_and_comment.pl
index d5d7f14765..05a05725be 100644
--- a/tp/t/results/preformatted/nested_example_and_comment.pl
+++ b/tp/t/results/preformatted/nested_example_and_comment.pl
@@ -92,15 +92,13 @@ $result_trees{'nested_example_and_comment'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -140,15 +138,13 @@ $result_trees{'nested_example_and_comment'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -248,15 +244,13 @@ $result_trees{'nested_example_and_comment'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 13,
-                    'macro' => ''
+                    'line_nr' => 13
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -296,15 +290,13 @@ $result_trees{'nested_example_and_comment'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -404,15 +396,13 @@ $result_trees{'nested_example_and_comment'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 21,
-                    'macro' => ''
+                    'line_nr' => 21
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             },
             {
@@ -461,15 +451,13 @@ $result_trees{'nested_example_and_comment'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         }
       ],
diff --git a/tp/t/results/preformatted/nested_formats.pl 
b/tp/t/results/preformatted/nested_formats.pl
index 7357a86196..053ddf4a15 100644
--- a/tp/t/results/preformatted/nested_formats.pl
+++ b/tp/t/results/preformatted/nested_formats.pl
@@ -84,15 +84,13 @@ $result_trees{'nested_formats'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -123,15 +121,13 @@ $result_trees{'nested_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -214,15 +210,13 @@ $result_trees{'nested_formats'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 14,
-                    'macro' => ''
+                    'line_nr' => 14
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -253,15 +247,13 @@ $result_trees{'nested_formats'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         }
       ],
diff --git a/tp/t/results/preformatted/page_in_example.pl 
b/tp/t/results/preformatted/page_in_example.pl
index 6088ad9f55..0713f15b72 100644
--- a/tp/t/results/preformatted/page_in_example.pl
+++ b/tp/t/results/preformatted/page_in_example.pl
@@ -70,15 +70,13 @@ $result_trees{'page_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/preformatted/quote_dash_in_display.pl 
b/tp/t/results/preformatted/quote_dash_in_display.pl
index ecce987669..f1882af7d5 100644
--- a/tp/t/results/preformatted/quote_dash_in_display.pl
+++ b/tp/t/results/preformatted/quote_dash_in_display.pl
@@ -70,15 +70,13 @@ $result_trees{'quote_dash_in_display'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
diff --git a/tp/t/results/preformatted/quote_dash_in_example.pl 
b/tp/t/results/preformatted/quote_dash_in_example.pl
index b28d99b49b..8fd9166f78 100644
--- a/tp/t/results/preformatted/quote_dash_in_example.pl
+++ b/tp/t/results/preformatted/quote_dash_in_example.pl
@@ -70,15 +70,13 @@ $result_trees{'quote_dash_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
diff --git a/tp/t/results/preformatted/text_on_display_command_line.pl 
b/tp/t/results/preformatted/text_on_display_command_line.pl
index a64889cd4b..0dcd629985 100644
--- a/tp/t/results/preformatted/text_on_display_command_line.pl
+++ b/tp/t/results/preformatted/text_on_display_command_line.pl
@@ -56,8 +56,7 @@ $result_trees{'text_on_display_command_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -68,8 +67,7 @@ $result_trees{'text_on_display_command_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -133,8 +131,7 @@ $result_trees{'text_on_display_command_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -145,8 +142,7 @@ $result_trees{'text_on_display_command_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -205,15 +201,13 @@ $result_trees{'text_on_display_command_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -277,15 +271,13 @@ $result_trees{'text_on_display_command_line'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 14,
-                    'macro' => ''
+                    'line_nr' => 14
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -316,15 +308,13 @@ $result_trees{'text_on_display_command_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           }
         }
       ],
@@ -365,7 +355,6 @@ $result_errors{'text_on_display_command_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'unexpected argument on @display line: text on line',
     'type' => 'warning'
   },
@@ -374,7 +363,6 @@ $result_errors{'text_on_display_command_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'unexpected argument on @display line: text on line followed by 
text',
     'type' => 'warning'
   },
@@ -383,7 +371,6 @@ $result_errors{'text_on_display_command_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => 'bad argument to @end: display text after end',
     'type' => 'error'
   },
@@ -392,7 +379,6 @@ $result_errors{'text_on_display_command_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 14,
-    'macro' => '',
     'text' => 'bad argument to @end: display text after end display nested in 
display',
     'type' => 'error'
   }
diff --git a/tp/t/results/preformatted/text_on_example_command_line.pl 
b/tp/t/results/preformatted/text_on_example_command_line.pl
index 8689685d36..2bf7da64bb 100644
--- a/tp/t/results/preformatted/text_on_example_command_line.pl
+++ b/tp/t/results/preformatted/text_on_example_command_line.pl
@@ -56,8 +56,7 @@ $result_trees{'text_on_example_command_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -68,8 +67,7 @@ $result_trees{'text_on_example_command_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -133,8 +131,7 @@ $result_trees{'text_on_example_command_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -145,8 +142,7 @@ $result_trees{'text_on_example_command_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -205,15 +201,13 @@ $result_trees{'text_on_example_command_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -277,15 +271,13 @@ $result_trees{'text_on_example_command_line'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 14,
-                    'macro' => ''
+                    'line_nr' => 14
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -316,15 +308,13 @@ $result_trees{'text_on_example_command_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           }
         }
       ],
@@ -365,7 +355,6 @@ $result_errors{'text_on_example_command_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => 'bad argument to @end: example text after end',
     'type' => 'error'
   },
@@ -374,7 +363,6 @@ $result_errors{'text_on_example_command_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 14,
-    'macro' => '',
     'text' => 'bad argument to @end: example text after end example nested in 
example',
     'type' => 'error'
   }
diff --git a/tp/t/results/preformatted/titlefont_in_example.pl 
b/tp/t/results/preformatted/titlefont_in_example.pl
index bdbbecc79e..a7bcbbe18c 100644
--- a/tp/t/results/preformatted/titlefont_in_example.pl
+++ b/tp/t/results/preformatted/titlefont_in_example.pl
@@ -37,8 +37,7 @@ $result_trees{'titlefont_in_example'} = {
               'cmdname' => 'titlefont',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -82,15 +81,13 @@ $result_trees{'titlefont_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/quotation/comment_on_quotation_line.pl 
b/tp/t/results/quotation/comment_on_quotation_line.pl
index 1c0bfb99d5..b6bd455e8d 100644
--- a/tp/t/results/quotation/comment_on_quotation_line.pl
+++ b/tp/t/results/quotation/comment_on_quotation_line.pl
@@ -74,8 +74,7 @@ $result_trees{'comment_on_quotation_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -86,8 +85,7 @@ $result_trees{'comment_on_quotation_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/quotation/empty_quotation.pl 
b/tp/t/results/quotation/empty_quotation.pl
index 61a8bcecf0..d14ec37136 100644
--- a/tp/t/results/quotation/empty_quotation.pl
+++ b/tp/t/results/quotation/empty_quotation.pl
@@ -51,15 +51,13 @@ $result_trees{'empty_quotation'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -114,8 +112,7 @@ $result_trees{'empty_quotation'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -126,8 +123,7 @@ $result_trees{'empty_quotation'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -148,8 +144,7 @@ $result_trees{'empty_quotation'} = {
                   'cmdname' => 'asis',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
@@ -192,8 +187,7 @@ $result_trees{'empty_quotation'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
@@ -204,8 +198,7 @@ $result_trees{'empty_quotation'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -260,8 +253,7 @@ $result_trees{'empty_quotation'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
@@ -272,8 +264,7 @@ $result_trees{'empty_quotation'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         }
       ],
diff --git a/tp/t/results/quotation/footnote_in_quotation_with_arg.pl 
b/tp/t/results/quotation/footnote_in_quotation_with_arg.pl
index 9d61fb8dc8..f86de0f91b 100644
--- a/tp/t/results/quotation/footnote_in_quotation_with_arg.pl
+++ b/tp/t/results/quotation/footnote_in_quotation_with_arg.pl
@@ -52,8 +52,7 @@ $result_trees{'footnote_in_quotation_with_arg'} = {
                   'cmdname' => 'footnote',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   }
                 },
                 {
@@ -91,8 +90,7 @@ $result_trees{'footnote_in_quotation_with_arg'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -103,8 +101,7 @@ $result_trees{'footnote_in_quotation_with_arg'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/quotation/only_comment_on_quotation_line.pl 
b/tp/t/results/quotation/only_comment_on_quotation_line.pl
index 5dba2458c6..f192e9b28a 100644
--- a/tp/t/results/quotation/only_comment_on_quotation_line.pl
+++ b/tp/t/results/quotation/only_comment_on_quotation_line.pl
@@ -66,8 +66,7 @@ $result_trees{'only_comment_on_quotation_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -78,8 +77,7 @@ $result_trees{'only_comment_on_quotation_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/quotation/quotation_and_author.pl 
b/tp/t/results/quotation/quotation_and_author.pl
index eab62303ca..6af971b2b1 100644
--- a/tp/t/results/quotation/quotation_and_author.pl
+++ b/tp/t/results/quotation/quotation_and_author.pl
@@ -65,8 +65,7 @@ $result_trees{'quotation_and_author'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -106,8 +105,7 @@ $result_trees{'quotation_and_author'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -118,8 +116,7 @@ $result_trees{'quotation_and_author'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -183,8 +180,7 @@ $result_trees{'quotation_and_author'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -224,8 +220,7 @@ $result_trees{'quotation_and_author'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             }
           ],
@@ -236,8 +231,7 @@ $result_trees{'quotation_and_author'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -292,8 +286,7 @@ $result_trees{'quotation_and_author'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             },
             {
@@ -333,8 +326,7 @@ $result_trees{'quotation_and_author'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             }
           ],
@@ -350,8 +342,7 @@ $result_trees{'quotation_and_author'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         }
       ],
diff --git a/tp/t/results/quotation/quotation_author_in_example.pl 
b/tp/t/results/quotation/quotation_author_in_example.pl
index 41a5a199b9..ab825c2ff7 100644
--- a/tp/t/results/quotation/quotation_author_in_example.pl
+++ b/tp/t/results/quotation/quotation_author_in_example.pl
@@ -67,8 +67,7 @@ $result_trees{'quotation_author_in_example'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     },
                     {
@@ -106,8 +105,7 @@ $result_trees{'quotation_author_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 }
               ],
@@ -118,8 +116,7 @@ $result_trees{'quotation_author_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -150,15 +147,13 @@ $result_trees{'quotation_author_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/quotation/quotation_beginning_and_end_on_line.pl 
b/tp/t/results/quotation/quotation_beginning_and_end_on_line.pl
index 4a7654d9c8..da4288ea5b 100644
--- a/tp/t/results/quotation/quotation_beginning_and_end_on_line.pl
+++ b/tp/t/results/quotation/quotation_beginning_and_end_on_line.pl
@@ -55,8 +55,7 @@ $result_trees{'quotation_beginning_and_end_on_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -67,8 +66,7 @@ $result_trees{'quotation_beginning_and_end_on_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -91,7 +89,6 @@ $result_errors{'quotation_beginning_and_end_on_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@end should only appear at the beginning of a line',
     'type' => 'warning'
   }
diff --git a/tp/t/results/quotation/space_at_commands_end_quotation_line.pl 
b/tp/t/results/quotation/space_at_commands_end_quotation_line.pl
index 58fef71835..20d84de512 100644
--- a/tp/t/results/quotation/space_at_commands_end_quotation_line.pl
+++ b/tp/t/results/quotation/space_at_commands_end_quotation_line.pl
@@ -78,8 +78,7 @@ $result_trees{'space_at_commands_end_quotation_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -90,8 +89,7 @@ $result_trees{'space_at_commands_end_quotation_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -179,8 +177,7 @@ $result_trees{'space_at_commands_end_quotation_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -191,8 +188,7 @@ $result_trees{'space_at_commands_end_quotation_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
diff --git a/tp/t/results/quotation/standard_quotations.pl 
b/tp/t/results/quotation/standard_quotations.pl
index 7cd3e0afd6..9e3885b1c7 100644
--- a/tp/t/results/quotation/standard_quotations.pl
+++ b/tp/t/results/quotation/standard_quotations.pl
@@ -65,8 +65,7 @@ $result_trees{'standard_quotations'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -77,8 +76,7 @@ $result_trees{'standard_quotations'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -142,8 +140,7 @@ $result_trees{'standard_quotations'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -154,8 +151,7 @@ $result_trees{'standard_quotations'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -219,8 +215,7 @@ $result_trees{'standard_quotations'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
@@ -231,8 +226,7 @@ $result_trees{'standard_quotations'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -296,8 +290,7 @@ $result_trees{'standard_quotations'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
@@ -308,8 +301,7 @@ $result_trees{'standard_quotations'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -373,8 +365,7 @@ $result_trees{'standard_quotations'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             }
           ],
@@ -385,8 +376,7 @@ $result_trees{'standard_quotations'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -450,8 +440,7 @@ $result_trees{'standard_quotations'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             }
           ],
@@ -462,8 +451,7 @@ $result_trees{'standard_quotations'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 21,
-            'macro' => ''
+            'line_nr' => 21
           }
         }
       ],
diff --git a/tp/t/results/raw/beginning_and_end_on_line.pl 
b/tp/t/results/raw/beginning_and_end_on_line.pl
index 07ef36ba3c..b988b66703 100644
--- a/tp/t/results/raw/beginning_and_end_on_line.pl
+++ b/tp/t/results/raw/beginning_and_end_on_line.pl
@@ -60,8 +60,7 @@ $result_trees{'beginning_and_end_on_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -72,8 +71,7 @@ $result_trees{'beginning_and_end_on_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -127,8 +125,7 @@ $result_trees{'beginning_and_end_on_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -139,8 +136,7 @@ $result_trees{'beginning_and_end_on_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -194,8 +190,7 @@ $result_trees{'beginning_and_end_on_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -206,8 +201,7 @@ $result_trees{'beginning_and_end_on_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         }
       ],
@@ -237,7 +231,6 @@ $result_errors{'beginning_and_end_on_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@end should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -246,7 +239,6 @@ $result_errors{'beginning_and_end_on_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'unexpected argument on @tex line: in tex',
     'type' => 'warning'
   },
@@ -255,7 +247,6 @@ $result_errors{'beginning_and_end_on_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '@end should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -264,7 +255,6 @@ $result_errors{'beginning_and_end_on_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'unexpected argument on @verbatim line: in verbatim',
     'type' => 'warning'
   },
@@ -273,7 +263,6 @@ $result_errors{'beginning_and_end_on_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => '@end should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -282,7 +271,6 @@ $result_errors{'beginning_and_end_on_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'unexpected argument on @html line: in html',
     'type' => 'warning'
   }
diff --git a/tp/t/results/raw/braces_in_tex.pl 
b/tp/t/results/raw/braces_in_tex.pl
index 1728ee8250..040a67cf15 100644
--- a/tp/t/results/raw/braces_in_tex.pl
+++ b/tp/t/results/raw/braces_in_tex.pl
@@ -81,15 +81,13 @@ $result_trees{'braces_in_tex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -185,15 +183,13 @@ $result_trees{'braces_in_tex'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       }
                     }
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 12,
-                    'macro' => ''
+                    'line_nr' => 12
                   }
                 }
               ],
@@ -227,15 +223,13 @@ $result_trees{'braces_in_tex'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
diff --git a/tp/t/results/raw/displaymath.pl b/tp/t/results/raw/displaymath.pl
index 3111817204..3b69112703 100644
--- a/tp/t/results/raw/displaymath.pl
+++ b/tp/t/results/raw/displaymath.pl
@@ -34,8 +34,7 @@ $result_trees{'displaymath'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               },
               'type' => 'balanced_braces'
             },
@@ -50,8 +49,7 @@ $result_trees{'displaymath'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               },
               'type' => 'balanced_braces'
             },
@@ -87,15 +85,13 @@ $result_trees{'displaymath'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -137,8 +133,7 @@ $result_trees{'displaymath'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'balanced_braces'
             },
@@ -153,8 +148,7 @@ $result_trees{'displaymath'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'balanced_braces'
             },
@@ -190,15 +184,13 @@ $result_trees{'displaymath'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
diff --git a/tp/t/results/raw/displaymath_not_closed.pl 
b/tp/t/results/raw/displaymath_not_closed.pl
index 77d0515d05..7eef021444 100644
--- a/tp/t/results/raw/displaymath_not_closed.pl
+++ b/tp/t/results/raw/displaymath_not_closed.pl
@@ -30,8 +30,7 @@ $result_trees{'displaymath_not_closed'} = {
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -55,7 +54,6 @@ $result_errors{'displaymath_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'no matching `@end displaymath\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/raw/inline_in_example.pl 
b/tp/t/results/raw/inline_in_example.pl
index 6a172fdb7e..cc7accb2b0 100644
--- a/tp/t/results/raw/inline_in_example.pl
+++ b/tp/t/results/raw/inline_in_example.pl
@@ -61,8 +61,7 @@ $result_trees{'inline_in_example'} = {
                           'cmdname' => 'lbracechar',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 4,
-                            'macro' => ''
+                            'line_nr' => 4
                           }
                         },
                         {
@@ -84,8 +83,7 @@ $result_trees{'inline_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   }
                 },
                 {
@@ -123,8 +121,7 @@ $result_trees{'inline_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
-                    'macro' => ''
+                    'line_nr' => 5
                   }
                 },
                 {
@@ -174,8 +171,7 @@ $result_trees{'inline_in_example'} = {
                           'cmdname' => 'acronym',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 10,
-                            'macro' => ''
+                            'line_nr' => 10
                           }
                         },
                         {
@@ -198,8 +194,7 @@ $result_trees{'inline_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 8,
-                    'macro' => ''
+                    'line_nr' => 8
                   }
                 },
                 {
@@ -237,15 +232,13 @@ $result_trees{'inline_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/raw/inline_missing_first_arg.pl 
b/tp/t/results/raw/inline_missing_first_arg.pl
index ef37496aa8..1e8a91aac0 100644
--- a/tp/t/results/raw/inline_missing_first_arg.pl
+++ b/tp/t/results/raw/inline_missing_first_arg.pl
@@ -37,8 +37,7 @@ $result_trees{'inline_missing_first_arg'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -65,8 +64,7 @@ $result_trees{'inline_missing_first_arg'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -96,7 +94,6 @@ $result_errors{'inline_missing_first_arg'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@inlinefmt missing first argument',
     'type' => 'warning'
   },
@@ -105,7 +102,6 @@ $result_errors{'inline_missing_first_arg'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@inlineraw missing first argument',
     'type' => 'warning'
   }
diff --git a/tp/t/results/raw/inlinefmt.pl b/tp/t/results/raw/inlinefmt.pl
index aa87971a2b..7b65ee4320 100644
--- a/tp/t/results/raw/inlinefmt.pl
+++ b/tp/t/results/raw/inlinefmt.pl
@@ -38,8 +38,7 @@ $result_trees{'inlinefmt'} = {
                       'cmdname' => 'lbracechar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     },
                     {
@@ -61,8 +60,7 @@ $result_trees{'inlinefmt'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -98,8 +96,7 @@ $result_trees{'inlinefmt'} = {
                       'cmdname' => 'acronym',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -121,8 +118,7 @@ $result_trees{'inlinefmt'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
diff --git a/tp/t/results/raw/inlinefmt_with_empty_line.pl 
b/tp/t/results/raw/inlinefmt_with_empty_line.pl
index 023dd6d3f1..e2725bd72f 100644
--- a/tp/t/results/raw/inlinefmt_with_empty_line.pl
+++ b/tp/t/results/raw/inlinefmt_with_empty_line.pl
@@ -51,8 +51,7 @@ $result_trees{'inlinefmt_with_empty_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -69,8 +68,7 @@ $result_trees{'inlinefmt_with_empty_line'} = {
               'cmdname' => 'lbracechar',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -114,8 +112,7 @@ $result_trees{'inlinefmt_with_empty_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -140,8 +137,7 @@ $result_trees{'inlinefmt_with_empty_line'} = {
               'cmdname' => 'acronym',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -181,7 +177,6 @@ $result_errors{'inlinefmt_with_empty_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@inlinefmt missing closing brace',
     'type' => 'error'
   },
@@ -190,7 +185,6 @@ $result_errors{'inlinefmt_with_empty_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   },
@@ -199,7 +193,6 @@ $result_errors{'inlinefmt_with_empty_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '@inlinefmt missing closing brace',
     'type' => 'error'
   },
@@ -208,7 +201,6 @@ $result_errors{'inlinefmt_with_empty_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/raw/inlineraw.pl b/tp/t/results/raw/inlineraw.pl
index 62ec16111f..0e02c290ba 100644
--- a/tp/t/results/raw/inlineraw.pl
+++ b/tp/t/results/raw/inlineraw.pl
@@ -38,8 +38,7 @@ $result_trees{'inlineraw'} = {
                       'cmdname' => 'lbracechar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     },
                     {
@@ -61,8 +60,7 @@ $result_trees{'inlineraw'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -98,8 +96,7 @@ $result_trees{'inlineraw'} = {
                       'cmdname' => 'acronym',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -121,8 +118,7 @@ $result_trees{'inlineraw'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
diff --git a/tp/t/results/raw/inlineraw_with_empty_line.pl 
b/tp/t/results/raw/inlineraw_with_empty_line.pl
index bbd24cbfbf..f4f5eda7d1 100644
--- a/tp/t/results/raw/inlineraw_with_empty_line.pl
+++ b/tp/t/results/raw/inlineraw_with_empty_line.pl
@@ -44,8 +44,7 @@ $result_trees{'inlineraw_with_empty_line'} = {
                       'cmdname' => 'lbracechar',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     },
                     {
@@ -67,8 +66,7 @@ $result_trees{'inlineraw_with_empty_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -113,8 +111,7 @@ $result_trees{'inlineraw_with_empty_line'} = {
                       'cmdname' => 'acronym',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     },
                     {
@@ -136,8 +133,7 @@ $result_trees{'inlineraw_with_empty_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
diff --git a/tp/t/results/raw/lone_braces_in_html.pl 
b/tp/t/results/raw/lone_braces_in_html.pl
index 949ec59dcb..b43bc75c54 100644
--- a/tp/t/results/raw/lone_braces_in_html.pl
+++ b/tp/t/results/raw/lone_braces_in_html.pl
@@ -60,15 +60,13 @@ $result_trees{'lone_braces_in_html'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -127,15 +125,13 @@ $result_trees{'lone_braces_in_html'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
diff --git a/tp/t/results/raw/misc_raw.pl b/tp/t/results/raw/misc_raw.pl
index 566fecd776..7640925fa3 100644
--- a/tp/t/results/raw/misc_raw.pl
+++ b/tp/t/results/raw/misc_raw.pl
@@ -64,15 +64,13 @@ $result_trees{'misc_raw'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -127,8 +125,7 @@ $result_trees{'misc_raw'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -139,8 +136,7 @@ $result_trees{'misc_raw'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -200,15 +196,13 @@ $result_trees{'misc_raw'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         }
       ],
@@ -245,7 +239,6 @@ $result_errors{'misc_raw'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@end should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -254,7 +247,6 @@ $result_errors{'misc_raw'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'unexpected argument on @tex line: in tex',
     'type' => 'warning'
   }
diff --git a/tp/t/results/raw/misc_raw_comments.pl 
b/tp/t/results/raw/misc_raw_comments.pl
index 9e5f849034..22c66c2b68 100644
--- a/tp/t/results/raw/misc_raw_comments.pl
+++ b/tp/t/results/raw/misc_raw_comments.pl
@@ -76,8 +76,7 @@ $result_trees{'misc_raw_comments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -88,8 +87,7 @@ $result_trees{'misc_raw_comments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -153,8 +151,7 @@ $result_trees{'misc_raw_comments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -165,8 +162,7 @@ $result_trees{'misc_raw_comments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -226,15 +222,13 @@ $result_trees{'misc_raw_comments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         }
       ],
@@ -271,7 +265,6 @@ $result_errors{'misc_raw_comments'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@end should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -280,7 +273,6 @@ $result_errors{'misc_raw_comments'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'unexpected argument on @tex line: in tex',
     'type' => 'warning'
   }
diff --git a/tp/t/results/raw/nested_macros.pl 
b/tp/t/results/raw/nested_macros.pl
index 751c9ad84c..d09f3d4ff0 100644
--- a/tp/t/results/raw/nested_macros.pl
+++ b/tp/t/results/raw/nested_macros.pl
@@ -84,8 +84,7 @@ $result_trees{'nested_macros'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
@@ -95,8 +94,7 @@ $result_trees{'nested_macros'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/raw/raw_commands_and_end_of_lines.pl 
b/tp/t/results/raw/raw_commands_and_end_of_lines.pl
index c3c6fad99d..edb5c56703 100644
--- a/tp/t/results/raw/raw_commands_and_end_of_lines.pl
+++ b/tp/t/results/raw/raw_commands_and_end_of_lines.pl
@@ -65,15 +65,13 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -142,15 +140,13 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -221,15 +217,13 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 15,
-                    'macro' => ''
+                    'line_nr' => 15
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -300,15 +294,13 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 20,
-                    'macro' => ''
+                    'line_nr' => 20
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             }
           ],
@@ -375,15 +367,13 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 24,
-                    'macro' => ''
+                    'line_nr' => 24
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -454,15 +444,13 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 29,
-                    'macro' => ''
+                    'line_nr' => 29
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             }
           ],
@@ -524,15 +512,13 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 31,
-            'macro' => ''
+            'line_nr' => 31
           }
         },
         {
@@ -597,15 +583,13 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 38,
-                    'macro' => ''
+                    'line_nr' => 38
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               }
             },
             {
@@ -676,15 +660,13 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 43,
-                    'macro' => ''
+                    'line_nr' => 43
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 41,
-                'macro' => ''
+                'line_nr' => 41
               }
             },
             {
@@ -755,15 +737,13 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 48,
-                    'macro' => ''
+                    'line_nr' => 48
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 46,
-                'macro' => ''
+                'line_nr' => 46
               }
             }
           ],
@@ -830,15 +810,13 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 52,
-                    'macro' => ''
+                    'line_nr' => 52
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             },
             {
@@ -909,15 +887,13 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 57,
-                    'macro' => ''
+                    'line_nr' => 57
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 55,
-                'macro' => ''
+                'line_nr' => 55
               }
             }
           ],
@@ -975,15 +951,13 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 59,
-            'macro' => ''
+            'line_nr' => 59
           }
         },
         {
@@ -1047,15 +1021,13 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 66,
-                'macro' => ''
+                'line_nr' => 66
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 64,
-            'macro' => ''
+            'line_nr' => 64
           }
         },
         {
@@ -1127,15 +1099,13 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 69,
-            'macro' => ''
+            'line_nr' => 69
           }
         },
         {
@@ -1207,15 +1177,13 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 76,
-                'macro' => ''
+                'line_nr' => 76
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 74,
-            'macro' => ''
+            'line_nr' => 74
           }
         },
         {
@@ -1278,15 +1246,13 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 80,
-                'macro' => ''
+                'line_nr' => 80
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 78,
-            'macro' => ''
+            'line_nr' => 78
           }
         },
         {
@@ -1358,15 +1324,13 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 85,
-                'macro' => ''
+                'line_nr' => 85
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 83,
-            'macro' => ''
+            'line_nr' => 83
           }
         }
       ],
@@ -1521,7 +1485,6 @@ $result_errors{'raw_commands_and_end_of_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => '@html should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1530,7 +1493,6 @@ $result_errors{'raw_commands_and_end_of_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 18,
-    'macro' => '',
     'text' => '@html should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1539,7 +1501,6 @@ $result_errors{'raw_commands_and_end_of_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 20,
-    'macro' => '',
     'text' => 'bad argument to @end: html after the closing command.',
     'type' => 'error'
   },
@@ -1548,7 +1509,6 @@ $result_errors{'raw_commands_and_end_of_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 22,
-    'macro' => '',
     'text' => '@html should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1557,7 +1517,6 @@ $result_errors{'raw_commands_and_end_of_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 27,
-    'macro' => '',
     'text' => '@html should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1566,7 +1525,6 @@ $result_errors{'raw_commands_and_end_of_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 29,
-    'macro' => '',
     'text' => 'bad argument to @end: html. A symbol after the closing 
command.',
     'type' => 'error'
   },
@@ -1575,7 +1533,6 @@ $result_errors{'raw_commands_and_end_of_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 41,
-    'macro' => '',
     'text' => '@tex should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1584,7 +1541,6 @@ $result_errors{'raw_commands_and_end_of_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 46,
-    'macro' => '',
     'text' => '@tex should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1593,7 +1549,6 @@ $result_errors{'raw_commands_and_end_of_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 48,
-    'macro' => '',
     'text' => 'bad argument to @end: tex after the closing command.',
     'type' => 'error'
   },
@@ -1602,7 +1557,6 @@ $result_errors{'raw_commands_and_end_of_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 50,
-    'macro' => '',
     'text' => '@tex should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1611,7 +1565,6 @@ $result_errors{'raw_commands_and_end_of_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 55,
-    'macro' => '',
     'text' => '@tex should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1620,7 +1573,6 @@ $result_errors{'raw_commands_and_end_of_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 57,
-    'macro' => '',
     'text' => 'bad argument to @end: tex. A symbol after the closing command.',
     'type' => 'error'
   },
@@ -1629,7 +1581,6 @@ $result_errors{'raw_commands_and_end_of_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 69,
-    'macro' => '',
     'text' => '@verbatim should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1638,7 +1589,6 @@ $result_errors{'raw_commands_and_end_of_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 74,
-    'macro' => '',
     'text' => '@verbatim should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1647,7 +1597,6 @@ $result_errors{'raw_commands_and_end_of_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 76,
-    'macro' => '',
     'text' => 'bad argument to @end: verbatim after the closing command.',
     'type' => 'error'
   },
@@ -1656,7 +1605,6 @@ $result_errors{'raw_commands_and_end_of_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 78,
-    'macro' => '',
     'text' => '@verbatim should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1665,7 +1613,6 @@ $result_errors{'raw_commands_and_end_of_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 83,
-    'macro' => '',
     'text' => '@verbatim should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -1674,7 +1621,6 @@ $result_errors{'raw_commands_and_end_of_lines'} = [
 ',
     'file_name' => '',
     'line_nr' => 85,
-    'macro' => '',
     'text' => 'bad argument to @end: verbatim. A symbol after the closing 
command.',
     'type' => 'error'
   }
diff --git a/tp/t/results/raw/raw_expanded_in_style.pl 
b/tp/t/results/raw/raw_expanded_in_style.pl
index 244bbcebc3..47a43b668b 100644
--- a/tp/t/results/raw/raw_expanded_in_style.pl
+++ b/tp/t/results/raw/raw_expanded_in_style.pl
@@ -70,15 +70,13 @@ $result_trees{'raw_expanded_in_style'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 4,
-                            'macro' => ''
+                            'line_nr' => 4
                           }
                         }
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -88,8 +86,7 @@ $result_trees{'raw_expanded_in_style'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
diff --git a/tp/t/results/raw/raw_in_example.pl 
b/tp/t/results/raw/raw_in_example.pl
index 844cd2dcb7..8403402b53 100644
--- a/tp/t/results/raw/raw_in_example.pl
+++ b/tp/t/results/raw/raw_in_example.pl
@@ -76,15 +76,13 @@ $result_trees{'raw_in_example'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     }
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   }
                 }
               ],
@@ -118,15 +116,13 @@ $result_trees{'raw_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -216,15 +212,13 @@ $result_trees{'raw_in_example'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     }
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 },
                 {
@@ -309,15 +303,13 @@ $result_trees{'raw_in_example'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 23,
-                        'macro' => ''
+                        'line_nr' => 23
                       }
                     }
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 15,
-                    'macro' => ''
+                    'line_nr' => 15
                   }
                 },
                 {
@@ -356,15 +348,13 @@ $result_trees{'raw_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
diff --git a/tp/t/results/raw/raw_in_para.pl b/tp/t/results/raw/raw_in_para.pl
index 3931a49928..5c66ada9a8 100644
--- a/tp/t/results/raw/raw_in_para.pl
+++ b/tp/t/results/raw/raw_in_para.pl
@@ -65,15 +65,13 @@ $result_trees{'raw_in_para'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -138,15 +136,13 @@ $result_trees{'raw_in_para'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -227,15 +223,13 @@ $result_trees{'raw_in_para'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 17,
-                    'macro' => ''
+                    'line_nr' => 17
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             }
           ],
diff --git a/tp/t/results/raw/raw_in_style.pl b/tp/t/results/raw/raw_in_style.pl
index fa95027239..2dfe57391f 100644
--- a/tp/t/results/raw/raw_in_style.pl
+++ b/tp/t/results/raw/raw_in_style.pl
@@ -70,15 +70,13 @@ $result_trees{'raw_in_style'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 4,
-                            'macro' => ''
+                            'line_nr' => 4
                           }
                         }
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -88,8 +86,7 @@ $result_trees{'raw_in_style'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
diff --git a/tp/t/results/raw/raw_not_closed.pl 
b/tp/t/results/raw/raw_not_closed.pl
index 664216395e..a0a9f3862b 100644
--- a/tp/t/results/raw/raw_not_closed.pl
+++ b/tp/t/results/raw/raw_not_closed.pl
@@ -44,8 +44,7 @@ $result_trees{'raw_not_closed'} = {
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -73,7 +72,6 @@ $result_errors{'raw_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'no matching `@end html\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/raw/second_level_lone_braces_in_html.pl 
b/tp/t/results/raw/second_level_lone_braces_in_html.pl
index cd8c785100..d3759383d1 100644
--- a/tp/t/results/raw/second_level_lone_braces_in_html.pl
+++ b/tp/t/results/raw/second_level_lone_braces_in_html.pl
@@ -44,8 +44,7 @@ $result_trees{'second_level_lone_braces_in_html'} = {
                           ],
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 2,
-                            'macro' => ''
+                            'line_nr' => 2
                           },
                           'type' => 'balanced_braces'
                         }
@@ -56,8 +55,7 @@ $result_trees{'second_level_lone_braces_in_html'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   }
                 },
                 {
@@ -95,15 +93,13 @@ $result_trees{'second_level_lone_braces_in_html'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -146,8 +142,7 @@ $result_trees{'second_level_lone_braces_in_html'} = {
                           ],
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 8,
-                            'macro' => ''
+                            'line_nr' => 8
                           },
                           'type' => 'balanced_braces'
                         },
@@ -162,8 +157,7 @@ $result_trees{'second_level_lone_braces_in_html'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 },
                 {
@@ -201,15 +195,13 @@ $result_trees{'second_level_lone_braces_in_html'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         }
       ],
diff --git a/tp/t/results/raw/second_level_lone_braces_in_html_not_expanded.pl 
b/tp/t/results/raw/second_level_lone_braces_in_html_not_expanded.pl
index 4d55011e3a..c3f330488f 100644
--- a/tp/t/results/raw/second_level_lone_braces_in_html_not_expanded.pl
+++ b/tp/t/results/raw/second_level_lone_braces_in_html_not_expanded.pl
@@ -66,15 +66,13 @@ 
$result_trees{'second_level_lone_braces_in_html_not_expanded'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -144,15 +142,13 @@ 
$result_trees{'second_level_lone_braces_in_html_not_expanded'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         }
       ],
diff --git a/tp/t/results/raw/space_before_end.pl 
b/tp/t/results/raw/space_before_end.pl
index 093a797a9d..37f15aaeb0 100644
--- a/tp/t/results/raw/space_before_end.pl
+++ b/tp/t/results/raw/space_before_end.pl
@@ -63,15 +63,13 @@ $result_trees{'space_before_end'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -130,15 +128,13 @@ $result_trees{'space_before_end'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -201,15 +197,13 @@ $result_trees{'space_before_end'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         }
       ],
@@ -245,7 +239,6 @@ $result_errors{'space_before_end'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '@end verbatim should only appear at the beginning of a line',
     'type' => 'warning'
   }
diff --git a/tp/t/results/raw/spurious_arg_on_line.pl 
b/tp/t/results/raw/spurious_arg_on_line.pl
index 6833e3d3d0..69eecb450e 100644
--- a/tp/t/results/raw/spurious_arg_on_line.pl
+++ b/tp/t/results/raw/spurious_arg_on_line.pl
@@ -70,8 +70,7 @@ $result_trees{'spurious_arg_on_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -82,8 +81,7 @@ $result_trees{'spurious_arg_on_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -143,8 +141,7 @@ $result_trees{'spurious_arg_on_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
@@ -155,8 +152,7 @@ $result_trees{'spurious_arg_on_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -221,8 +217,7 @@ $result_trees{'spurious_arg_on_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
@@ -233,8 +228,7 @@ $result_trees{'spurious_arg_on_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         }
       ],
@@ -272,7 +266,6 @@ $result_errors{'spurious_arg_on_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'unexpected argument on @tex line: argt',
     'type' => 'warning'
   },
@@ -281,7 +274,6 @@ $result_errors{'spurious_arg_on_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'unexpected argument on @verbatim line: argverbatim',
     'type' => 'warning'
   },
@@ -290,7 +282,6 @@ $result_errors{'spurious_arg_on_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => 'unexpected argument on @html line: argh',
     'type' => 'warning'
   }
diff --git a/tp/t/results/raw/tex_not_closed.pl 
b/tp/t/results/raw/tex_not_closed.pl
index 73e131217c..20a2eea34c 100644
--- a/tp/t/results/raw/tex_not_closed.pl
+++ b/tp/t/results/raw/tex_not_closed.pl
@@ -40,8 +40,7 @@ $result_trees{'tex_not_closed'} = {
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -67,7 +66,6 @@ $result_errors{'tex_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'no matching `@end tex\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/raw/verbatim_and_verbatiminclude.pl 
b/tp/t/results/raw/verbatim_and_verbatiminclude.pl
index b72013f9df..264435a9c4 100644
--- a/tp/t/results/raw/verbatim_and_verbatiminclude.pl
+++ b/tp/t/results/raw/verbatim_and_verbatiminclude.pl
@@ -56,15 +56,13 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -128,15 +126,13 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -228,15 +224,13 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 16,
-                    'macro' => ''
+                    'line_nr' => 16
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -267,15 +261,13 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -339,15 +331,13 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
@@ -393,8 +383,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           }
         },
         {
@@ -454,8 +443,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             },
             {
@@ -486,15 +474,13 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 27,
-            'macro' => ''
+            'line_nr' => 27
           }
         },
         {
@@ -540,8 +526,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 33,
-            'macro' => ''
+            'line_nr' => 33
           }
         },
         {
@@ -638,15 +623,13 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 42,
-                    'macro' => ''
+                    'line_nr' => 42
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 39,
-                'macro' => ''
+                'line_nr' => 39
               }
             },
             {
@@ -687,15 +670,13 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 36,
-            'macro' => ''
+            'line_nr' => 36
           }
         },
         {
@@ -783,15 +764,13 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 52,
-                    'macro' => ''
+                    'line_nr' => 52
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             },
             {
@@ -827,15 +806,13 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 54,
-                'macro' => ''
+                'line_nr' => 54
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 46,
-            'macro' => ''
+            'line_nr' => 46
           }
         },
         {
@@ -918,15 +895,13 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 61,
-                    'macro' => ''
+                    'line_nr' => 61
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             },
             {
@@ -966,15 +941,13 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 63,
-                'macro' => ''
+                'line_nr' => 63
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 56,
-            'macro' => ''
+            'line_nr' => 56
           }
         }
       ],
@@ -1137,7 +1110,6 @@ 
$result_converted_errors{'plaintext'}->{'verbatim_and_verbatiminclude'} = [
 ',
     'file_name' => '',
     'line_nr' => 25,
-    'macro' => '',
     'text' => '@verbatiminclude: could not find verb.txt',
     'type' => 'error'
   },
@@ -1146,7 +1118,6 @@ 
$result_converted_errors{'plaintext'}->{'verbatim_and_verbatiminclude'} = [
 ',
     'file_name' => '',
     'line_nr' => 29,
-    'macro' => '',
     'text' => '@verbatiminclude: could not find verb.txt',
     'type' => 'error'
   },
@@ -1155,7 +1126,6 @@ 
$result_converted_errors{'plaintext'}->{'verbatim_and_verbatiminclude'} = [
 ',
     'file_name' => '',
     'line_nr' => 33,
-    'macro' => '',
     'text' => '@verbatiminclude: could not find verb.txt',
     'type' => 'error'
   }
diff --git a/tp/t/results/raw/verbatim_in_brace_command.pl 
b/tp/t/results/raw/verbatim_in_brace_command.pl
index 535c25738a..8b4465d2b7 100644
--- a/tp/t/results/raw/verbatim_in_brace_command.pl
+++ b/tp/t/results/raw/verbatim_in_brace_command.pl
@@ -26,8 +26,7 @@ $result_trees{'verbatim_in_brace_command'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -80,15 +79,13 @@ $result_trees{'verbatim_in_brace_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -122,7 +119,6 @@ $result_errors{'verbatim_in_brace_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@samp missing closing brace',
     'type' => 'error'
   },
@@ -131,7 +127,6 @@ $result_errors{'verbatim_in_brace_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/raw/verbatim_not_closed.pl 
b/tp/t/results/raw/verbatim_not_closed.pl
index 27249f9414..11e8e9b3a3 100644
--- a/tp/t/results/raw/verbatim_not_closed.pl
+++ b/tp/t/results/raw/verbatim_not_closed.pl
@@ -51,8 +51,7 @@ $result_trees{'verbatim_not_closed'} = {
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -84,7 +83,6 @@ $result_errors{'verbatim_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'no matching `@end verbatim\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/regions/anchor_in_copying.pl 
b/tp/t/results/regions/anchor_in_copying.pl
index 2830fe1986..93991db915 100644
--- a/tp/t/results/regions/anchor_in_copying.pl
+++ b/tp/t/results/regions/anchor_in_copying.pl
@@ -67,8 +67,7 @@ $result_trees{'anchor_in_copying'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -112,15 +111,13 @@ $result_trees{'anchor_in_copying'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -170,8 +167,7 @@ $result_trees{'anchor_in_copying'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -209,8 +205,7 @@ $result_trees{'anchor_in_copying'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -229,8 +224,7 @@ $result_trees{'anchor_in_copying'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         },
         {
@@ -262,8 +256,7 @@ $result_trees{'anchor_in_copying'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             },
             {
@@ -290,8 +283,7 @@ $result_trees{'anchor_in_copying'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     }
   ],
@@ -409,7 +401,6 @@ $result_converted_errors{'info'}->{'anchor_in_copying'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@anchor output more than once: Copying information',
     'type' => 'error'
   }
diff --git a/tp/t/results/regions/anchor_in_copying_in_footnote.pl 
b/tp/t/results/regions/anchor_in_copying_in_footnote.pl
index b059c1f4c3..f6873ff9f4 100644
--- a/tp/t/results/regions/anchor_in_copying_in_footnote.pl
+++ b/tp/t/results/regions/anchor_in_copying_in_footnote.pl
@@ -66,8 +66,7 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
                                   },
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 5,
-                                    'macro' => ''
+                                    'line_nr' => 5
                                   }
                                 },
                                 {
@@ -91,8 +90,7 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     },
                     {
@@ -135,15 +133,13 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 8,
-                    'macro' => ''
+                    'line_nr' => 8
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -193,8 +189,7 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -232,8 +227,7 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           }
         },
         {
@@ -252,8 +246,7 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           }
         },
         {
@@ -285,8 +278,7 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -313,8 +305,7 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     }
   ],
@@ -445,7 +436,6 @@ 
$result_converted_errors{'info'}->{'anchor_in_copying_in_footnote'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@anchor output more than once: Copying footnote',
     'type' => 'error'
   }
diff --git a/tp/t/results/regions/anchor_in_titlepage.pl 
b/tp/t/results/regions/anchor_in_titlepage.pl
index 5e23e0e6ac..65bd7d24f4 100644
--- a/tp/t/results/regions/anchor_in_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage.pl
@@ -51,8 +51,7 @@ $result_trees{'anchor_in_titlepage'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 },
                 {
@@ -88,15 +87,13 @@ $result_trees{'anchor_in_titlepage'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -136,8 +133,7 @@ $result_trees{'anchor_in_titlepage'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -176,8 +172,7 @@ $result_trees{'anchor_in_titlepage'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -208,8 +203,7 @@ $result_trees{'anchor_in_titlepage'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -260,8 +254,7 @@ $result_trees{'anchor_in_titlepage'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -283,8 +276,7 @@ $result_trees{'anchor_in_titlepage'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     }
   ],
diff --git a/tp/t/results/regions/anchor_in_titlepage_titlepage.pl 
b/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
index cb79aaf239..729a161b59 100644
--- a/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
@@ -51,8 +51,7 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 },
                 {
@@ -88,15 +87,13 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -136,8 +133,7 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -176,8 +172,7 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -208,8 +203,7 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -260,8 +254,7 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             },
             {
@@ -283,8 +276,7 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     }
   ],
diff --git a/tp/t/results/regions/copying_not_closed.pl 
b/tp/t/results/regions/copying_not_closed.pl
index b744ddf74c..39e6cb1485 100644
--- a/tp/t/results/regions/copying_not_closed.pl
+++ b/tp/t/results/regions/copying_not_closed.pl
@@ -40,8 +40,7 @@ $result_trees{'copying_not_closed'} = {
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -65,7 +64,6 @@ $result_errors{'copying_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'no matching `@end copying\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/regions/double_copying.pl 
b/tp/t/results/regions/double_copying.pl
index 2ef4907f39..35e53971a4 100644
--- a/tp/t/results/regions/double_copying.pl
+++ b/tp/t/results/regions/double_copying.pl
@@ -93,15 +93,13 @@ $result_trees{'double_copying'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -132,15 +130,13 @@ $result_trees{'double_copying'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -169,7 +165,6 @@ $result_errors{'double_copying'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@copying should not appear in @copying block',
     'type' => 'warning'
   },
@@ -178,7 +173,6 @@ $result_errors{'double_copying'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'multiple @copying',
     'type' => 'warning'
   }
diff --git a/tp/t/results/regions/double_titlepage_not_closed.pl 
b/tp/t/results/regions/double_titlepage_not_closed.pl
index 343e88cead..5ff9783b27 100644
--- a/tp/t/results/regions/double_titlepage_not_closed.pl
+++ b/tp/t/results/regions/double_titlepage_not_closed.pl
@@ -78,15 +78,13 @@ $result_trees{'double_titlepage_not_closed'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -115,7 +113,6 @@ $result_errors{'double_titlepage_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => '@titlepage should not appear in @titlepage block',
     'type' => 'warning'
   },
@@ -124,7 +121,6 @@ $result_errors{'double_titlepage_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'multiple @titlepage',
     'type' => 'warning'
   },
@@ -133,7 +129,6 @@ $result_errors{'double_titlepage_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => 'no matching `@end titlepage\'',
     'type' => 'error'
   },
@@ -142,7 +137,6 @@ $result_errors{'double_titlepage_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => 'no matching `@end titlepage\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/regions/format_in_titlepage.pl 
b/tp/t/results/regions/format_in_titlepage.pl
index 0adbee49ac..a208b1f87c 100644
--- a/tp/t/results/regions/format_in_titlepage.pl
+++ b/tp/t/results/regions/format_in_titlepage.pl
@@ -81,15 +81,13 @@ $result_trees{'format_in_titlepage'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 },
                 {
@@ -125,15 +123,13 @@ $result_trees{'format_in_titlepage'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -176,8 +172,7 @@ $result_trees{'format_in_titlepage'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -216,8 +211,7 @@ $result_trees{'format_in_titlepage'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     }
   ],
diff --git a/tp/t/results/regions/format_in_titlepage_titlepage.pl 
b/tp/t/results/regions/format_in_titlepage_titlepage.pl
index 3ed8f2e0de..d8e9bc2e16 100644
--- a/tp/t/results/regions/format_in_titlepage_titlepage.pl
+++ b/tp/t/results/regions/format_in_titlepage_titlepage.pl
@@ -81,15 +81,13 @@ $result_trees{'format_in_titlepage_titlepage'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 },
                 {
@@ -125,15 +123,13 @@ $result_trees{'format_in_titlepage_titlepage'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -176,8 +172,7 @@ $result_trees{'format_in_titlepage_titlepage'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -216,8 +211,7 @@ $result_trees{'format_in_titlepage_titlepage'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     }
   ],
diff --git a/tp/t/results/regions/ref_in_copying.pl 
b/tp/t/results/regions/ref_in_copying.pl
index 582e88c069..b92a23083e 100644
--- a/tp/t/results/regions/ref_in_copying.pl
+++ b/tp/t/results/regions/ref_in_copying.pl
@@ -49,8 +49,7 @@ $result_trees{'ref_in_copying'} = {
                       'cmdname' => 'ref',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -88,15 +87,13 @@ $result_trees{'ref_in_copying'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -139,8 +136,7 @@ $result_trees{'ref_in_copying'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -178,8 +174,7 @@ $result_trees{'ref_in_copying'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -244,8 +239,7 @@ $result_trees{'ref_in_copying'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -277,15 +271,13 @@ $result_trees{'ref_in_copying'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -302,8 +294,7 @@ $result_trees{'ref_in_copying'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -335,8 +326,7 @@ $result_trees{'ref_in_copying'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -374,8 +364,7 @@ $result_trees{'ref_in_copying'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     }
   ],
diff --git a/tp/t/results/regions/ref_in_copying_insert_in_chapter.pl 
b/tp/t/results/regions/ref_in_copying_insert_in_chapter.pl
index f831d10cca..322dc1b321 100644
--- a/tp/t/results/regions/ref_in_copying_insert_in_chapter.pl
+++ b/tp/t/results/regions/ref_in_copying_insert_in_chapter.pl
@@ -49,8 +49,7 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
                       'cmdname' => 'ref',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -88,15 +87,13 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -139,8 +136,7 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -176,8 +172,7 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -209,8 +204,7 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -248,8 +242,7 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -314,8 +307,7 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               },
               'type' => 'menu_entry'
             },
@@ -347,15 +339,13 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -374,8 +364,7 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -407,8 +396,7 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -446,8 +434,7 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     }
   ],
diff --git a/tp/t/results/regions/today_in_copying.pl 
b/tp/t/results/regions/today_in_copying.pl
index 5accb510b1..e39c533e6d 100644
--- a/tp/t/results/regions/today_in_copying.pl
+++ b/tp/t/results/regions/today_in_copying.pl
@@ -36,8 +36,7 @@ $result_trees{'today_in_copying'} = {
                       'cmdname' => 'today',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -75,15 +74,13 @@ $result_trees{'today_in_copying'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -126,8 +123,7 @@ $result_trees{'today_in_copying'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -163,8 +159,7 @@ $result_trees{'today_in_copying'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -202,8 +197,7 @@ $result_trees{'today_in_copying'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         }
       ],
@@ -218,8 +212,7 @@ $result_trees{'today_in_copying'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     }
   ],
diff --git a/tp/t/results/sectioning/a_comma_after_node.pl 
b/tp/t/results/sectioning/a_comma_after_node.pl
index fb22c28a70..d379121422 100644
--- a/tp/t/results/sectioning/a_comma_after_node.pl
+++ b/tp/t/results/sectioning/a_comma_after_node.pl
@@ -95,8 +95,7 @@ $result_trees{'a_comma_after_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
@@ -138,7 +137,6 @@ $result_errors{'a_comma_after_node'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'Next reference to nonexistent `Requirements\'',
     'type' => 'error'
   },
@@ -147,7 +145,6 @@ $result_errors{'a_comma_after_node'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'Prev reference to nonexistent `Nodes and Menus\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/sectioning/anchor_zero.pl 
b/tp/t/results/sectioning/anchor_zero.pl
index 96c3c66dff..d6381c232a 100644
--- a/tp/t/results/sectioning/anchor_zero.pl
+++ b/tp/t/results/sectioning/anchor_zero.pl
@@ -52,8 +52,7 @@ $result_trees{'anchor_zero'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -94,8 +93,7 @@ $result_trees{'anchor_zero'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -117,8 +115,7 @@ $result_trees{'anchor_zero'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
diff --git a/tp/t/results/sectioning/at_commands_in_node.pl 
b/tp/t/results/sectioning/at_commands_in_node.pl
index 217e58682d..fd53102596 100644
--- a/tp/t/results/sectioning/at_commands_in_node.pl
+++ b/tp/t/results/sectioning/at_commands_in_node.pl
@@ -31,8 +31,7 @@ $result_trees{'at_commands_in_node'} = {
               'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -52,8 +51,7 @@ $result_trees{'at_commands_in_node'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -77,8 +75,7 @@ $result_trees{'at_commands_in_node'} = {
                       'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     }
                   ],
@@ -88,8 +85,7 @@ $result_trees{'at_commands_in_node'} = {
               'cmdname' => '"',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -113,8 +109,7 @@ $result_trees{'at_commands_in_node'} = {
                       'cmdname' => '=',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     }
                   ],
@@ -124,8 +119,7 @@ $result_trees{'at_commands_in_node'} = {
               'cmdname' => '`',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -140,8 +134,7 @@ $result_trees{'at_commands_in_node'} = {
               'cmdname' => 'l',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -165,8 +158,7 @@ $result_trees{'at_commands_in_node'} = {
                       'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     }
                   ],
@@ -176,8 +168,7 @@ $result_trees{'at_commands_in_node'} = {
               'cmdname' => ',',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -192,8 +183,7 @@ $result_trees{'at_commands_in_node'} = {
               'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -212,8 +202,7 @@ $result_trees{'at_commands_in_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
diff --git a/tp/t/results/sectioning/automatic_menu_referencing_node.pl 
b/tp/t/results/sectioning/automatic_menu_referencing_node.pl
index 45fbde61d4..51939b5e03 100644
--- a/tp/t/results/sectioning/automatic_menu_referencing_node.pl
+++ b/tp/t/results/sectioning/automatic_menu_referencing_node.pl
@@ -39,8 +39,7 @@ $result_trees{'automatic_menu_referencing_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -76,8 +75,7 @@ $result_trees{'automatic_menu_referencing_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -109,8 +107,7 @@ $result_trees{'automatic_menu_referencing_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -148,8 +145,7 @@ $result_trees{'automatic_menu_referencing_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -181,8 +177,7 @@ $result_trees{'automatic_menu_referencing_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -213,8 +208,7 @@ $result_trees{'automatic_menu_referencing_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     }
   ],
diff --git a/tp/t/results/sectioning/chapter_before_and_after_part.pl 
b/tp/t/results/sectioning/chapter_before_and_after_part.pl
index 8e3da1bb93..da674ed0ec 100644
--- a/tp/t/results/sectioning/chapter_before_and_after_part.pl
+++ b/tp/t/results/sectioning/chapter_before_and_after_part.pl
@@ -42,8 +42,7 @@ $result_trees{'chapter_before_and_after_part'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     'unit_contents' => [
@@ -95,8 +94,7 @@ $result_trees{'chapter_before_and_after_part'} = [
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         }
       ],
@@ -134,8 +132,7 @@ $result_trees{'chapter_before_and_after_part'} = [
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         'section_number' => '2'
@@ -147,8 +144,7 @@ $result_trees{'chapter_before_and_after_part'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     'unit_contents' => [
diff --git a/tp/t/results/sectioning/chapter_before_part.pl 
b/tp/t/results/sectioning/chapter_before_part.pl
index 969439ed16..88d6232cd7 100644
--- a/tp/t/results/sectioning/chapter_before_part.pl
+++ b/tp/t/results/sectioning/chapter_before_part.pl
@@ -42,8 +42,7 @@ $result_trees{'chapter_before_part'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     'unit_contents' => [
@@ -86,8 +85,7 @@ $result_trees{'chapter_before_part'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     'unit_contents' => [
@@ -168,7 +166,6 @@ $result_errors{'chapter_before_part'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'no sectioning command associated with @part',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/chapter_between_nodes.pl 
b/tp/t/results/sectioning/chapter_between_nodes.pl
index a941cd38d7..85b76c2a9b 100644
--- a/tp/t/results/sectioning/chapter_between_nodes.pl
+++ b/tp/t/results/sectioning/chapter_between_nodes.pl
@@ -44,8 +44,7 @@ $result_trees{'chapter_between_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -138,8 +137,7 @@ $result_trees{'chapter_between_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -171,15 +169,13 @@ $result_trees{'chapter_between_nodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -196,8 +192,7 @@ $result_trees{'chapter_between_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -249,8 +244,7 @@ $result_trees{'chapter_between_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -304,8 +298,7 @@ $result_trees{'chapter_between_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -357,8 +350,7 @@ $result_trees{'chapter_between_nodes'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           }
         }
       ],
@@ -372,8 +364,7 @@ $result_trees{'chapter_between_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     }
   ],
diff --git a/tp/t/results/sectioning/chapter_between_nodes_texi2html.pl 
b/tp/t/results/sectioning/chapter_between_nodes_texi2html.pl
index 164faa8180..05777d78f7 100644
--- a/tp/t/results/sectioning/chapter_between_nodes_texi2html.pl
+++ b/tp/t/results/sectioning/chapter_between_nodes_texi2html.pl
@@ -39,8 +39,7 @@ $result_trees{'chapter_between_nodes_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -133,8 +132,7 @@ $result_trees{'chapter_between_nodes_texi2html'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -166,15 +164,13 @@ $result_trees{'chapter_between_nodes_texi2html'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -191,8 +187,7 @@ $result_trees{'chapter_between_nodes_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -244,8 +239,7 @@ $result_trees{'chapter_between_nodes_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -299,8 +293,7 @@ $result_trees{'chapter_between_nodes_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -352,8 +345,7 @@ $result_trees{'chapter_between_nodes_texi2html'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           }
         }
       ],
@@ -367,8 +359,7 @@ $result_trees{'chapter_between_nodes_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     }
   ],
diff --git a/tp/t/results/sectioning/chapter_between_nodes_with_appendix.pl 
b/tp/t/results/sectioning/chapter_between_nodes_with_appendix.pl
index 7db272ccf6..0e5ce077c7 100644
--- a/tp/t/results/sectioning/chapter_between_nodes_with_appendix.pl
+++ b/tp/t/results/sectioning/chapter_between_nodes_with_appendix.pl
@@ -39,8 +39,7 @@ $result_trees{'chapter_between_nodes_with_appendix'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -69,8 +68,7 @@ $result_trees{'chapter_between_nodes_with_appendix'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -163,8 +161,7 @@ $result_trees{'chapter_between_nodes_with_appendix'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -196,15 +193,13 @@ $result_trees{'chapter_between_nodes_with_appendix'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -223,8 +218,7 @@ $result_trees{'chapter_between_nodes_with_appendix'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -256,8 +250,7 @@ $result_trees{'chapter_between_nodes_with_appendix'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -288,8 +281,7 @@ $result_trees{'chapter_between_nodes_with_appendix'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     }
   ],
diff --git 
a/tp/t/results/sectioning/chapter_between_nodes_with_appendix_nomenu.pl 
b/tp/t/results/sectioning/chapter_between_nodes_with_appendix_nomenu.pl
index 7e6cdbe9c9..f634d2498e 100644
--- a/tp/t/results/sectioning/chapter_between_nodes_with_appendix_nomenu.pl
+++ b/tp/t/results/sectioning/chapter_between_nodes_with_appendix_nomenu.pl
@@ -39,8 +39,7 @@ $result_trees{'chapter_between_nodes_with_appendix_nomenu'} = 
{
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -69,8 +68,7 @@ $result_trees{'chapter_between_nodes_with_appendix_nomenu'} = 
{
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -163,8 +161,7 @@ $result_trees{'chapter_between_nodes_with_appendix_nomenu'} 
= {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -196,15 +193,13 @@ 
$result_trees{'chapter_between_nodes_with_appendix_nomenu'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -223,8 +218,7 @@ $result_trees{'chapter_between_nodes_with_appendix_nomenu'} 
= {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -256,8 +250,7 @@ $result_trees{'chapter_between_nodes_with_appendix_nomenu'} 
= {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -288,8 +281,7 @@ $result_trees{'chapter_between_nodes_with_appendix_nomenu'} 
= {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     }
   ],
diff --git a/tp/t/results/sectioning/chapter_node_before_and_after_part.pl 
b/tp/t/results/sectioning/chapter_node_before_and_after_part.pl
index 2086f5412b..6c198ef742 100644
--- a/tp/t/results/sectioning/chapter_node_before_and_after_part.pl
+++ b/tp/t/results/sectioning/chapter_node_before_and_after_part.pl
@@ -46,8 +46,7 @@ $result_trees{'chapter_node_before_and_after_part'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -131,8 +130,7 @@ $result_trees{'chapter_node_before_and_after_part'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -164,15 +162,13 @@ $result_trees{'chapter_node_before_and_after_part'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -191,8 +187,7 @@ $result_trees{'chapter_node_before_and_after_part'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -228,8 +223,7 @@ $result_trees{'chapter_node_before_and_after_part'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -261,8 +255,7 @@ $result_trees{'chapter_node_before_and_after_part'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -300,8 +293,7 @@ $result_trees{'chapter_node_before_and_after_part'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           }
         }
       ],
@@ -316,8 +308,7 @@ $result_trees{'chapter_node_before_and_after_part'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     }
   ],
@@ -485,7 +476,6 @@ $result_errors{'chapter_node_before_and_after_part'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'node `Top\' is up for `after\' in menu but not in sectioning',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/character_and_spaces_in_node.pl 
b/tp/t/results/sectioning/character_and_spaces_in_node.pl
index 4ba5a218d5..03650614ae 100644
--- a/tp/t/results/sectioning/character_and_spaces_in_node.pl
+++ b/tp/t/results/sectioning/character_and_spaces_in_node.pl
@@ -46,8 +46,7 @@ $result_trees{'character_and_spaces_in_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -140,8 +139,7 @@ $result_trees{'character_and_spaces_in_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -234,8 +232,7 @@ $result_trees{'character_and_spaces_in_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -318,8 +315,7 @@ $result_trees{'character_and_spaces_in_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -386,8 +382,7 @@ $result_trees{'character_and_spaces_in_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     }
   ],
diff --git a/tp/t/results/sectioning/contents_and_parts.pl 
b/tp/t/results/sectioning/contents_and_parts.pl
index 773db6b3e9..814b682b01 100644
--- a/tp/t/results/sectioning/contents_and_parts.pl
+++ b/tp/t/results/sectioning/contents_and_parts.pl
@@ -44,8 +44,7 @@ $result_trees{'contents_and_parts'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -129,8 +128,7 @@ $result_trees{'contents_and_parts'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -177,8 +175,7 @@ $result_trees{'contents_and_parts'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -225,8 +222,7 @@ $result_trees{'contents_and_parts'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -258,15 +254,13 @@ $result_trees{'contents_and_parts'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -283,8 +277,7 @@ $result_trees{'contents_and_parts'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -320,8 +313,7 @@ $result_trees{'contents_and_parts'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -353,8 +345,7 @@ $result_trees{'contents_and_parts'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -393,8 +384,7 @@ $result_trees{'contents_and_parts'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -426,8 +416,7 @@ $result_trees{'contents_and_parts'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -465,8 +454,7 @@ $result_trees{'contents_and_parts'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 16,
-        'macro' => ''
+        'line_nr' => 16
       }
     },
     {
@@ -502,8 +490,7 @@ $result_trees{'contents_and_parts'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 18,
-        'macro' => ''
+        'line_nr' => 18
       }
     },
     {
@@ -535,8 +522,7 @@ $result_trees{'contents_and_parts'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 20,
-        'macro' => ''
+        'line_nr' => 20
       }
     },
     {
@@ -574,8 +560,7 @@ $result_trees{'contents_and_parts'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           }
         },
         {
@@ -589,8 +574,7 @@ $result_trees{'contents_and_parts'} = {
           'cmdname' => 'shortcontents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 24,
-            'macro' => ''
+            'line_nr' => 24
           }
         }
       ],
@@ -605,8 +589,7 @@ $result_trees{'contents_and_parts'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 21,
-        'macro' => ''
+        'line_nr' => 21
       }
     }
   ],
diff --git a/tp/t/results/sectioning/contents_in_html_text.pl 
b/tp/t/results/sectioning/contents_in_html_text.pl
index a45b312209..d23c7b7bcd 100644
--- a/tp/t/results/sectioning/contents_in_html_text.pl
+++ b/tp/t/results/sectioning/contents_in_html_text.pl
@@ -43,8 +43,7 @@ $result_trees{'contents_in_html_text'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -82,8 +81,7 @@ $result_trees{'contents_in_html_text'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -121,8 +119,7 @@ $result_trees{'contents_in_html_text'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -160,8 +157,7 @@ $result_trees{'contents_in_html_text'} = {
           'cmdname' => 'shortcontents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -175,8 +171,7 @@ $result_trees{'contents_in_html_text'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         }
       ],
@@ -190,8 +185,7 @@ $result_trees{'contents_in_html_text'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     }
   ],
diff --git a/tp/t/results/sectioning/contents_with_only_top_node.pl 
b/tp/t/results/sectioning/contents_with_only_top_node.pl
index 835bcf1c6a..9f0c7fa297 100644
--- a/tp/t/results/sectioning/contents_with_only_top_node.pl
+++ b/tp/t/results/sectioning/contents_with_only_top_node.pl
@@ -60,8 +60,7 @@ $result_trees{'contents_with_only_top_node'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         }
       ],
@@ -76,8 +75,7 @@ $result_trees{'contents_with_only_top_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
diff --git a/tp/t/results/sectioning/double_node_anchor_float.pl 
b/tp/t/results/sectioning/double_node_anchor_float.pl
index 8762f77f88..ade099a857 100644
--- a/tp/t/results/sectioning/double_node_anchor_float.pl
+++ b/tp/t/results/sectioning/double_node_anchor_float.pl
@@ -46,8 +46,7 @@ $result_trees{'double_node_anchor_float'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -91,8 +90,7 @@ $result_trees{'double_node_anchor_float'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -123,8 +121,7 @@ $result_trees{'double_node_anchor_float'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -148,8 +145,7 @@ $result_trees{'double_node_anchor_float'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -234,8 +230,7 @@ $result_trees{'double_node_anchor_float'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
@@ -250,8 +245,7 @@ $result_trees{'double_node_anchor_float'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -317,8 +311,7 @@ $result_trees{'double_node_anchor_float'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
@@ -333,8 +326,7 @@ $result_trees{'double_node_anchor_float'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           }
         },
         {
@@ -400,8 +392,7 @@ $result_trees{'double_node_anchor_float'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             }
           ],
@@ -417,8 +408,7 @@ $result_trees{'double_node_anchor_float'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -437,8 +427,7 @@ $result_trees{'double_node_anchor_float'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -469,8 +458,7 @@ $result_trees{'double_node_anchor_float'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 20,
-        'macro' => ''
+        'line_nr' => 20
       }
     }
   ],
@@ -569,7 +557,6 @@ $result_errors{'double_node_anchor_float'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@node `anchor1\' previously defined',
     'type' => 'error'
   },
@@ -579,7 +566,6 @@ $result_errors{'double_node_anchor_float'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'here is the previous definition as @anchor',
     'type' => 'error'
   },
@@ -588,7 +574,6 @@ $result_errors{'double_node_anchor_float'} = [
 ',
     'file_name' => '',
     'line_nr' => 14,
-    'macro' => '',
     'text' => '@float `anchor1\' previously defined',
     'type' => 'error'
   },
@@ -598,7 +583,6 @@ $result_errors{'double_node_anchor_float'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'here is the previous definition as @anchor',
     'type' => 'error'
   },
@@ -607,7 +591,6 @@ $result_errors{'double_node_anchor_float'} = [
 ',
     'file_name' => '',
     'line_nr' => 20,
-    'macro' => '',
     'text' => '@node `float1\' previously defined',
     'type' => 'error'
   },
@@ -617,7 +600,6 @@ $result_errors{'double_node_anchor_float'} = [
 ',
     'file_name' => '',
     'line_nr' => 17,
-    'macro' => '',
     'text' => 'here is the previous definition as @float',
     'type' => 'error'
   },
@@ -626,7 +608,6 @@ $result_errors{'double_node_anchor_float'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@node `node1\' previously defined',
     'type' => 'error'
   },
@@ -636,7 +617,6 @@ $result_errors{'double_node_anchor_float'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'here is the previous definition as @node',
     'type' => 'error'
   },
@@ -645,7 +625,6 @@ $result_errors{'double_node_anchor_float'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@anchor `node1\' previously defined',
     'type' => 'error'
   },
@@ -655,7 +634,6 @@ $result_errors{'double_node_anchor_float'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'here is the previous definition as @node',
     'type' => 'error'
   },
@@ -664,7 +642,6 @@ $result_errors{'double_node_anchor_float'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => '@float `node1\' previously defined',
     'type' => 'error'
   },
@@ -674,7 +651,6 @@ $result_errors{'double_node_anchor_float'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'here is the previous definition as @node',
     'type' => 'error'
   }
diff --git a/tp/t/results/sectioning/double_part.pl 
b/tp/t/results/sectioning/double_part.pl
index 74f0b27bf1..d5d6927d86 100644
--- a/tp/t/results/sectioning/double_part.pl
+++ b/tp/t/results/sectioning/double_part.pl
@@ -89,8 +89,7 @@ $result_trees{'double_part'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -122,15 +121,13 @@ $result_trees{'double_part'} = [
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -147,8 +144,7 @@ $result_trees{'double_part'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     'unit_contents' => [
@@ -189,8 +185,7 @@ $result_trees{'double_part'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 1,
-          'macro' => ''
+          'line_nr' => 1
         }
       },
       {}
@@ -241,8 +236,7 @@ $result_trees{'double_part'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     'unit_contents' => [
@@ -320,8 +314,7 @@ $result_trees{'double_part'} = [
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         'section_number' => '1'
@@ -333,8 +326,7 @@ $result_trees{'double_part'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     'unit_contents' => [
@@ -368,8 +360,7 @@ $result_trees{'double_part'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 14,
-          'macro' => ''
+          'line_nr' => 14
         }
       },
       {}
@@ -819,7 +810,6 @@ $result_errors{'double_part'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => 'no sectioning command associated with @part',
     'type' => 'warning'
   },
@@ -828,7 +818,6 @@ $result_errors{'double_part'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => '@part not empty',
     'type' => 'warning'
   },
@@ -837,7 +826,6 @@ $result_errors{'double_part'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => '@part not empty',
     'type' => 'warning'
   }
diff --git 
a/tp/t/results/sectioning/double_recursive_self_section_node_reference.pl 
b/tp/t/results/sectioning/double_recursive_self_section_node_reference.pl
index 708fd34394..a993495771 100644
--- a/tp/t/results/sectioning/double_recursive_self_section_node_reference.pl
+++ b/tp/t/results/sectioning/double_recursive_self_section_node_reference.pl
@@ -44,8 +44,7 @@ $result_trees{'double_recursive_self_section_node_reference'} 
= {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -81,8 +80,7 @@ $result_trees{'double_recursive_self_section_node_reference'} 
= {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -114,8 +112,7 @@ 
$result_trees{'double_recursive_self_section_node_reference'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -144,8 +141,7 @@ 
$result_trees{'double_recursive_self_section_node_reference'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -176,8 +172,7 @@ 
$result_trees{'double_recursive_self_section_node_reference'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -209,8 +204,7 @@ 
$result_trees{'double_recursive_self_section_node_reference'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -235,8 +229,7 @@ 
$result_trees{'double_recursive_self_section_node_reference'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     }
   ],
@@ -376,7 +369,6 @@ 
$result_errors{'double_recursive_self_section_node_reference'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '@ref should not appear on @node line',
     'type' => 'warning'
   },
@@ -385,7 +377,6 @@ 
$result_errors{'double_recursive_self_section_node_reference'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@ref to `to node1\', different from node name `to 
@ref{node1}\'',
     'type' => 'warning'
   }
@@ -410,7 +401,6 @@ 
$result_converted_errors{'plaintext'}->{'double_recursive_self_section_node_refe
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@ref node name should not contain `:\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/double_recursive_self_section_reference.pl 
b/tp/t/results/sectioning/double_recursive_self_section_reference.pl
index 9a899851e3..29c0c15d3f 100644
--- a/tp/t/results/sectioning/double_recursive_self_section_reference.pl
+++ b/tp/t/results/sectioning/double_recursive_self_section_reference.pl
@@ -44,8 +44,7 @@ $result_trees{'double_recursive_self_section_reference'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -74,8 +73,7 @@ $result_trees{'double_recursive_self_section_reference'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -106,8 +104,7 @@ $result_trees{'double_recursive_self_section_reference'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -139,8 +136,7 @@ $result_trees{'double_recursive_self_section_reference'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -169,8 +165,7 @@ $result_trees{'double_recursive_self_section_reference'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -194,8 +189,7 @@ $result_trees{'double_recursive_self_section_reference'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
diff --git a/tp/t/results/sectioning/double_top.pl 
b/tp/t/results/sectioning/double_top.pl
index 96e82f400d..6db0ead4c8 100644
--- a/tp/t/results/sectioning/double_top.pl
+++ b/tp/t/results/sectioning/double_top.pl
@@ -65,8 +65,7 @@ $result_trees{'double_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -145,8 +144,7 @@ $result_trees{'double_top'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -169,8 +167,7 @@ $result_trees{'double_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     }
   ],
@@ -237,7 +234,6 @@ $result_errors{'double_top'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@node `top\' previously defined',
     'type' => 'error'
   },
@@ -247,7 +243,6 @@ $result_errors{'double_top'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'here is the previous definition as @node',
     'type' => 'error'
   },
@@ -256,7 +251,6 @@ $result_errors{'double_top'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@anchor `TOP\' previously defined',
     'type' => 'error'
   },
@@ -266,7 +260,6 @@ $result_errors{'double_top'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'here is the previous definition as @node',
     'type' => 'error'
   },
@@ -275,7 +268,6 @@ $result_errors{'double_top'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'Next pointer `top\' (for node `ToP\') different from node name 
`ToP\'',
     'type' => 'warning'
   },
@@ -284,7 +276,6 @@ $result_errors{'double_top'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'Up pointer `Top\' (for node `top\') different from node name 
`ToP\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/double_top_in_menu.pl 
b/tp/t/results/sectioning/double_top_in_menu.pl
index d13d23c058..e29bf6b222 100644
--- a/tp/t/results/sectioning/double_top_in_menu.pl
+++ b/tp/t/results/sectioning/double_top_in_menu.pl
@@ -119,8 +119,7 @@ $result_trees{'double_top_in_menu'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -167,8 +166,7 @@ $result_trees{'double_top_in_menu'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -200,15 +198,13 @@ $result_trees{'double_top_in_menu'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -228,8 +224,7 @@ $result_trees{'double_top_in_menu'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -306,8 +301,7 @@ $result_trees{'double_top_in_menu'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     }
   ],
@@ -395,7 +389,6 @@ $result_errors{'double_top_in_menu'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@node `top\' previously defined',
     'type' => 'error'
   },
@@ -405,7 +398,6 @@ $result_errors{'double_top_in_menu'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'here is the previous definition as @node',
     'type' => 'error'
   },
@@ -414,7 +406,6 @@ $result_errors{'double_top_in_menu'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'Next pointer `top\' (for node `ToP\') different from node name 
`ToP\'',
     'type' => 'warning'
   },
@@ -423,7 +414,6 @@ $result_errors{'double_top_in_menu'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'Up pointer `Top\' (for node `top\') different from node name 
`ToP\'',
     'type' => 'warning'
   },
@@ -432,7 +422,6 @@ $result_errors{'double_top_in_menu'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@menu entry node name `top\' different from node name `ToP\'',
     'type' => 'warning'
   },
@@ -441,7 +430,6 @@ $result_errors{'double_top_in_menu'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => '@menu entry node name `TOP\' different from node name `ToP\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/double_top_section.pl 
b/tp/t/results/sectioning/double_top_section.pl
index 389b4867c4..449893ca93 100644
--- a/tp/t/results/sectioning/double_top_section.pl
+++ b/tp/t/results/sectioning/double_top_section.pl
@@ -57,8 +57,7 @@ $result_trees{'double_top_section'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -103,8 +102,7 @@ $result_trees{'double_top_section'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
@@ -172,7 +170,6 @@ $result_errors{'double_top_section'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'multiple @top',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/email_in_node.pl 
b/tp/t/results/sectioning/email_in_node.pl
index 08962778a7..17d103df37 100644
--- a/tp/t/results/sectioning/email_in_node.pl
+++ b/tp/t/results/sectioning/email_in_node.pl
@@ -36,8 +36,7 @@ $result_trees{'email_in_node'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -75,8 +74,7 @@ $result_trees{'email_in_node'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -109,8 +107,7 @@ $result_trees{'email_in_node'} = {
               'cmdname' => 'email',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -135,8 +132,7 @@ $result_trees{'email_in_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
diff --git a/tp/t/results/sectioning/empty_anchor.pl 
b/tp/t/results/sectioning/empty_anchor.pl
index c7b176247e..1bdbd0a7d8 100644
--- a/tp/t/results/sectioning/empty_anchor.pl
+++ b/tp/t/results/sectioning/empty_anchor.pl
@@ -18,8 +18,7 @@ $result_trees{'empty_anchor'} = {
           'cmdname' => 'anchor',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -42,8 +41,7 @@ $result_trees{'empty_anchor'} = {
               'cmdname' => 'anchor',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -75,7 +73,6 @@ $result_errors{'empty_anchor'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'empty argument in @anchor',
     'type' => 'error'
   },
@@ -84,7 +81,6 @@ $result_errors{'empty_anchor'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'empty argument in @anchor',
     'type' => 'error'
   }
diff --git a/tp/t/results/sectioning/empty_node.pl 
b/tp/t/results/sectioning/empty_node.pl
index 1baeac85ef..3db4e2202e 100644
--- a/tp/t/results/sectioning/empty_node.pl
+++ b/tp/t/results/sectioning/empty_node.pl
@@ -32,8 +32,7 @@ $result_trees{'empty_node'} = {
       ],
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -117,8 +116,7 @@ $result_trees{'empty_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     }
   ],
@@ -143,7 +141,6 @@ $result_errors{'empty_node'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'empty argument in @node',
     'type' => 'error'
   },
@@ -152,7 +149,6 @@ $result_errors{'empty_node'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'empty argument in @node',
     'type' => 'error'
   }
diff --git a/tp/t/results/sectioning/empty_nodes_with_commands.pl 
b/tp/t/results/sectioning/empty_nodes_with_commands.pl
index 5133410aea..014b5ebf67 100644
--- a/tp/t/results/sectioning/empty_nodes_with_commands.pl
+++ b/tp/t/results/sectioning/empty_nodes_with_commands.pl
@@ -50,8 +50,7 @@ $result_trees{'empty_nodes_with_commands'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -74,8 +73,7 @@ $result_trees{'empty_nodes_with_commands'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -103,8 +101,7 @@ $result_trees{'empty_nodes_with_commands'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -125,8 +122,7 @@ $result_trees{'empty_nodes_with_commands'} = {
               'cmdname' => 'asis',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -147,8 +143,7 @@ $result_trees{'empty_nodes_with_commands'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     }
   ],
@@ -174,7 +169,6 @@ $result_errors{'empty_nodes_with_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'empty argument in @node',
     'type' => 'error'
   },
@@ -184,7 +178,6 @@ $result_errors{'empty_nodes_with_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'empty node name after expansion `@
 \'',
     'type' => 'error'
@@ -194,7 +187,6 @@ $result_errors{'empty_nodes_with_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'empty node name after expansion `@:\'',
     'type' => 'error'
   },
@@ -203,7 +195,6 @@ $result_errors{'empty_nodes_with_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'empty node name after expansion `@asis{ }\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/sectioning/empty_ref_arg.pl 
b/tp/t/results/sectioning/empty_ref_arg.pl
index 57c43e2fb9..2a5ccf7f0d 100644
--- a/tp/t/results/sectioning/empty_ref_arg.pl
+++ b/tp/t/results/sectioning/empty_ref_arg.pl
@@ -71,8 +71,7 @@ $result_trees{'empty_ref_arg'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -122,8 +121,7 @@ $result_trees{'empty_ref_arg'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -178,8 +176,7 @@ $result_trees{'empty_ref_arg'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -278,8 +275,7 @@ $result_trees{'empty_ref_arg'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -301,8 +297,7 @@ $result_trees{'empty_ref_arg'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
@@ -357,7 +352,6 @@ $result_errors{'empty_ref_arg'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'in @ref empty cross reference name after expansion `@ \'',
     'type' => 'warning'
   },
@@ -366,7 +360,6 @@ $result_errors{'empty_ref_arg'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'in @ref empty cross reference title after expansion `@ \'',
     'type' => 'warning'
   },
@@ -375,7 +368,6 @@ $result_errors{'empty_ref_arg'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'in @ref empty cross reference name after expansion `@ \'',
     'type' => 'warning'
   },
@@ -384,7 +376,6 @@ $result_errors{'empty_ref_arg'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'in @ref empty cross reference title after expansion `@:\'',
     'type' => 'warning'
   },
@@ -396,7 +387,6 @@ $result_errors{'empty_ref_arg'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'in @ref empty cross reference name after expansion `@c aaa
  @ 
 @c ggg
@@ -410,7 +400,6 @@ $result_errors{'empty_ref_arg'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'in @ref empty cross reference title after expansion `@c fff
 @c
 \'',
diff --git a/tp/t/results/sectioning/empty_refs.pl 
b/tp/t/results/sectioning/empty_refs.pl
index 071336d2a8..1f5ac578c1 100644
--- a/tp/t/results/sectioning/empty_refs.pl
+++ b/tp/t/results/sectioning/empty_refs.pl
@@ -32,8 +32,7 @@ $result_trees{'empty_refs'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -58,8 +57,7 @@ $result_trees{'empty_refs'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -77,8 +75,7 @@ $result_trees{'empty_refs'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -112,7 +109,6 @@ $result_errors{'empty_refs'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@xref reference to nonexistent node `@:\'',
     'type' => 'error'
   },
@@ -121,7 +117,6 @@ $result_errors{'empty_refs'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@xref reference to nonexistent node `@asis{ }\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/sectioning/equivalent_labels.pl 
b/tp/t/results/sectioning/equivalent_labels.pl
index de65bf8ea1..fa6283c68e 100644
--- a/tp/t/results/sectioning/equivalent_labels.pl
+++ b/tp/t/results/sectioning/equivalent_labels.pl
@@ -52,8 +52,7 @@ $result_trees{'equivalent_labels'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   }
                 }
               ],
@@ -67,8 +66,7 @@ $result_trees{'equivalent_labels'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -152,8 +150,7 @@ $result_trees{'equivalent_labels'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -169,8 +166,7 @@ $result_trees{'equivalent_labels'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -235,8 +231,7 @@ $result_trees{'equivalent_labels'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'menu_entry'
             },
@@ -262,8 +257,7 @@ $result_trees{'equivalent_labels'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     }
                   ],
@@ -298,8 +292,7 @@ $result_trees{'equivalent_labels'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -331,15 +324,13 @@ $result_trees{'equivalent_labels'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         }
       ],
@@ -354,8 +345,7 @@ $result_trees{'equivalent_labels'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
@@ -415,7 +405,6 @@ $result_errors{'equivalent_labels'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => '@menu entry node name `anch\' different from anchor name 
`@samp{anch}\'',
     'type' => 'warning'
   },
@@ -424,7 +413,6 @@ $result_errors{'equivalent_labels'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => '@menu entry node name `@code{floa}\' different from float name 
`floa\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/equivalent_nodes.pl 
b/tp/t/results/sectioning/equivalent_nodes.pl
index 3c70a4ad78..4d6d4a64b7 100644
--- a/tp/t/results/sectioning/equivalent_nodes.pl
+++ b/tp/t/results/sectioning/equivalent_nodes.pl
@@ -36,8 +36,7 @@ $result_trees{'equivalent_nodes'} = {
               'cmdname' => 'emph',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -104,8 +103,7 @@ $result_trees{'equivalent_nodes'} = {
                       'cmdname' => 'strong',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     }
                   ],
@@ -140,8 +138,7 @@ $result_trees{'equivalent_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -173,15 +170,13 @@ $result_trees{'equivalent_nodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -201,8 +196,7 @@ $result_trees{'equivalent_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -223,8 +217,7 @@ $result_trees{'equivalent_nodes'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -268,8 +261,7 @@ $result_trees{'equivalent_nodes'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -291,8 +283,7 @@ $result_trees{'equivalent_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     }
   ],
@@ -370,7 +361,6 @@ $result_errors{'equivalent_nodes'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@xref to `node\', different from node name `@samp{node}\'',
     'type' => 'warning'
   },
@@ -379,7 +369,6 @@ $result_errors{'equivalent_nodes'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'Next pointer `@emph{node}\' (for node `first\') different from 
node name `@samp{node}\'',
     'type' => 'warning'
   },
@@ -388,7 +377,6 @@ $result_errors{'equivalent_nodes'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '@menu entry node name `@strong{node}\' different from node name 
`@samp{node}\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/equivalent_nodes_novalidate.pl 
b/tp/t/results/sectioning/equivalent_nodes_novalidate.pl
index 6e992e13de..649d2807e6 100644
--- a/tp/t/results/sectioning/equivalent_nodes_novalidate.pl
+++ b/tp/t/results/sectioning/equivalent_nodes_novalidate.pl
@@ -20,8 +20,7 @@ $result_trees{'equivalent_nodes_novalidate'} = {
           'cmdname' => 'novalidate',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -58,8 +57,7 @@ $result_trees{'equivalent_nodes_novalidate'} = {
               'cmdname' => 'emph',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -126,8 +124,7 @@ $result_trees{'equivalent_nodes_novalidate'} = {
                       'cmdname' => 'strong',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     }
                   ],
@@ -162,8 +159,7 @@ $result_trees{'equivalent_nodes_novalidate'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -195,15 +191,13 @@ $result_trees{'equivalent_nodes_novalidate'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -223,8 +217,7 @@ $result_trees{'equivalent_nodes_novalidate'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -245,8 +238,7 @@ $result_trees{'equivalent_nodes_novalidate'} = {
               'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
@@ -290,8 +282,7 @@ $result_trees{'equivalent_nodes_novalidate'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -313,8 +304,7 @@ $result_trees{'equivalent_nodes_novalidate'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     }
   ],
diff --git a/tp/t/results/sectioning/explicit_node_directions.pl 
b/tp/t/results/sectioning/explicit_node_directions.pl
index cbc0561ca8..9fc65635c7 100644
--- a/tp/t/results/sectioning/explicit_node_directions.pl
+++ b/tp/t/results/sectioning/explicit_node_directions.pl
@@ -92,8 +92,7 @@ $result_trees{'explicit_node_directions'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -140,8 +139,7 @@ $result_trees{'explicit_node_directions'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -173,15 +171,13 @@ $result_trees{'explicit_node_directions'} = [
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -201,8 +197,7 @@ $result_trees{'explicit_node_directions'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     'unit_contents' => [
@@ -317,8 +312,7 @@ $result_trees{'explicit_node_directions'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     'unit_contents' => [
@@ -391,8 +385,7 @@ $result_trees{'explicit_node_directions'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     'unit_contents' => [
diff --git a/tp/t/results/sectioning/external_node_in_menu.pl 
b/tp/t/results/sectioning/external_node_in_menu.pl
index 440379af9b..d1c6c1bc6e 100644
--- a/tp/t/results/sectioning/external_node_in_menu.pl
+++ b/tp/t/results/sectioning/external_node_in_menu.pl
@@ -39,8 +39,7 @@ $result_trees{'external_node_in_menu'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -124,8 +123,7 @@ $result_trees{'external_node_in_menu'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -186,8 +184,7 @@ $result_trees{'external_node_in_menu'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -234,8 +231,7 @@ $result_trees{'external_node_in_menu'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -267,15 +263,13 @@ $result_trees{'external_node_in_menu'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -292,8 +286,7 @@ $result_trees{'external_node_in_menu'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -325,8 +318,7 @@ $result_trees{'external_node_in_menu'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -364,8 +356,7 @@ $result_trees{'external_node_in_menu'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -397,8 +388,7 @@ $result_trees{'external_node_in_menu'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -429,8 +419,7 @@ $result_trees{'external_node_in_menu'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     }
   ],
diff --git a/tp/t/results/sectioning/hole_in_sectioning.pl 
b/tp/t/results/sectioning/hole_in_sectioning.pl
index 13b919984e..c1f563c741 100644
--- a/tp/t/results/sectioning/hole_in_sectioning.pl
+++ b/tp/t/results/sectioning/hole_in_sectioning.pl
@@ -43,8 +43,7 @@ $result_trees{'hole_in_sectioning'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -82,8 +81,7 @@ $result_trees{'hole_in_sectioning'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -121,8 +119,7 @@ $result_trees{'hole_in_sectioning'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -160,8 +157,7 @@ $result_trees{'hole_in_sectioning'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -192,8 +188,7 @@ $result_trees{'hole_in_sectioning'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     }
   ],
@@ -309,7 +304,6 @@ $result_errors{'hole_in_sectioning'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'raising the section level of @subsubsection which is too low',
     'type' => 'error'
   }
diff --git a/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node.pl 
b/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node.pl
index 9533f2808f..32349a2951 100644
--- a/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node.pl
+++ b/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node.pl
@@ -43,8 +43,7 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = {
       },
       "source_info" => {
         "file_name" => "in_menu_only_special_ascii_spaces_node.texi",
-        "line_nr" => 1,
-        "macro" => ""
+        "line_nr" => 1
       }
     },
     {
@@ -111,8 +110,7 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = {
               ],
               "source_info" => {
                 "file_name" => "in_menu_only_special_ascii_spaces_node.texi",
-                "line_nr" => 5,
-                "macro" => ""
+                "line_nr" => 5
               },
               "type" => "menu_entry"
             },
@@ -145,8 +143,7 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = {
               ],
               "source_info" => {
                 "file_name" => "in_menu_only_special_ascii_spaces_node.texi",
-                "line_nr" => 6,
-                "macro" => ""
+                "line_nr" => 6
               },
               "type" => "menu_entry"
             },
@@ -177,15 +174,13 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = 
{
               },
               "source_info" => {
                 "file_name" => "in_menu_only_special_ascii_spaces_node.texi",
-                "line_nr" => 7,
-                "macro" => ""
+                "line_nr" => 7
               }
             }
           ],
           "source_info" => {
             "file_name" => "in_menu_only_special_ascii_spaces_node.texi",
-            "line_nr" => 4,
-            "macro" => ""
+            "line_nr" => 4
           }
         },
         {
@@ -201,8 +196,7 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = {
       },
       "source_info" => {
         "file_name" => "in_menu_only_special_ascii_spaces_node.texi",
-        "line_nr" => 2,
-        "macro" => ""
+        "line_nr" => 2
       }
     },
     {
@@ -220,8 +214,7 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = {
       "extra" => {},
       "source_info" => {
         "file_name" => "in_menu_only_special_ascii_spaces_node.texi",
-        "line_nr" => 9,
-        "macro" => ""
+        "line_nr" => 9
       }
     },
     {
@@ -257,8 +250,7 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = {
       },
       "source_info" => {
         "file_name" => "in_menu_only_special_ascii_spaces_node.texi",
-        "line_nr" => 10,
-        "macro" => ""
+        "line_nr" => 10
       }
     },
     {
@@ -276,8 +268,7 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = {
       "extra" => {},
       "source_info" => {
         "file_name" => "in_menu_only_special_ascii_spaces_node.texi",
-        "line_nr" => 12,
-        "macro" => ""
+        "line_nr" => 12
       }
     },
     {
@@ -313,8 +304,7 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = {
       },
       "source_info" => {
         "file_name" => "in_menu_only_special_ascii_spaces_node.texi",
-        "line_nr" => 13,
-        "macro" => ""
+        "line_nr" => 13
       }
     }
   ],
@@ -468,7 +458,6 @@ $result_errors{'in_menu_only_special_ascii_spaces_node'} = [
 ',
     'file_name' => 'in_menu_only_special_ascii_spaces_node.texi',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'empty node name in menu entry',
     'type' => 'error'
   },
@@ -477,7 +466,6 @@ $result_errors{'in_menu_only_special_ascii_spaces_node'} = [
 ',
     'file_name' => 'in_menu_only_special_ascii_spaces_node.texi',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'empty node name in menu entry',
     'type' => 'error'
   },
@@ -486,7 +474,6 @@ $result_errors{'in_menu_only_special_ascii_spaces_node'} = [
 ',
     'file_name' => 'in_menu_only_special_ascii_spaces_node.texi',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'empty argument in @node',
     'type' => 'error'
   },
@@ -495,7 +482,6 @@ $result_errors{'in_menu_only_special_ascii_spaces_node'} = [
 ',
     'file_name' => 'in_menu_only_special_ascii_spaces_node.texi',
     'line_nr' => 12,
-    'macro' => '',
     'text' => 'empty argument in @node',
     'type' => 'error'
   }
diff --git 
a/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node_menu.pl 
b/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node_menu.pl
index 6c9dcc7301..ee6e892326 100644
--- a/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node_menu.pl
+++ b/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node_menu.pl
@@ -43,8 +43,7 @@ $result_trees{'in_menu_only_special_ascii_spaces_node_menu'} 
= {
       },
       "source_info" => {
         "file_name" => "in_menu_only_special_ascii_spaces_node.texi",
-        "line_nr" => 1,
-        "macro" => ""
+        "line_nr" => 1
       }
     },
     {
@@ -111,8 +110,7 @@ 
$result_trees{'in_menu_only_special_ascii_spaces_node_menu'} = {
               ],
               "source_info" => {
                 "file_name" => "in_menu_only_special_ascii_spaces_node.texi",
-                "line_nr" => 5,
-                "macro" => ""
+                "line_nr" => 5
               },
               "type" => "menu_entry"
             },
@@ -145,8 +143,7 @@ 
$result_trees{'in_menu_only_special_ascii_spaces_node_menu'} = {
               ],
               "source_info" => {
                 "file_name" => "in_menu_only_special_ascii_spaces_node.texi",
-                "line_nr" => 6,
-                "macro" => ""
+                "line_nr" => 6
               },
               "type" => "menu_entry"
             },
@@ -177,15 +174,13 @@ 
$result_trees{'in_menu_only_special_ascii_spaces_node_menu'} = {
               },
               "source_info" => {
                 "file_name" => "in_menu_only_special_ascii_spaces_node.texi",
-                "line_nr" => 7,
-                "macro" => ""
+                "line_nr" => 7
               }
             }
           ],
           "source_info" => {
             "file_name" => "in_menu_only_special_ascii_spaces_node.texi",
-            "line_nr" => 4,
-            "macro" => ""
+            "line_nr" => 4
           }
         },
         {
@@ -201,8 +196,7 @@ 
$result_trees{'in_menu_only_special_ascii_spaces_node_menu'} = {
       },
       "source_info" => {
         "file_name" => "in_menu_only_special_ascii_spaces_node.texi",
-        "line_nr" => 2,
-        "macro" => ""
+        "line_nr" => 2
       }
     },
     {
@@ -220,8 +214,7 @@ 
$result_trees{'in_menu_only_special_ascii_spaces_node_menu'} = {
       "extra" => {},
       "source_info" => {
         "file_name" => "in_menu_only_special_ascii_spaces_node.texi",
-        "line_nr" => 9,
-        "macro" => ""
+        "line_nr" => 9
       }
     },
     {
@@ -257,8 +250,7 @@ 
$result_trees{'in_menu_only_special_ascii_spaces_node_menu'} = {
       },
       "source_info" => {
         "file_name" => "in_menu_only_special_ascii_spaces_node.texi",
-        "line_nr" => 10,
-        "macro" => ""
+        "line_nr" => 10
       }
     },
     {
@@ -276,8 +268,7 @@ 
$result_trees{'in_menu_only_special_ascii_spaces_node_menu'} = {
       "extra" => {},
       "source_info" => {
         "file_name" => "in_menu_only_special_ascii_spaces_node.texi",
-        "line_nr" => 12,
-        "macro" => ""
+        "line_nr" => 12
       }
     },
     {
@@ -313,8 +304,7 @@ 
$result_trees{'in_menu_only_special_ascii_spaces_node_menu'} = {
       },
       "source_info" => {
         "file_name" => "in_menu_only_special_ascii_spaces_node.texi",
-        "line_nr" => 13,
-        "macro" => ""
+        "line_nr" => 13
       }
     }
   ],
@@ -468,7 +458,6 @@ 
$result_errors{'in_menu_only_special_ascii_spaces_node_menu'} = [
 ',
     'file_name' => 'in_menu_only_special_ascii_spaces_node.texi',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'empty node name in menu entry',
     'type' => 'error'
   },
@@ -477,7 +466,6 @@ 
$result_errors{'in_menu_only_special_ascii_spaces_node_menu'} = [
 ',
     'file_name' => 'in_menu_only_special_ascii_spaces_node.texi',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'empty node name in menu entry',
     'type' => 'error'
   },
@@ -486,7 +474,6 @@ 
$result_errors{'in_menu_only_special_ascii_spaces_node_menu'} = [
 ',
     'file_name' => 'in_menu_only_special_ascii_spaces_node.texi',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'empty argument in @node',
     'type' => 'error'
   },
@@ -495,7 +482,6 @@ 
$result_errors{'in_menu_only_special_ascii_spaces_node_menu'} = [
 ',
     'file_name' => 'in_menu_only_special_ascii_spaces_node.texi',
     'line_nr' => 12,
-    'macro' => '',
     'text' => 'empty argument in @node',
     'type' => 'error'
   }
diff --git a/tp/t/results/sectioning/in_menu_only_special_spaces_node.pl 
b/tp/t/results/sectioning/in_menu_only_special_spaces_node.pl
index f5a0a5f291..bfc9c4191e 100644
--- a/tp/t/results/sectioning/in_menu_only_special_spaces_node.pl
+++ b/tp/t/results/sectioning/in_menu_only_special_spaces_node.pl
@@ -52,8 +52,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
       },
       "source_info" => {
         "file_name" => "in_menu_only_special_spaces_node.texi",
-        "line_nr" => 2,
-        "macro" => ""
+        "line_nr" => 2
       }
     },
     {
@@ -133,8 +132,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
               ],
               "source_info" => {
                 "file_name" => "in_menu_only_special_spaces_node.texi",
-                "line_nr" => 6,
-                "macro" => ""
+                "line_nr" => 6
               },
               "type" => "menu_entry"
             },
@@ -167,8 +165,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
               ],
               "source_info" => {
                 "file_name" => "in_menu_only_special_spaces_node.texi",
-                "line_nr" => 7,
-                "macro" => ""
+                "line_nr" => 7
               },
               "type" => "menu_entry"
             },
@@ -201,8 +198,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
               ],
               "source_info" => {
                 "file_name" => "in_menu_only_special_spaces_node.texi",
-                "line_nr" => 8,
-                "macro" => ""
+                "line_nr" => 8
               },
               "type" => "menu_entry"
             },
@@ -248,8 +244,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
               ],
               "source_info" => {
                 "file_name" => "in_menu_only_special_spaces_node.texi",
-                "line_nr" => 9,
-                "macro" => ""
+                "line_nr" => 9
               },
               "type" => "menu_entry"
             },
@@ -295,8 +290,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
               ],
               "source_info" => {
                 "file_name" => "in_menu_only_special_spaces_node.texi",
-                "line_nr" => 10,
-                "macro" => ""
+                "line_nr" => 10
               },
               "type" => "menu_entry"
             },
@@ -351,8 +345,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
               ],
               "source_info" => {
                 "file_name" => "in_menu_only_special_spaces_node.texi",
-                "line_nr" => 11,
-                "macro" => ""
+                "line_nr" => 11
               },
               "type" => "menu_entry"
             },
@@ -383,15 +376,13 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
               },
               "source_info" => {
                 "file_name" => "in_menu_only_special_spaces_node.texi",
-                "line_nr" => 13,
-                "macro" => ""
+                "line_nr" => 13
               }
             }
           ],
           "source_info" => {
             "file_name" => "in_menu_only_special_spaces_node.texi",
-            "line_nr" => 5,
-            "macro" => ""
+            "line_nr" => 5
           }
         },
         {
@@ -411,8 +402,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
       },
       "source_info" => {
         "file_name" => "in_menu_only_special_spaces_node.texi",
-        "line_nr" => 3,
-        "macro" => ""
+        "line_nr" => 3
       }
     },
     {
@@ -443,8 +433,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
       },
       "source_info" => {
         "file_name" => "in_menu_only_special_spaces_node.texi",
-        "line_nr" => 16,
-        "macro" => ""
+        "line_nr" => 16
       }
     },
     {
@@ -480,8 +469,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
       },
       "source_info" => {
         "file_name" => "in_menu_only_special_spaces_node.texi",
-        "line_nr" => 17,
-        "macro" => ""
+        "line_nr" => 17
       }
     },
     {
@@ -499,8 +487,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
       "extra" => {},
       "source_info" => {
         "file_name" => "in_menu_only_special_spaces_node.texi",
-        "line_nr" => 19,
-        "macro" => ""
+        "line_nr" => 19
       }
     },
     {
@@ -536,8 +523,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
       },
       "source_info" => {
         "file_name" => "in_menu_only_special_spaces_node.texi",
-        "line_nr" => 20,
-        "macro" => ""
+        "line_nr" => 20
       }
     },
     {
@@ -555,8 +541,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
       "extra" => {},
       "source_info" => {
         "file_name" => "in_menu_only_special_spaces_node.texi",
-        "line_nr" => 22,
-        "macro" => ""
+        "line_nr" => 22
       }
     },
     {
@@ -592,8 +577,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
       },
       "source_info" => {
         "file_name" => "in_menu_only_special_spaces_node.texi",
-        "line_nr" => 23,
-        "macro" => ""
+        "line_nr" => 23
       }
     },
     {
@@ -624,8 +608,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
       },
       "source_info" => {
         "file_name" => "in_menu_only_special_spaces_node.texi",
-        "line_nr" => 25,
-        "macro" => ""
+        "line_nr" => 25
       }
     },
     {
@@ -661,8 +644,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
       },
       "source_info" => {
         "file_name" => "in_menu_only_special_spaces_node.texi",
-        "line_nr" => 26,
-        "macro" => ""
+        "line_nr" => 26
       }
     },
     {
@@ -693,8 +675,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
       },
       "source_info" => {
         "file_name" => "in_menu_only_special_spaces_node.texi",
-        "line_nr" => 28,
-        "macro" => ""
+        "line_nr" => 28
       }
     },
     {
@@ -730,8 +711,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
       },
       "source_info" => {
         "file_name" => "in_menu_only_special_spaces_node.texi",
-        "line_nr" => 29,
-        "macro" => ""
+        "line_nr" => 29
       }
     },
     {
@@ -762,8 +742,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
       },
       "source_info" => {
         "file_name" => "in_menu_only_special_spaces_node.texi",
-        "line_nr" => 31,
-        "macro" => ""
+        "line_nr" => 31
       }
     },
     {
@@ -839,8 +818,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
       },
       "source_info" => {
         "file_name" => "in_menu_only_special_spaces_node.texi",
-        "line_nr" => 32,
-        "macro" => ""
+        "line_nr" => 32
       }
     },
     {
@@ -1281,7 +1259,6 @@ $result_errors{'in_menu_only_special_spaces_node'} = [
 ',
     'file_name' => 'in_menu_only_special_spaces_node.texi',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'empty node name in menu entry',
     'type' => 'error'
   },
@@ -1290,7 +1267,6 @@ $result_errors{'in_menu_only_special_spaces_node'} = [
 ',
     'file_name' => 'in_menu_only_special_spaces_node.texi',
     'line_nr' => 8,
-    'macro' => '',
     'text' => 'empty node name in menu entry',
     'type' => 'error'
   },
@@ -1299,7 +1275,6 @@ $result_errors{'in_menu_only_special_spaces_node'} = [
 ',
     'file_name' => 'in_menu_only_special_spaces_node.texi',
     'line_nr' => 19,
-    'macro' => '',
     'text' => 'empty argument in @node',
     'type' => 'error'
   },
@@ -1308,7 +1283,6 @@ $result_errors{'in_menu_only_special_spaces_node'} = [
 ',
     'file_name' => 'in_menu_only_special_spaces_node.texi',
     'line_nr' => 22,
-    'macro' => '',
     'text' => 'empty argument in @node',
     'type' => 'error'
   }
diff --git a/tp/t/results/sectioning/in_menu_only_special_spaces_node_menu.pl 
b/tp/t/results/sectioning/in_menu_only_special_spaces_node_menu.pl
index 107dafc328..1578b1179e 100644
--- a/tp/t/results/sectioning/in_menu_only_special_spaces_node_menu.pl
+++ b/tp/t/results/sectioning/in_menu_only_special_spaces_node_menu.pl
@@ -52,8 +52,7 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
       },
       "source_info" => {
         "file_name" => "in_menu_only_special_spaces_node.texi",
-        "line_nr" => 2,
-        "macro" => ""
+        "line_nr" => 2
       }
     },
     {
@@ -133,8 +132,7 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
               ],
               "source_info" => {
                 "file_name" => "in_menu_only_special_spaces_node.texi",
-                "line_nr" => 6,
-                "macro" => ""
+                "line_nr" => 6
               },
               "type" => "menu_entry"
             },
@@ -167,8 +165,7 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
               ],
               "source_info" => {
                 "file_name" => "in_menu_only_special_spaces_node.texi",
-                "line_nr" => 7,
-                "macro" => ""
+                "line_nr" => 7
               },
               "type" => "menu_entry"
             },
@@ -201,8 +198,7 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
               ],
               "source_info" => {
                 "file_name" => "in_menu_only_special_spaces_node.texi",
-                "line_nr" => 8,
-                "macro" => ""
+                "line_nr" => 8
               },
               "type" => "menu_entry"
             },
@@ -248,8 +244,7 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
               ],
               "source_info" => {
                 "file_name" => "in_menu_only_special_spaces_node.texi",
-                "line_nr" => 9,
-                "macro" => ""
+                "line_nr" => 9
               },
               "type" => "menu_entry"
             },
@@ -295,8 +290,7 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
               ],
               "source_info" => {
                 "file_name" => "in_menu_only_special_spaces_node.texi",
-                "line_nr" => 10,
-                "macro" => ""
+                "line_nr" => 10
               },
               "type" => "menu_entry"
             },
@@ -351,8 +345,7 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
               ],
               "source_info" => {
                 "file_name" => "in_menu_only_special_spaces_node.texi",
-                "line_nr" => 11,
-                "macro" => ""
+                "line_nr" => 11
               },
               "type" => "menu_entry"
             },
@@ -383,15 +376,13 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
               },
               "source_info" => {
                 "file_name" => "in_menu_only_special_spaces_node.texi",
-                "line_nr" => 13,
-                "macro" => ""
+                "line_nr" => 13
               }
             }
           ],
           "source_info" => {
             "file_name" => "in_menu_only_special_spaces_node.texi",
-            "line_nr" => 5,
-            "macro" => ""
+            "line_nr" => 5
           }
         },
         {
@@ -411,8 +402,7 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
       },
       "source_info" => {
         "file_name" => "in_menu_only_special_spaces_node.texi",
-        "line_nr" => 3,
-        "macro" => ""
+        "line_nr" => 3
       }
     },
     {
@@ -443,8 +433,7 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
       },
       "source_info" => {
         "file_name" => "in_menu_only_special_spaces_node.texi",
-        "line_nr" => 16,
-        "macro" => ""
+        "line_nr" => 16
       }
     },
     {
@@ -480,8 +469,7 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
       },
       "source_info" => {
         "file_name" => "in_menu_only_special_spaces_node.texi",
-        "line_nr" => 17,
-        "macro" => ""
+        "line_nr" => 17
       }
     },
     {
@@ -499,8 +487,7 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
       "extra" => {},
       "source_info" => {
         "file_name" => "in_menu_only_special_spaces_node.texi",
-        "line_nr" => 19,
-        "macro" => ""
+        "line_nr" => 19
       }
     },
     {
@@ -536,8 +523,7 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
       },
       "source_info" => {
         "file_name" => "in_menu_only_special_spaces_node.texi",
-        "line_nr" => 20,
-        "macro" => ""
+        "line_nr" => 20
       }
     },
     {
@@ -555,8 +541,7 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
       "extra" => {},
       "source_info" => {
         "file_name" => "in_menu_only_special_spaces_node.texi",
-        "line_nr" => 22,
-        "macro" => ""
+        "line_nr" => 22
       }
     },
     {
@@ -592,8 +577,7 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
       },
       "source_info" => {
         "file_name" => "in_menu_only_special_spaces_node.texi",
-        "line_nr" => 23,
-        "macro" => ""
+        "line_nr" => 23
       }
     },
     {
@@ -624,8 +608,7 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
       },
       "source_info" => {
         "file_name" => "in_menu_only_special_spaces_node.texi",
-        "line_nr" => 25,
-        "macro" => ""
+        "line_nr" => 25
       }
     },
     {
@@ -661,8 +644,7 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
       },
       "source_info" => {
         "file_name" => "in_menu_only_special_spaces_node.texi",
-        "line_nr" => 26,
-        "macro" => ""
+        "line_nr" => 26
       }
     },
     {
@@ -693,8 +675,7 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
       },
       "source_info" => {
         "file_name" => "in_menu_only_special_spaces_node.texi",
-        "line_nr" => 28,
-        "macro" => ""
+        "line_nr" => 28
       }
     },
     {
@@ -730,8 +711,7 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
       },
       "source_info" => {
         "file_name" => "in_menu_only_special_spaces_node.texi",
-        "line_nr" => 29,
-        "macro" => ""
+        "line_nr" => 29
       }
     },
     {
@@ -762,8 +742,7 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
       },
       "source_info" => {
         "file_name" => "in_menu_only_special_spaces_node.texi",
-        "line_nr" => 31,
-        "macro" => ""
+        "line_nr" => 31
       }
     },
     {
@@ -839,8 +818,7 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
       },
       "source_info" => {
         "file_name" => "in_menu_only_special_spaces_node.texi",
-        "line_nr" => 32,
-        "macro" => ""
+        "line_nr" => 32
       }
     },
     {
@@ -1281,7 +1259,6 @@ $result_errors{'in_menu_only_special_spaces_node_menu'} = 
[
 ',
     'file_name' => 'in_menu_only_special_spaces_node.texi',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'empty node name in menu entry',
     'type' => 'error'
   },
@@ -1290,7 +1267,6 @@ $result_errors{'in_menu_only_special_spaces_node_menu'} = 
[
 ',
     'file_name' => 'in_menu_only_special_spaces_node.texi',
     'line_nr' => 8,
-    'macro' => '',
     'text' => 'empty node name in menu entry',
     'type' => 'error'
   },
@@ -1299,7 +1275,6 @@ $result_errors{'in_menu_only_special_spaces_node_menu'} = 
[
 ',
     'file_name' => 'in_menu_only_special_spaces_node.texi',
     'line_nr' => 19,
-    'macro' => '',
     'text' => 'empty argument in @node',
     'type' => 'error'
   },
@@ -1308,7 +1283,6 @@ $result_errors{'in_menu_only_special_spaces_node_menu'} = 
[
 ',
     'file_name' => 'in_menu_only_special_spaces_node.texi',
     'line_nr' => 22,
-    'macro' => '',
     'text' => 'empty argument in @node',
     'type' => 'error'
   }
diff --git a/tp/t/results/sectioning/lone_Top_node.pl 
b/tp/t/results/sectioning/lone_Top_node.pl
index f548b2a235..46d522c23c 100644
--- a/tp/t/results/sectioning/lone_Top_node.pl
+++ b/tp/t/results/sectioning/lone_Top_node.pl
@@ -35,8 +35,7 @@ $result_trees{'lone_Top_node'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     'unit_contents' => [
@@ -129,8 +128,7 @@ $result_trees{'lone_Top_node'} = [
                 ],
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 4,
-                  'macro' => ''
+                  'line_nr' => 4
                 },
                 'type' => 'menu_entry'
               },
@@ -162,15 +160,13 @@ $result_trees{'lone_Top_node'} = [
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 5,
-                  'macro' => ''
+                  'line_nr' => 5
                 }
               }
             ],
             'source_info' => {
               'file_name' => '',
-              'line_nr' => 3,
-              'macro' => ''
+              'line_nr' => 3
             }
           },
           {
@@ -190,8 +186,7 @@ $result_trees{'lone_Top_node'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 1,
-          'macro' => ''
+          'line_nr' => 1
         }
       },
       {
@@ -223,8 +218,7 @@ $result_trees{'lone_Top_node'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 7,
-          'macro' => ''
+          'line_nr' => 7
         }
       },
       {}
@@ -385,7 +379,6 @@ $result_errors{'lone_Top_node'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'node `Top\' is up for `First\' in menu but not in sectioning',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/lone_contents.pl 
b/tp/t/results/sectioning/lone_contents.pl
index 3b325bc344..9d3726a137 100644
--- a/tp/t/results/sectioning/lone_contents.pl
+++ b/tp/t/results/sectioning/lone_contents.pl
@@ -22,8 +22,7 @@ $result_trees{'lone_contents'} = {
               'cmdname' => 'contents',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
diff --git a/tp/t/results/sectioning/loop_nodes.pl 
b/tp/t/results/sectioning/loop_nodes.pl
index 597e976ad0..980b955b26 100644
--- a/tp/t/results/sectioning/loop_nodes.pl
+++ b/tp/t/results/sectioning/loop_nodes.pl
@@ -44,8 +44,7 @@ $result_trees{'loop_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -129,8 +128,7 @@ $result_trees{'loop_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -162,15 +160,13 @@ $result_trees{'loop_nodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -187,8 +183,7 @@ $result_trees{'loop_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -294,8 +289,7 @@ $result_trees{'loop_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               },
               'type' => 'menu_entry'
             },
@@ -327,15 +321,13 @@ $result_trees{'loop_nodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -355,8 +347,7 @@ $result_trees{'loop_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -462,8 +453,7 @@ $result_trees{'loop_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               },
               'type' => 'menu_entry'
             },
@@ -495,15 +485,13 @@ $result_trees{'loop_nodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           }
         },
         {
@@ -523,8 +511,7 @@ $result_trees{'loop_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -556,8 +543,7 @@ $result_trees{'loop_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 20,
-        'macro' => ''
+        'line_nr' => 20
       }
     }
   ],
@@ -726,7 +712,6 @@ $result_errors{'loop_nodes'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => 'node up pointer for `chap node up\' is `node down\' but up is 
`Top\' in menu',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/menutextorder.pl 
b/tp/t/results/sectioning/menutextorder.pl
index 18717e3acc..8e6a9eaf29 100644
--- a/tp/t/results/sectioning/menutextorder.pl
+++ b/tp/t/results/sectioning/menutextorder.pl
@@ -66,8 +66,7 @@ $result_trees{'menutextorder'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               },
               'type' => 'menu_entry'
             },
@@ -114,8 +113,7 @@ $result_trees{'menutextorder'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               },
               'type' => 'menu_entry'
             },
@@ -147,15 +145,13 @@ $result_trees{'menutextorder'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -195,8 +191,7 @@ $result_trees{'menutextorder'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -280,8 +275,7 @@ $result_trees{'menutextorder'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'menu_entry'
             },
@@ -313,15 +307,13 @@ $result_trees{'menutextorder'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -340,8 +332,7 @@ $result_trees{'menutextorder'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -373,8 +364,7 @@ $result_trees{'menutextorder'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -412,8 +402,7 @@ $result_trees{'menutextorder'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -445,8 +434,7 @@ $result_trees{'menutextorder'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 16,
-        'macro' => ''
+        'line_nr' => 16
       }
     },
     {
@@ -489,8 +477,7 @@ $result_trees{'menutextorder'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -522,8 +509,7 @@ $result_trees{'menutextorder'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 20,
-        'macro' => ''
+        'line_nr' => 20
       }
     },
     {
@@ -607,8 +593,7 @@ $result_trees{'menutextorder'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               },
               'type' => 'menu_entry'
             },
@@ -655,8 +640,7 @@ $result_trees{'menutextorder'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               },
               'type' => 'menu_entry'
             },
@@ -703,8 +687,7 @@ $result_trees{'menutextorder'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               },
               'type' => 'menu_entry'
             },
@@ -736,15 +719,13 @@ $result_trees{'menutextorder'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           }
         },
         {
@@ -763,8 +744,7 @@ $result_trees{'menutextorder'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 21,
-        'macro' => ''
+        'line_nr' => 21
       }
     },
     {
@@ -796,8 +776,7 @@ $result_trees{'menutextorder'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 29,
-        'macro' => ''
+        'line_nr' => 29
       }
     },
     {
@@ -835,8 +814,7 @@ $result_trees{'menutextorder'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 30,
-        'macro' => ''
+        'line_nr' => 30
       }
     },
     {
@@ -868,8 +846,7 @@ $result_trees{'menutextorder'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 32,
-        'macro' => ''
+        'line_nr' => 32
       }
     },
     {
@@ -907,8 +884,7 @@ $result_trees{'menutextorder'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 33,
-        'macro' => ''
+        'line_nr' => 33
       }
     },
     {
@@ -940,8 +916,7 @@ $result_trees{'menutextorder'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 35,
-        'macro' => ''
+        'line_nr' => 35
       }
     },
     {
@@ -972,8 +947,7 @@ $result_trees{'menutextorder'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 36,
-        'macro' => ''
+        'line_nr' => 36
       }
     }
   ],
@@ -1401,7 +1375,6 @@ $result_errors{'menutextorder'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => 'node next for `onesub1\' is `onesub2\' in sectioning but not in 
menu',
     'type' => 'warning'
   },
@@ -1410,7 +1383,6 @@ $result_errors{'menutextorder'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => 'node up for `onesub1\' is `bar\' in sectioning but not in menu',
     'type' => 'warning'
   },
@@ -1419,7 +1391,6 @@ $result_errors{'menutextorder'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'node `bar\' lacks menu item for `onesub1\' despite being its Up 
target',
     'type' => 'warning'
   },
@@ -1428,7 +1399,6 @@ $result_errors{'menutextorder'} = [
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => 'node prev for `onesub2\' is `onesub1\' in sectioning but not in 
menu',
     'type' => 'warning'
   },
@@ -1437,7 +1407,6 @@ $result_errors{'menutextorder'} = [
 ',
     'file_name' => '',
     'line_nr' => 29,
-    'macro' => '',
     'text' => 'node next pointer for `sub1\' is `sub2\' but next is `sub3\' in 
menu',
     'type' => 'warning'
   },
@@ -1446,7 +1415,6 @@ $result_errors{'menutextorder'} = [
 ',
     'file_name' => '',
     'line_nr' => 32,
-    'macro' => '',
     'text' => 'node next for `sub2\' is `sub3\' in sectioning but not in menu',
     'type' => 'warning'
   },
@@ -1455,7 +1423,6 @@ $result_errors{'menutextorder'} = [
 ',
     'file_name' => '',
     'line_nr' => 32,
-    'macro' => '',
     'text' => 'node prev pointer for `sub2\' is `sub1\' but prev is `sub3\' in 
menu',
     'type' => 'warning'
   },
@@ -1464,7 +1431,6 @@ $result_errors{'menutextorder'} = [
 ',
     'file_name' => '',
     'line_nr' => 35,
-    'macro' => '',
     'text' => 'node `sub2\' is next for `sub3\' in menu but not in sectioning',
     'type' => 'warning'
   },
@@ -1473,7 +1439,6 @@ $result_errors{'menutextorder'} = [
 ',
     'file_name' => '',
     'line_nr' => 35,
-    'macro' => '',
     'text' => 'node prev pointer for `sub3\' is `sub2\' but prev is `sub1\' in 
menu',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/next_in_menu_is_below.pl 
b/tp/t/results/sectioning/next_in_menu_is_below.pl
index 3c4ab80574..4840402ed1 100644
--- a/tp/t/results/sectioning/next_in_menu_is_below.pl
+++ b/tp/t/results/sectioning/next_in_menu_is_below.pl
@@ -39,8 +39,7 @@ $result_trees{'next_in_menu_is_below'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -124,8 +123,7 @@ $result_trees{'next_in_menu_is_below'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -157,15 +155,13 @@ $result_trees{'next_in_menu_is_below'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -182,8 +178,7 @@ $result_trees{'next_in_menu_is_below'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -215,8 +210,7 @@ $result_trees{'next_in_menu_is_below'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -300,8 +294,7 @@ $result_trees{'next_in_menu_is_below'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
-                'macro' => ''
+                'line_nr' => 12
               },
               'type' => 'menu_entry'
             },
@@ -348,8 +341,7 @@ $result_trees{'next_in_menu_is_below'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               },
               'type' => 'menu_entry'
             },
@@ -381,15 +373,13 @@ $result_trees{'next_in_menu_is_below'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -408,8 +398,7 @@ $result_trees{'next_in_menu_is_below'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -441,8 +430,7 @@ $result_trees{'next_in_menu_is_below'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 16,
-        'macro' => ''
+        'line_nr' => 16
       }
     },
     {
@@ -526,8 +514,7 @@ $result_trees{'next_in_menu_is_below'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               },
               'type' => 'menu_entry'
             },
@@ -559,15 +546,13 @@ $result_trees{'next_in_menu_is_below'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         },
         {
@@ -586,8 +571,7 @@ $result_trees{'next_in_menu_is_below'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -619,8 +603,7 @@ $result_trees{'next_in_menu_is_below'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 23,
-        'macro' => ''
+        'line_nr' => 23
       }
     },
     {
@@ -651,8 +634,7 @@ $result_trees{'next_in_menu_is_below'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 24,
-        'macro' => ''
+        'line_nr' => 24
       }
     }
   ],
@@ -921,7 +903,6 @@ $result_errors{'next_in_menu_is_below'} = [
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => 'node `subsection\' is next for `section\' in menu but not in 
sectioning',
     'type' => 'warning'
   },
@@ -930,7 +911,6 @@ $result_errors{'next_in_menu_is_below'} = [
 ',
     'file_name' => '',
     'line_nr' => 23,
-    'macro' => '',
     'text' => 'node `section\' is prev for `subsection\' in menu but not in 
sectioning',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/next_no_prev_to_node.pl 
b/tp/t/results/sectioning/next_no_prev_to_node.pl
index 26664ca431..114a06d092 100644
--- a/tp/t/results/sectioning/next_no_prev_to_node.pl
+++ b/tp/t/results/sectioning/next_no_prev_to_node.pl
@@ -91,8 +91,7 @@ $result_trees{'next_no_prev_to_node'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -139,8 +138,7 @@ $result_trees{'next_no_prev_to_node'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -172,15 +170,13 @@ $result_trees{'next_no_prev_to_node'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -200,8 +196,7 @@ $result_trees{'next_no_prev_to_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -283,8 +278,7 @@ $result_trees{'next_no_prev_to_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -341,8 +335,7 @@ $result_trees{'next_no_prev_to_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     }
   ],
diff --git a/tp/t/results/sectioning/no_argument_and_contents.pl 
b/tp/t/results/sectioning/no_argument_and_contents.pl
index ee7c027eef..071962d60f 100644
--- a/tp/t/results/sectioning/no_argument_and_contents.pl
+++ b/tp/t/results/sectioning/no_argument_and_contents.pl
@@ -22,8 +22,7 @@ $result_trees{'no_argument_and_contents'} = {
               'cmdname' => 'contents',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -70,8 +69,7 @@ $result_trees{'no_argument_and_contents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -87,8 +85,7 @@ $result_trees{'no_argument_and_contents'} = {
               'cmdname' => 'asis',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -119,8 +116,7 @@ $result_trees{'no_argument_and_contents'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
diff --git a/tp/t/results/sectioning/no_menu.pl 
b/tp/t/results/sectioning/no_menu.pl
index b828c6f424..caf6fdee8c 100644
--- a/tp/t/results/sectioning/no_menu.pl
+++ b/tp/t/results/sectioning/no_menu.pl
@@ -39,8 +39,7 @@ $result_trees{'no_menu'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -66,8 +65,7 @@ $result_trees{'no_menu'} = {
       'extra' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -99,8 +97,7 @@ $result_trees{'no_menu'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -138,8 +135,7 @@ $result_trees{'no_menu'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -171,8 +167,7 @@ $result_trees{'no_menu'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -210,8 +205,7 @@ $result_trees{'no_menu'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -243,8 +237,7 @@ $result_trees{'no_menu'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -275,8 +268,7 @@ $result_trees{'no_menu'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     }
   ],
diff --git a/tp/t/results/sectioning/node_empty_direction.pl 
b/tp/t/results/sectioning/node_empty_direction.pl
index dab0b42782..e7a9712999 100644
--- a/tp/t/results/sectioning/node_empty_direction.pl
+++ b/tp/t/results/sectioning/node_empty_direction.pl
@@ -41,8 +41,7 @@ $result_trees{'node_empty_direction'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
diff --git a/tp/t/results/sectioning/node_line_arguments.pl 
b/tp/t/results/sectioning/node_line_arguments.pl
index d1b982e792..8e982bd791 100644
--- a/tp/t/results/sectioning/node_line_arguments.pl
+++ b/tp/t/results/sectioning/node_line_arguments.pl
@@ -46,8 +46,7 @@ $result_trees{'node_line_arguments'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -98,8 +97,7 @@ $result_trees{'node_line_arguments'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -171,8 +169,7 @@ $result_trees{'node_line_arguments'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -265,8 +262,7 @@ $result_trees{'node_line_arguments'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -366,8 +362,7 @@ $result_trees{'node_line_arguments'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -415,8 +410,7 @@ $result_trees{'node_line_arguments'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -435,8 +429,7 @@ $result_trees{'node_line_arguments'} = {
               'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -461,8 +454,7 @@ $result_trees{'node_line_arguments'} = {
               'cmdname' => ',',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -501,8 +493,7 @@ $result_trees{'node_line_arguments'} = {
               'cmdname' => 'strong',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
@@ -547,8 +538,7 @@ $result_trees{'node_line_arguments'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     }
   ],
@@ -674,7 +664,6 @@ $result_errors{'node_line_arguments'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'superfluous arguments for node',
     'type' => 'warning'
   },
@@ -683,7 +672,6 @@ $result_errors{'node_line_arguments'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'Next reference to nonexistent `two arg\'',
     'type' => 'error'
   },
@@ -692,7 +680,6 @@ $result_errors{'node_line_arguments'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'Next reference to nonexistent `two arg\'',
     'type' => 'error'
   },
@@ -701,7 +688,6 @@ $result_errors{'node_line_arguments'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'Prev reference to nonexistent `three arg\'',
     'type' => 'error'
   },
@@ -710,7 +696,6 @@ $result_errors{'node_line_arguments'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'Next reference to nonexistent `two arg\'',
     'type' => 'error'
   },
@@ -719,7 +704,6 @@ $result_errors{'node_line_arguments'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'Prev reference to nonexistent `three arg\'',
     'type' => 'error'
   },
@@ -728,7 +712,6 @@ $result_errors{'node_line_arguments'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'Up reference to nonexistent `four arg\'',
     'type' => 'error'
   },
@@ -737,7 +720,6 @@ $result_errors{'node_line_arguments'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'Next reference to nonexistent `two arg\'',
     'type' => 'error'
   },
@@ -746,7 +728,6 @@ $result_errors{'node_line_arguments'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'Prev reference to nonexistent `three arg\'',
     'type' => 'error'
   },
@@ -755,7 +736,6 @@ $result_errors{'node_line_arguments'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'Up reference to nonexistent `four arg five arg\'',
     'type' => 'error'
   },
@@ -764,7 +744,6 @@ $result_errors{'node_line_arguments'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => 'Next reference to nonexistent `@,cedilla\'',
     'type' => 'error'
   },
@@ -773,7 +752,6 @@ $result_errors{'node_line_arguments'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => 'Prev reference to nonexistent `@strong{comma in strong,}\'',
     'type' => 'error'
   },
@@ -782,7 +760,6 @@ $result_errors{'node_line_arguments'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'node `one arg2\' unreferenced',
     'type' => 'warning'
   },
@@ -791,7 +768,6 @@ $result_errors{'node_line_arguments'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'node `one arg3\' unreferenced',
     'type' => 'warning'
   },
@@ -800,7 +776,6 @@ $result_errors{'node_line_arguments'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'node `one arg4\' unreferenced',
     'type' => 'warning'
   },
@@ -809,7 +784,6 @@ $result_errors{'node_line_arguments'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'node `one arg5\' unreferenced',
     'type' => 'warning'
   },
@@ -818,7 +792,6 @@ $result_errors{'node_line_arguments'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => 'node `comment\' unreferenced',
     'type' => 'warning'
   },
@@ -827,7 +800,6 @@ $result_errors{'node_line_arguments'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => 'node `arg1 @comma{} arg2\' unreferenced',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/node_nested_parentheses.pl 
b/tp/t/results/sectioning/node_nested_parentheses.pl
index 8616656e7d..0de1bc0a0c 100644
--- a/tp/t/results/sectioning/node_nested_parentheses.pl
+++ b/tp/t/results/sectioning/node_nested_parentheses.pl
@@ -96,8 +96,7 @@ $result_trees{'node_nested_parentheses'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -158,8 +157,7 @@ $result_trees{'node_nested_parentheses'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -188,8 +186,7 @@ $result_trees{'node_nested_parentheses'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     },
                     {
@@ -238,8 +235,7 @@ $result_trees{'node_nested_parentheses'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -268,8 +264,7 @@ $result_trees{'node_nested_parentheses'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     },
                     {
@@ -309,8 +304,7 @@ $result_trees{'node_nested_parentheses'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -342,15 +336,13 @@ $result_trees{'node_nested_parentheses'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         }
       ],
@@ -365,8 +357,7 @@ $result_trees{'node_nested_parentheses'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
@@ -425,7 +416,6 @@ $result_errors{'node_nested_parentheses'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '@menu reference to nonexistent node `(@code{)))} error\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/sectioning/node_part_chapter_after_chapter.pl 
b/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
index 2338eabcd5..cec03c680c 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
@@ -88,8 +88,7 @@ $result_trees{'node_part_chapter_after_chapter'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -136,8 +135,7 @@ $result_trees{'node_part_chapter_after_chapter'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -169,15 +167,13 @@ $result_trees{'node_part_chapter_after_chapter'} = [
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -194,8 +190,7 @@ $result_trees{'node_part_chapter_after_chapter'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     'unit_contents' => [
@@ -231,8 +226,7 @@ $result_trees{'node_part_chapter_after_chapter'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 1,
-          'macro' => ''
+          'line_nr' => 1
         }
       },
       {}
@@ -275,8 +269,7 @@ $result_trees{'node_part_chapter_after_chapter'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     'unit_contents' => [
@@ -316,8 +309,7 @@ $result_trees{'node_part_chapter_after_chapter'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 9,
-          'macro' => ''
+          'line_nr' => 9
         }
       },
       {}
@@ -360,8 +352,7 @@ $result_trees{'node_part_chapter_after_chapter'} = [
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           }
         }
       ],
@@ -399,8 +390,7 @@ $result_trees{'node_part_chapter_after_chapter'} = [
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           }
         },
         'section_number' => '2'
@@ -412,8 +402,7 @@ $result_trees{'node_part_chapter_after_chapter'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 16,
-        'macro' => ''
+        'line_nr' => 16
       }
     },
     'unit_contents' => [
@@ -446,8 +435,7 @@ $result_trees{'node_part_chapter_after_chapter'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 13,
-          'macro' => ''
+          'line_nr' => 13
         }
       },
       {},
@@ -960,7 +948,6 @@ $result_errors{'node_part_chapter_after_chapter'} = [
 ',
     'file_name' => '',
     'line_nr' => 14,
-    'macro' => '',
     'text' => '@node precedes @part, but parts may not be associated with 
nodes',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/node_part_chapter_after_top.pl 
b/tp/t/results/sectioning/node_part_chapter_after_top.pl
index ca92ab4356..321e33307b 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_top.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_top.pl
@@ -88,8 +88,7 @@ $result_trees{'node_part_chapter_after_top'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -121,15 +120,13 @@ $result_trees{'node_part_chapter_after_top'} = [
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -146,8 +143,7 @@ $result_trees{'node_part_chapter_after_top'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     'unit_contents' => [
@@ -183,8 +179,7 @@ $result_trees{'node_part_chapter_after_top'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 1,
-          'macro' => ''
+          'line_nr' => 1
         }
       },
       {}
@@ -244,8 +239,7 @@ $result_trees{'node_part_chapter_after_top'} = [
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         'section_number' => '1'
@@ -257,8 +251,7 @@ $result_trees{'node_part_chapter_after_top'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     'unit_contents' => [
@@ -291,8 +284,7 @@ $result_trees{'node_part_chapter_after_top'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 8,
-          'macro' => ''
+          'line_nr' => 8
         }
       },
       {},
@@ -620,7 +612,6 @@ $result_errors{'node_part_chapter_after_top'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@node precedes @part, but parts may not be associated with 
nodes',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/node_referenced_in_ref.pl 
b/tp/t/results/sectioning/node_referenced_in_ref.pl
index 3d1b1936e2..8a89dc638f 100644
--- a/tp/t/results/sectioning/node_referenced_in_ref.pl
+++ b/tp/t/results/sectioning/node_referenced_in_ref.pl
@@ -91,8 +91,7 @@ $result_trees{'node_referenced_in_ref'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -124,15 +123,13 @@ $result_trees{'node_referenced_in_ref'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -164,8 +161,7 @@ $result_trees{'node_referenced_in_ref'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             },
             {
@@ -192,8 +188,7 @@ $result_trees{'node_referenced_in_ref'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -232,8 +227,7 @@ $result_trees{'node_referenced_in_ref'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -265,8 +259,7 @@ $result_trees{'node_referenced_in_ref'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     }
   ],
diff --git a/tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl 
b/tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl
index 0a46a09d8f..70e83d9c30 100644
--- a/tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl
+++ b/tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl
@@ -44,8 +44,7 @@ $result_trees{'node_sectop_before_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -81,8 +80,7 @@ $result_trees{'node_sectop_before_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -113,8 +111,7 @@ $result_trees{'node_sectop_before_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     }
   ],
diff --git a/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl 
b/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl
index 1648bf6ebf..460c957476 100644
--- a/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl
+++ b/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl
@@ -44,8 +44,7 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -95,8 +94,7 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -149,8 +147,7 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -182,8 +179,7 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -230,8 +226,7 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     }
   ],
diff --git a/tp/t/results/sectioning/node_simple.pl 
b/tp/t/results/sectioning/node_simple.pl
index 52ddb7899f..95c45878e0 100644
--- a/tp/t/results/sectioning/node_simple.pl
+++ b/tp/t/results/sectioning/node_simple.pl
@@ -33,8 +33,7 @@ $result_trees{'node_simple'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
diff --git a/tp/t/results/sectioning/node_too_much_args.pl 
b/tp/t/results/sectioning/node_too_much_args.pl
index 6b17ce258c..44d0a024ae 100644
--- a/tp/t/results/sectioning/node_too_much_args.pl
+++ b/tp/t/results/sectioning/node_too_much_args.pl
@@ -75,8 +75,7 @@ $result_trees{'node_too_much_args'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
@@ -120,7 +119,6 @@ $result_errors{'node_too_much_args'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'superfluous arguments for node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/node_up_direction_for_top_with_manual.pl 
b/tp/t/results/sectioning/node_up_direction_for_top_with_manual.pl
index bb9fdbc376..5006feecb6 100644
--- a/tp/t/results/sectioning/node_up_direction_for_top_with_manual.pl
+++ b/tp/t/results/sectioning/node_up_direction_for_top_with_manual.pl
@@ -75,8 +75,7 @@ $result_trees{'node_up_direction_for_top_with_manual'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
diff --git a/tp/t/results/sectioning/node_up_external_node.pl 
b/tp/t/results/sectioning/node_up_external_node.pl
index 16946e33fa..47097a4957 100644
--- a/tp/t/results/sectioning/node_up_external_node.pl
+++ b/tp/t/results/sectioning/node_up_external_node.pl
@@ -88,8 +88,7 @@ $result_trees{'node_up_external_node'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -121,15 +120,13 @@ $result_trees{'node_up_external_node'} = [
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -149,8 +146,7 @@ $result_trees{'node_up_external_node'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     'unit_contents' => [
@@ -275,8 +271,7 @@ $result_trees{'node_up_external_node'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     'unit_contents' => [
diff --git a/tp/t/results/sectioning/nodename_parentheses.pl 
b/tp/t/results/sectioning/nodename_parentheses.pl
index bbdf744d50..9e15d62b88 100644
--- a/tp/t/results/sectioning/nodename_parentheses.pl
+++ b/tp/t/results/sectioning/nodename_parentheses.pl
@@ -39,8 +39,7 @@ $result_trees{'nodename_parentheses'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -124,8 +123,7 @@ $result_trees{'nodename_parentheses'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -172,8 +170,7 @@ $result_trees{'nodename_parentheses'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -234,8 +231,7 @@ $result_trees{'nodename_parentheses'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -267,15 +263,13 @@ $result_trees{'nodename_parentheses'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -292,8 +286,7 @@ $result_trees{'nodename_parentheses'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -325,8 +318,7 @@ $result_trees{'nodename_parentheses'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -378,8 +370,7 @@ $result_trees{'nodename_parentheses'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -411,8 +402,7 @@ $result_trees{'nodename_parentheses'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -466,8 +456,7 @@ $result_trees{'nodename_parentheses'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -522,8 +511,7 @@ $result_trees{'nodename_parentheses'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
-                'macro' => ''
+                'line_nr' => 20
               }
             },
             {
@@ -549,8 +537,7 @@ $result_trees{'nodename_parentheses'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 16,
-        'macro' => ''
+        'line_nr' => 16
       }
     },
     {
@@ -582,8 +569,7 @@ $result_trees{'nodename_parentheses'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 22,
-        'macro' => ''
+        'line_nr' => 22
       }
     },
     {
@@ -642,8 +628,7 @@ $result_trees{'nodename_parentheses'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 27,
-            'macro' => ''
+            'line_nr' => 27
           }
         },
         {
@@ -671,8 +656,7 @@ $result_trees{'nodename_parentheses'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 23,
-        'macro' => ''
+        'line_nr' => 23
       }
     }
   ],
@@ -969,7 +953,6 @@ $result_errors{'nodename_parentheses'} = [
 ',
     'file_name' => '',
     'line_nr' => 22,
-    'macro' => '',
     'text' => 'syntax for an external node used for `(manual)node\'',
     'type' => 'error'
   },
@@ -978,7 +961,6 @@ $result_errors{'nodename_parentheses'} = [
 ',
     'file_name' => '',
     'line_nr' => 27,
-    'macro' => '',
     'text' => 'syntax for an external node used for `(manual)anchor\'',
     'type' => 'error'
   },
@@ -987,7 +969,6 @@ $result_errors{'nodename_parentheses'} = [
 ',
     'file_name' => '',
     'line_nr' => 22,
-    'macro' => '',
     'text' => 'node prev for `(manual)node\' is `Other node\' in sectioning 
but not in menu',
     'type' => 'warning'
   },
@@ -996,7 +977,6 @@ $result_errors{'nodename_parentheses'} = [
 ',
     'file_name' => '',
     'line_nr' => 22,
-    'macro' => '',
     'text' => 'node up for `(manual)node\' is `Top\' in sectioning but not in 
menu',
     'type' => 'warning'
   },
@@ -1005,7 +985,6 @@ $result_errors{'nodename_parentheses'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'node `Top\' lacks menu item for `(manual)node\' despite being 
its Up target',
     'type' => 'warning'
   }
diff --git 
a/tp/t/results/sectioning/nodes_after_top_before_chapter_no_use_nodes_chapter.pl
 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_no_use_nodes_chapter.pl
index b7865e5a3f..0f4628eddd 100644
--- 
a/tp/t/results/sectioning/nodes_after_top_before_chapter_no_use_nodes_chapter.pl
+++ 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_no_use_nodes_chapter.pl
@@ -100,8 +100,7 @@ 
$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -148,8 +147,7 @@ 
$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -181,15 +179,13 @@ 
$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -209,8 +205,7 @@ 
$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -316,8 +311,7 @@ 
$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -384,8 +378,7 @@ 
$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -416,8 +409,7 @@ 
$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     }
   ],
diff --git a/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl
index 1c97002a1b..38ebb79a72 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl
@@ -92,8 +92,7 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -140,8 +139,7 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -173,15 +171,13 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -201,8 +197,7 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     'unit_contents' => [
@@ -317,8 +312,7 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     'unit_contents' => [
@@ -391,8 +385,7 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     'unit_contents' => [
@@ -425,8 +418,7 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 13,
-          'macro' => ''
+          'line_nr' => 13
         }
       }
     ],
diff --git 
a/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split.pl 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split.pl
index 69ad902ece..463a29e25f 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split.pl
@@ -100,8 +100,7 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} = 
{
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -148,8 +147,7 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} = 
{
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -181,15 +179,13 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} 
= {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -209,8 +205,7 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} = 
{
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -316,8 +311,7 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} = 
{
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -384,8 +378,7 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} = 
{
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -416,8 +409,7 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} = 
{
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     }
   ],
diff --git 
a/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split_no_use_node_directions.pl
 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split_no_use_node_directions.pl
index 3994d9a9f1..2d02bad246 100644
--- 
a/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split_no_use_node_directions.pl
+++ 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split_no_use_node_directions.pl
@@ -100,8 +100,7 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -148,8 +147,7 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -181,15 +179,13 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -209,8 +205,7 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -316,8 +311,7 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -384,8 +378,7 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -416,8 +409,7 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     }
   ],
diff --git a/tp/t/results/sectioning/nodes_after_top_before_chapter_sections.pl 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_sections.pl
index f916321052..696a53a087 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_chapter_sections.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_chapter_sections.pl
@@ -35,8 +35,7 @@ $result_trees{'nodes_after_top_before_chapter_sections'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     'unit_contents' => [
@@ -128,8 +127,7 @@ $result_trees{'nodes_after_top_before_chapter_sections'} = [
                 ],
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 4,
-                  'macro' => ''
+                  'line_nr' => 4
                 },
                 'type' => 'menu_entry'
               },
@@ -176,8 +174,7 @@ $result_trees{'nodes_after_top_before_chapter_sections'} = [
                 ],
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 5,
-                  'macro' => ''
+                  'line_nr' => 5
                 },
                 'type' => 'menu_entry'
               },
@@ -209,15 +206,13 @@ $result_trees{'nodes_after_top_before_chapter_sections'} 
= [
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 6,
-                  'macro' => ''
+                  'line_nr' => 6
                 }
               }
             ],
             'source_info' => {
               'file_name' => '',
-              'line_nr' => 3,
-              'macro' => ''
+              'line_nr' => 3
             }
           },
           {
@@ -237,8 +232,7 @@ $result_trees{'nodes_after_top_before_chapter_sections'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 1,
-          'macro' => ''
+          'line_nr' => 1
         }
       },
       {
@@ -344,8 +338,7 @@ $result_trees{'nodes_after_top_before_chapter_sections'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 8,
-          'macro' => ''
+          'line_nr' => 8
         }
       },
       {
@@ -412,8 +405,7 @@ $result_trees{'nodes_after_top_before_chapter_sections'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 12,
-          'macro' => ''
+          'line_nr' => 12
         }
       },
       {}
diff --git 
a/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html.pl 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html.pl
index e7fdaa8fc9..4b9824d765 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html.pl
@@ -100,8 +100,7 @@ $result_trees{'nodes_after_top_before_chapter_texi2html'} = 
{
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -148,8 +147,7 @@ $result_trees{'nodes_after_top_before_chapter_texi2html'} = 
{
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -181,15 +179,13 @@ $result_trees{'nodes_after_top_before_chapter_texi2html'} 
= {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -209,8 +205,7 @@ $result_trees{'nodes_after_top_before_chapter_texi2html'} = 
{
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -316,8 +311,7 @@ $result_trees{'nodes_after_top_before_chapter_texi2html'} = 
{
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -384,8 +378,7 @@ $result_trees{'nodes_after_top_before_chapter_texi2html'} = 
{
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -416,8 +409,7 @@ $result_trees{'nodes_after_top_before_chapter_texi2html'} = 
{
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     }
   ],
diff --git 
a/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter.pl
 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter.pl
index dd33496913..a31fdea60d 100644
--- 
a/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter.pl
+++ 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter.pl
@@ -100,8 +100,7 @@ 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -148,8 +147,7 @@ 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -181,15 +179,13 @@ 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -209,8 +205,7 @@ 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -316,8 +311,7 @@ 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -384,8 +378,7 @@ 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -416,8 +409,7 @@ 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     }
   ],
diff --git a/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl 
b/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl
index bccb1d7f5e..1b1cb27a1f 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl
@@ -92,8 +92,7 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -140,8 +139,7 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -173,15 +171,13 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -201,8 +197,7 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     'unit_contents' => [
@@ -317,8 +312,7 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     'unit_contents' => [
@@ -391,8 +385,7 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     'unit_contents' => [
@@ -425,8 +418,7 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 13,
-          'macro' => ''
+          'line_nr' => 13
         }
       }
     ],
diff --git a/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl 
b/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl
index daeb0f550d..11bdc2d0c0 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl
@@ -35,8 +35,7 @@ $result_trees{'nodes_after_top_before_section_sections'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     'unit_contents' => [
@@ -128,8 +127,7 @@ $result_trees{'nodes_after_top_before_section_sections'} = [
                 ],
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 4,
-                  'macro' => ''
+                  'line_nr' => 4
                 },
                 'type' => 'menu_entry'
               },
@@ -176,8 +174,7 @@ $result_trees{'nodes_after_top_before_section_sections'} = [
                 ],
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 5,
-                  'macro' => ''
+                  'line_nr' => 5
                 },
                 'type' => 'menu_entry'
               },
@@ -209,15 +206,13 @@ $result_trees{'nodes_after_top_before_section_sections'} 
= [
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 6,
-                  'macro' => ''
+                  'line_nr' => 6
                 }
               }
             ],
             'source_info' => {
               'file_name' => '',
-              'line_nr' => 3,
-              'macro' => ''
+              'line_nr' => 3
             }
           },
           {
@@ -237,8 +232,7 @@ $result_trees{'nodes_after_top_before_section_sections'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 1,
-          'macro' => ''
+          'line_nr' => 1
         }
       },
       {
@@ -344,8 +338,7 @@ $result_trees{'nodes_after_top_before_section_sections'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 8,
-          'macro' => ''
+          'line_nr' => 8
         }
       },
       {
@@ -412,8 +405,7 @@ $result_trees{'nodes_after_top_before_section_sections'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 12,
-          'macro' => ''
+          'line_nr' => 12
         }
       },
       {}
diff --git 
a/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_chapter.pl 
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_chapter.pl
index 3f78c426ae..d659032873 100644
--- 
a/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_chapter.pl
+++ 
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_chapter.pl
@@ -100,8 +100,7 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -148,8 +147,7 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -181,15 +179,13 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -209,8 +205,7 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -316,8 +311,7 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -384,8 +378,7 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -416,8 +409,7 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     }
   ],
diff --git 
a/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes.pl 
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes.pl
index fd16625a57..3263134511 100644
--- 
a/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes.pl
+++ 
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes.pl
@@ -100,8 +100,7 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -148,8 +147,7 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -181,15 +179,13 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -209,8 +205,7 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -316,8 +311,7 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -384,8 +378,7 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -416,8 +409,7 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     }
   ],
diff --git 
a/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes_chapter.pl
 
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes_chapter.pl
index d67a224031..e4c09ba3b1 100644
--- 
a/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes_chapter.pl
+++ 
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes_chapter.pl
@@ -100,8 +100,7 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -148,8 +147,7 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -181,15 +179,13 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -209,8 +205,7 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -316,8 +311,7 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -384,8 +378,7 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -416,8 +409,7 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     }
   ],
diff --git a/tp/t/results/sectioning/nodes_before_after_top.pl 
b/tp/t/results/sectioning/nodes_before_after_top.pl
index 6862abf3b4..60389c193c 100644
--- a/tp/t/results/sectioning/nodes_before_after_top.pl
+++ b/tp/t/results/sectioning/nodes_before_after_top.pl
@@ -65,8 +65,7 @@ $result_trees{'nodes_before_after_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -98,8 +97,7 @@ $result_trees{'nodes_before_after_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -149,8 +147,7 @@ $result_trees{'nodes_before_after_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -203,8 +200,7 @@ $result_trees{'nodes_before_after_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -236,8 +232,7 @@ $result_trees{'nodes_before_after_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -284,8 +279,7 @@ $result_trees{'nodes_before_after_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     }
   ],
@@ -453,7 +447,6 @@ $result_errors{'nodes_before_after_top'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'node `node before\' unreferenced',
     'type' => 'warning'
   },
@@ -462,7 +455,6 @@ $result_errors{'nodes_before_after_top'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => 'node `after\' unreferenced',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/nodes_before_top.pl 
b/tp/t/results/sectioning/nodes_before_top.pl
index 1157fd724f..d4dc9f1791 100644
--- a/tp/t/results/sectioning/nodes_before_top.pl
+++ b/tp/t/results/sectioning/nodes_before_top.pl
@@ -146,8 +146,7 @@ $result_trees{'nodes_before_top'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -179,15 +178,13 @@ $result_trees{'nodes_before_top'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -207,8 +204,7 @@ $result_trees{'nodes_before_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -269,8 +265,7 @@ $result_trees{'nodes_before_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -321,8 +316,7 @@ $result_trees{'nodes_before_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -406,8 +400,7 @@ $result_trees{'nodes_before_top'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               },
               'type' => 'menu_entry'
             },
@@ -439,15 +432,13 @@ $result_trees{'nodes_before_top'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           }
         },
         {
@@ -464,8 +455,7 @@ $result_trees{'nodes_before_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -497,8 +487,7 @@ $result_trees{'nodes_before_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 16,
-        'macro' => ''
+        'line_nr' => 16
       }
     },
     {
@@ -529,8 +518,7 @@ $result_trees{'nodes_before_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     }
   ],
diff --git a/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl 
b/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl
index 2f449c722c..75a864d795 100644
--- a/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl
+++ b/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl
@@ -124,8 +124,7 @@ $result_trees{'nodes_no_node_top_explicit_directions'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -157,15 +156,13 @@ $result_trees{'nodes_no_node_top_explicit_directions'} = [
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -185,8 +182,7 @@ $result_trees{'nodes_no_node_top_explicit_directions'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     'unit_contents' => [
@@ -273,8 +269,7 @@ $result_trees{'nodes_no_node_top_explicit_directions'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     'unit_contents' => [
diff --git a/tp/t/results/sectioning/novalidate.pl 
b/tp/t/results/sectioning/novalidate.pl
index 2f42d30039..759a1934e5 100644
--- a/tp/t/results/sectioning/novalidate.pl
+++ b/tp/t/results/sectioning/novalidate.pl
@@ -25,8 +25,7 @@ $result_trees{'novalidate'} = {
           'cmdname' => 'novalidate',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -137,8 +136,7 @@ $result_trees{'novalidate'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -170,15 +168,13 @@ $result_trees{'novalidate'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -210,8 +206,7 @@ $result_trees{'novalidate'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -233,8 +228,7 @@ $result_trees{'novalidate'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     }
   ],
diff --git a/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl 
b/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl
index 609846e396..f9af32f942 100644
--- a/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl
+++ b/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl
@@ -93,8 +93,7 @@ $result_trees{'one_node_explicit_directions_anchor'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -136,8 +135,7 @@ $result_trees{'one_node_explicit_directions_anchor'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -159,8 +157,7 @@ $result_trees{'one_node_explicit_directions_anchor'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
diff --git 
a/tp/t/results/sectioning/one_node_explicit_directions_anchor_no_use_node.pl 
b/tp/t/results/sectioning/one_node_explicit_directions_anchor_no_use_node.pl
index 0bcabb221d..ca851a3044 100644
--- a/tp/t/results/sectioning/one_node_explicit_directions_anchor_no_use_node.pl
+++ b/tp/t/results/sectioning/one_node_explicit_directions_anchor_no_use_node.pl
@@ -93,8 +93,7 @@ 
$result_trees{'one_node_explicit_directions_anchor_no_use_node'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
@@ -136,8 +135,7 @@ 
$result_trees{'one_node_explicit_directions_anchor_no_use_node'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -159,8 +157,7 @@ 
$result_trees{'one_node_explicit_directions_anchor_no_use_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
diff --git a/tp/t/results/sectioning/one_subsection.pl 
b/tp/t/results/sectioning/one_subsection.pl
index 4be89fa4f6..88eb7fa060 100644
--- a/tp/t/results/sectioning/one_subsection.pl
+++ b/tp/t/results/sectioning/one_subsection.pl
@@ -43,8 +43,7 @@ $result_trees{'one_subsection'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
diff --git a/tp/t/results/sectioning/one_subsection_and_node.pl 
b/tp/t/results/sectioning/one_subsection_and_node.pl
index 148df0a6fa..430a18b06c 100644
--- a/tp/t/results/sectioning/one_subsection_and_node.pl
+++ b/tp/t/results/sectioning/one_subsection_and_node.pl
@@ -39,8 +39,7 @@ $result_trees{'one_subsection_and_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -71,8 +70,7 @@ $result_trees{'one_subsection_and_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
diff --git a/tp/t/results/sectioning/part_before_chapter.pl 
b/tp/t/results/sectioning/part_before_chapter.pl
index 51c0e5ecd9..ce8432e822 100644
--- a/tp/t/results/sectioning/part_before_chapter.pl
+++ b/tp/t/results/sectioning/part_before_chapter.pl
@@ -59,8 +59,7 @@ $result_trees{'part_before_chapter'} = [
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         'section_number' => '1'
@@ -72,8 +71,7 @@ $result_trees{'part_before_chapter'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     'unit_contents' => [
diff --git a/tp/t/results/sectioning/part_before_section.pl 
b/tp/t/results/sectioning/part_before_section.pl
index 78c9e9e1bd..5726d37a35 100644
--- a/tp/t/results/sectioning/part_before_section.pl
+++ b/tp/t/results/sectioning/part_before_section.pl
@@ -59,8 +59,7 @@ $result_trees{'part_before_section'} = [
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         'section_number' => '1'
@@ -72,8 +71,7 @@ $result_trees{'part_before_section'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     'unit_contents' => [
@@ -152,7 +150,6 @@ $result_errors{'part_before_section'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'raising the section level of @section which is too low',
     'type' => 'error'
   }
diff --git a/tp/t/results/sectioning/part_before_top.pl 
b/tp/t/results/sectioning/part_before_top.pl
index a9e0059310..8a4623b2ca 100644
--- a/tp/t/results/sectioning/part_before_top.pl
+++ b/tp/t/results/sectioning/part_before_top.pl
@@ -59,8 +59,7 @@ $result_trees{'part_before_top'} = [
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       },
@@ -71,8 +70,7 @@ $result_trees{'part_before_top'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     'unit_contents' => [
@@ -154,7 +152,6 @@ $result_errors{'part_before_top'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@part should not be associated with @top',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/part_chapter_after_top.pl 
b/tp/t/results/sectioning/part_chapter_after_top.pl
index d983390c8e..0531c55d36 100644
--- a/tp/t/results/sectioning/part_chapter_after_top.pl
+++ b/tp/t/results/sectioning/part_chapter_after_top.pl
@@ -88,8 +88,7 @@ $result_trees{'part_chapter_after_top'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -121,15 +120,13 @@ $result_trees{'part_chapter_after_top'} = [
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -146,8 +143,7 @@ $result_trees{'part_chapter_after_top'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     'unit_contents' => [
@@ -183,8 +179,7 @@ $result_trees{'part_chapter_after_top'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 1,
-          'macro' => ''
+          'line_nr' => 1
         }
       },
       {}
@@ -244,8 +239,7 @@ $result_trees{'part_chapter_after_top'} = [
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         'section_number' => '1'
@@ -257,8 +251,7 @@ $result_trees{'part_chapter_after_top'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     'unit_contents' => [
@@ -292,8 +285,7 @@ $result_trees{'part_chapter_after_top'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 10,
-          'macro' => ''
+          'line_nr' => 10
         }
       },
       {}
diff --git a/tp/t/results/sectioning/part_chapter_appendix.pl 
b/tp/t/results/sectioning/part_chapter_appendix.pl
index 172597a083..49005a977e 100644
--- a/tp/t/results/sectioning/part_chapter_appendix.pl
+++ b/tp/t/results/sectioning/part_chapter_appendix.pl
@@ -50,8 +50,7 @@ $result_trees{'part_chapter_appendix'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -90,8 +89,7 @@ $result_trees{'part_chapter_appendix'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -122,8 +120,7 @@ $result_trees{'part_chapter_appendix'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     }
   ],
diff --git a/tp/t/results/sectioning/part_node_after_top.pl 
b/tp/t/results/sectioning/part_node_after_top.pl
index d4b7b22d9c..0f1ef2b5e4 100644
--- a/tp/t/results/sectioning/part_node_after_top.pl
+++ b/tp/t/results/sectioning/part_node_after_top.pl
@@ -88,8 +88,7 @@ $result_trees{'part_node_after_top'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -121,15 +120,13 @@ $result_trees{'part_node_after_top'} = [
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -146,8 +143,7 @@ $result_trees{'part_node_after_top'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     'unit_contents' => [
@@ -183,8 +179,7 @@ $result_trees{'part_node_after_top'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 1,
-          'macro' => ''
+          'line_nr' => 1
         }
       },
       {},
@@ -217,8 +212,7 @@ $result_trees{'part_node_after_top'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 8,
-          'macro' => ''
+          'line_nr' => 8
         }
       }
     ],
@@ -251,8 +245,7 @@ $result_trees{'part_node_after_top'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     'unit_contents' => [
@@ -517,7 +510,6 @@ $result_errors{'part_node_after_top'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@node precedes @part, but parts may not be associated with 
nodes',
     'type' => 'warning'
   },
@@ -526,7 +518,6 @@ $result_errors{'part_node_after_top'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'no sectioning command associated with @part',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/part_node_before_top.pl 
b/tp/t/results/sectioning/part_node_before_top.pl
index 75df9f1982..b20648b873 100644
--- a/tp/t/results/sectioning/part_node_before_top.pl
+++ b/tp/t/results/sectioning/part_node_before_top.pl
@@ -88,8 +88,7 @@ $result_trees{'part_node_before_top'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               },
               'type' => 'menu_entry'
             },
@@ -121,15 +120,13 @@ $result_trees{'part_node_before_top'} = [
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         }
       ],
@@ -167,8 +164,7 @@ $result_trees{'part_node_before_top'} = [
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       },
@@ -179,8 +175,7 @@ $result_trees{'part_node_before_top'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     'unit_contents' => [
@@ -256,8 +251,7 @@ $result_trees{'part_node_before_top'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 1,
-          'macro' => ''
+          'line_nr' => 1
         }
       },
       {},
@@ -290,8 +284,7 @@ $result_trees{'part_node_before_top'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 4,
-          'macro' => ''
+          'line_nr' => 4
         }
       },
       {}
@@ -495,7 +488,6 @@ $result_errors{'part_node_before_top'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@node precedes @part, but parts may not be associated with 
nodes',
     'type' => 'warning'
   },
@@ -504,7 +496,6 @@ $result_errors{'part_node_before_top'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@part should not be associated with @top',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/part_node_chapter_after_top.pl 
b/tp/t/results/sectioning/part_node_chapter_after_top.pl
index 33d4e77750..bf13ffd7a1 100644
--- a/tp/t/results/sectioning/part_node_chapter_after_top.pl
+++ b/tp/t/results/sectioning/part_node_chapter_after_top.pl
@@ -88,8 +88,7 @@ $result_trees{'part_node_chapter_after_top'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -136,8 +135,7 @@ $result_trees{'part_node_chapter_after_top'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -169,15 +167,13 @@ $result_trees{'part_node_chapter_after_top'} = [
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -194,8 +190,7 @@ $result_trees{'part_node_chapter_after_top'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     'unit_contents' => [
@@ -231,8 +226,7 @@ $result_trees{'part_node_chapter_after_top'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 1,
-          'macro' => ''
+          'line_nr' => 1
         }
       },
       {}
@@ -292,8 +286,7 @@ $result_trees{'part_node_chapter_after_top'} = [
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         'section_number' => '1'
@@ -305,8 +298,7 @@ $result_trees{'part_node_chapter_after_top'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     'unit_contents' => [
@@ -417,8 +409,7 @@ $result_trees{'part_node_chapter_after_top'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 11,
-          'macro' => ''
+          'line_nr' => 11
         }
       },
       {
@@ -493,8 +484,7 @@ $result_trees{'part_node_chapter_after_top'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 14,
-          'macro' => ''
+          'line_nr' => 14
         }
       },
       {}
diff --git a/tp/t/results/sectioning/part_node_chapter_appendix.pl 
b/tp/t/results/sectioning/part_node_chapter_appendix.pl
index 8acdda0c55..920bb88b33 100644
--- a/tp/t/results/sectioning/part_node_chapter_appendix.pl
+++ b/tp/t/results/sectioning/part_node_chapter_appendix.pl
@@ -88,8 +88,7 @@ $result_trees{'part_node_chapter_appendix'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -121,15 +120,13 @@ $result_trees{'part_node_chapter_appendix'} = [
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -146,8 +143,7 @@ $result_trees{'part_node_chapter_appendix'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     'unit_contents' => [
@@ -183,8 +179,7 @@ $result_trees{'part_node_chapter_appendix'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 1,
-          'macro' => ''
+          'line_nr' => 1
         }
       },
       {}
@@ -251,8 +246,7 @@ $result_trees{'part_node_chapter_appendix'} = [
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         'section_number' => '1'
@@ -264,8 +258,7 @@ $result_trees{'part_node_chapter_appendix'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     'unit_contents' => [
@@ -299,8 +292,7 @@ $result_trees{'part_node_chapter_appendix'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 10,
-          'macro' => ''
+          'line_nr' => 10
         }
       },
       {}
@@ -336,8 +328,7 @@ $result_trees{'part_node_chapter_appendix'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     'unit_contents' => [
diff --git a/tp/t/results/sectioning/part_node_chapter_node_appendix.pl 
b/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
index 9a5f8b7595..b40f70bdd8 100644
--- a/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
+++ b/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
@@ -88,8 +88,7 @@ $result_trees{'part_node_chapter_node_appendix'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -136,8 +135,7 @@ $result_trees{'part_node_chapter_node_appendix'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -169,15 +167,13 @@ $result_trees{'part_node_chapter_node_appendix'} = [
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -194,8 +190,7 @@ $result_trees{'part_node_chapter_node_appendix'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     'unit_contents' => [
@@ -231,8 +226,7 @@ $result_trees{'part_node_chapter_node_appendix'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 1,
-          'macro' => ''
+          'line_nr' => 1
         }
       },
       {}
@@ -299,8 +293,7 @@ $result_trees{'part_node_chapter_node_appendix'} = [
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         'section_number' => '1'
@@ -312,8 +305,7 @@ $result_trees{'part_node_chapter_node_appendix'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     'unit_contents' => [
@@ -347,8 +339,7 @@ $result_trees{'part_node_chapter_node_appendix'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 11,
-          'macro' => ''
+          'line_nr' => 11
         }
       },
       {}
@@ -384,8 +375,7 @@ $result_trees{'part_node_chapter_node_appendix'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     'unit_contents' => [
@@ -418,8 +408,7 @@ $result_trees{'part_node_chapter_node_appendix'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 14,
-          'macro' => ''
+          'line_nr' => 14
         }
       },
       {}
diff --git a/tp/t/results/sectioning/part_node_node_part_appendix.pl 
b/tp/t/results/sectioning/part_node_node_part_appendix.pl
index db979df9e3..b517a4bb9a 100644
--- a/tp/t/results/sectioning/part_node_node_part_appendix.pl
+++ b/tp/t/results/sectioning/part_node_node_part_appendix.pl
@@ -88,8 +88,7 @@ $result_trees{'part_node_node_part_appendix'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -136,8 +135,7 @@ $result_trees{'part_node_node_part_appendix'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -169,15 +167,13 @@ $result_trees{'part_node_node_part_appendix'} = [
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -194,8 +190,7 @@ $result_trees{'part_node_node_part_appendix'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     'unit_contents' => [
@@ -231,8 +226,7 @@ $result_trees{'part_node_node_part_appendix'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 1,
-          'macro' => ''
+          'line_nr' => 1
         }
       },
       {}
@@ -299,8 +293,7 @@ $result_trees{'part_node_node_part_appendix'} = [
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         'section_number' => '1'
@@ -312,8 +305,7 @@ $result_trees{'part_node_node_part_appendix'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     'unit_contents' => [
@@ -347,8 +339,7 @@ $result_trees{'part_node_node_part_appendix'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 11,
-          'macro' => ''
+          'line_nr' => 11
         }
       },
       {}
@@ -408,8 +399,7 @@ $result_trees{'part_node_node_part_appendix'} = [
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         },
         'section_number' => 'A'
@@ -421,8 +411,7 @@ $result_trees{'part_node_node_part_appendix'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     'unit_contents' => [
@@ -455,8 +444,7 @@ $result_trees{'part_node_node_part_appendix'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 14,
-          'macro' => ''
+          'line_nr' => 14
         }
       },
       {},
@@ -995,7 +983,6 @@ $result_errors{'part_node_node_part_appendix'} = [
 ',
     'file_name' => '',
     'line_nr' => 15,
-    'macro' => '',
     'text' => '@node precedes @part, but parts may not be associated with 
nodes',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/part_node_part_appendix.pl 
b/tp/t/results/sectioning/part_node_part_appendix.pl
index 0dad97f5bb..7a8eb097b8 100644
--- a/tp/t/results/sectioning/part_node_part_appendix.pl
+++ b/tp/t/results/sectioning/part_node_part_appendix.pl
@@ -88,8 +88,7 @@ $result_trees{'part_node_part_appendix'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -121,15 +120,13 @@ $result_trees{'part_node_part_appendix'} = [
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -146,8 +143,7 @@ $result_trees{'part_node_part_appendix'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     'unit_contents' => [
@@ -183,8 +179,7 @@ $result_trees{'part_node_part_appendix'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 1,
-          'macro' => ''
+          'line_nr' => 1
         }
       },
       {}
@@ -251,8 +246,7 @@ $result_trees{'part_node_part_appendix'} = [
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         'section_number' => '1'
@@ -264,8 +258,7 @@ $result_trees{'part_node_part_appendix'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     'unit_contents' => [
@@ -299,8 +292,7 @@ $result_trees{'part_node_part_appendix'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 10,
-          'macro' => ''
+          'line_nr' => 10
         }
       },
       {}
@@ -360,8 +352,7 @@ $result_trees{'part_node_part_appendix'} = [
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         'section_number' => 'A'
@@ -373,8 +364,7 @@ $result_trees{'part_node_part_appendix'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     'unit_contents' => [
diff --git a/tp/t/results/sectioning/part_node_part_node_appendix.pl 
b/tp/t/results/sectioning/part_node_part_node_appendix.pl
index 95bb370fb1..30ce63ef36 100644
--- a/tp/t/results/sectioning/part_node_part_node_appendix.pl
+++ b/tp/t/results/sectioning/part_node_part_node_appendix.pl
@@ -88,8 +88,7 @@ $result_trees{'part_node_part_node_appendix'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -136,8 +135,7 @@ $result_trees{'part_node_part_node_appendix'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -169,15 +167,13 @@ $result_trees{'part_node_part_node_appendix'} = [
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -194,8 +190,7 @@ $result_trees{'part_node_part_node_appendix'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     'unit_contents' => [
@@ -231,8 +226,7 @@ $result_trees{'part_node_part_node_appendix'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 1,
-          'macro' => ''
+          'line_nr' => 1
         }
       },
       {}
@@ -299,8 +293,7 @@ $result_trees{'part_node_part_node_appendix'} = [
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         'section_number' => '1'
@@ -312,8 +305,7 @@ $result_trees{'part_node_part_node_appendix'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     'unit_contents' => [
@@ -347,8 +339,7 @@ $result_trees{'part_node_part_node_appendix'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 11,
-          'macro' => ''
+          'line_nr' => 11
         }
       },
       {}
@@ -408,8 +399,7 @@ $result_trees{'part_node_part_node_appendix'} = [
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           }
         },
         'section_number' => 'A'
@@ -421,8 +411,7 @@ $result_trees{'part_node_part_node_appendix'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     'unit_contents' => [
@@ -456,8 +445,7 @@ $result_trees{'part_node_part_node_appendix'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 16,
-          'macro' => ''
+          'line_nr' => 16
         }
       },
       {}
diff --git a/tp/t/results/sectioning/part_section_part.pl 
b/tp/t/results/sectioning/part_section_part.pl
index bc9224c97b..5ceb2ef6be 100644
--- a/tp/t/results/sectioning/part_section_part.pl
+++ b/tp/t/results/sectioning/part_section_part.pl
@@ -43,8 +43,7 @@ $result_trees{'part_section_part'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -83,8 +82,7 @@ $result_trees{'part_section_part'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -113,8 +111,7 @@ $result_trees{'part_section_part'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
@@ -190,7 +187,6 @@ $result_errors{'part_section_part'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'raising the section level of @section which is too low',
     'type' => 'error'
   },
@@ -199,7 +195,6 @@ $result_errors{'part_section_part'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'no sectioning command associated with @part',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/protected_node_parentheses.pl 
b/tp/t/results/sectioning/protected_node_parentheses.pl
index 4a795e36f9..2f078c987d 100644
--- a/tp/t/results/sectioning/protected_node_parentheses.pl
+++ b/tp/t/results/sectioning/protected_node_parentheses.pl
@@ -46,8 +46,7 @@ $result_trees{'protected_node_parentheses'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -110,8 +109,7 @@ $result_trees{'protected_node_parentheses'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     },
                     {
@@ -150,8 +148,7 @@ $result_trees{'protected_node_parentheses'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -183,15 +180,13 @@ $result_trees{'protected_node_parentheses'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -208,8 +203,7 @@ $result_trees{'protected_node_parentheses'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -230,8 +224,7 @@ $result_trees{'protected_node_parentheses'} = {
               'cmdname' => 'asis',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             },
             {
@@ -272,8 +265,7 @@ $result_trees{'protected_node_parentheses'} = {
                   'cmdname' => 'asis',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 },
                 {
@@ -290,8 +282,7 @@ $result_trees{'protected_node_parentheses'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -324,8 +315,7 @@ $result_trees{'protected_node_parentheses'} = {
                       'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     },
                     {
@@ -347,8 +337,7 @@ $result_trees{'protected_node_parentheses'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -370,8 +359,7 @@ $result_trees{'protected_node_parentheses'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     }
   ],
diff --git a/tp/t/results/sectioning/recursive_self_section_reference.pl 
b/tp/t/results/sectioning/recursive_self_section_reference.pl
index d6e35c0e54..ee5921642e 100644
--- a/tp/t/results/sectioning/recursive_self_section_reference.pl
+++ b/tp/t/results/sectioning/recursive_self_section_reference.pl
@@ -44,8 +44,7 @@ $result_trees{'recursive_self_section_reference'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -74,8 +73,7 @@ $result_trees{'recursive_self_section_reference'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -102,8 +100,7 @@ $result_trees{'recursive_self_section_reference'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
diff --git a/tp/t/results/sectioning/ref_to_top.pl 
b/tp/t/results/sectioning/ref_to_top.pl
index f964de6c54..10d0cd95f1 100644
--- a/tp/t/results/sectioning/ref_to_top.pl
+++ b/tp/t/results/sectioning/ref_to_top.pl
@@ -46,8 +46,7 @@ $result_trees{'ref_to_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -98,8 +97,7 @@ $result_trees{'ref_to_top'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
@@ -118,8 +116,7 @@ $result_trees{'ref_to_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     }
   ],
@@ -191,7 +188,6 @@ $result_errors{'ref_to_top'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@xref to `TOP\', different from node name `ToP\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/ref_to_unknown_node.pl 
b/tp/t/results/sectioning/ref_to_unknown_node.pl
index a8bfbd7bed..5fe78781f0 100644
--- a/tp/t/results/sectioning/ref_to_unknown_node.pl
+++ b/tp/t/results/sectioning/ref_to_unknown_node.pl
@@ -33,8 +33,7 @@ $result_trees{'ref_to_unknown_node'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -62,7 +61,6 @@ $result_errors{'ref_to_unknown_node'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@xref reference to nonexistent node `unknown node\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/sectioning/reference_to_only_special_spaces_node.pl 
b/tp/t/results/sectioning/reference_to_only_special_spaces_node.pl
index 83a5880758..a622472a4c 100644
--- a/tp/t/results/sectioning/reference_to_only_special_spaces_node.pl
+++ b/tp/t/results/sectioning/reference_to_only_special_spaces_node.pl
@@ -54,8 +54,7 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
       },
       'source_info' => {
         'file_name' => 'reference_to_only_special_spaces_node.texi',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -91,8 +90,7 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
       },
       'source_info' => {
         'file_name' => 'reference_to_only_special_spaces_node.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -124,8 +122,7 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
       },
       'source_info' => {
         'file_name' => 'reference_to_only_special_spaces_node.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -194,8 +191,7 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'reference_to_only_special_spaces_node.texi',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             },
             {
@@ -221,8 +217,7 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
       },
       'source_info' => {
         'file_name' => 'reference_to_only_special_spaces_node.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -243,8 +238,7 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'reference_to_only_special_spaces_node.texi',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
@@ -268,8 +262,7 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
       },
       'source_info' => {
         'file_name' => 'reference_to_only_special_spaces_node.texi',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -290,8 +283,7 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'reference_to_only_special_spaces_node.texi',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
@@ -331,8 +323,7 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => 
'reference_to_only_special_spaces_node.texi',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     }
                   ],
@@ -362,8 +353,7 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
                       'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => 
'reference_to_only_special_spaces_node.texi',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     }
                   ],
@@ -378,8 +368,7 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
               'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'reference_to_only_special_spaces_node.texi',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             },
             {
@@ -410,8 +399,7 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
       },
       'source_info' => {
         'file_name' => 'reference_to_only_special_spaces_node.texi',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -617,7 +605,6 @@ $result_errors{'reference_to_only_special_spaces_node'} = [
 ",
     'file_name' => 'reference_to_only_special_spaces_node.texi',
     'line_nr' => 10,
-    'macro' => '',
     'text' => "\@node `\@code{\x{2000}\x{2001}\x{2002}}' previously defined",
     'type' => 'error'
   },
@@ -627,7 +614,6 @@ $result_errors{'reference_to_only_special_spaces_node'} = [
 ',
     'file_name' => 'reference_to_only_special_spaces_node.texi',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'here is the previous definition as @node',
     'type' => 'error'
   },
@@ -636,7 +622,6 @@ $result_errors{'reference_to_only_special_spaces_node'} = [
 ",
     'file_name' => 'reference_to_only_special_spaces_node.texi',
     'line_nr' => 13,
-    'macro' => '',
     'text' => "\@ref to `\@code{\x{2000}\x{2001}\x{2002}}', different from 
node name `\x{2000}\x{2001}\x{2002}'",
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/section_before_after_top_node.pl 
b/tp/t/results/sectioning/section_before_after_top_node.pl
index f3cc13541c..471916dcce 100644
--- a/tp/t/results/sectioning/section_before_after_top_node.pl
+++ b/tp/t/results/sectioning/section_before_after_top_node.pl
@@ -48,8 +48,7 @@ $result_trees{'section_before_after_top_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -81,8 +80,7 @@ $result_trees{'section_before_after_top_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -118,8 +116,7 @@ $result_trees{'section_before_after_top_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -166,8 +163,7 @@ $result_trees{'section_before_after_top_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     }
   ],
@@ -279,7 +275,6 @@ $result_errors{'section_before_after_top_node'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'lowering the section level of @top appearing after a lower 
element',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/section_before_after_top_node_last_node.pl 
b/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
index fa38359ac5..35ba83c09a 100644
--- a/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
+++ b/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
@@ -48,8 +48,7 @@ $result_trees{'section_before_after_top_node_last_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -81,8 +80,7 @@ $result_trees{'section_before_after_top_node_last_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -118,8 +116,7 @@ $result_trees{'section_before_after_top_node_last_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -171,8 +168,7 @@ $result_trees{'section_before_after_top_node_last_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -204,8 +200,7 @@ $result_trees{'section_before_after_top_node_last_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     }
   ],
@@ -339,7 +334,6 @@ $result_errors{'section_before_after_top_node_last_node'} = 
[
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'lowering the section level of @top appearing after a lower 
element',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/section_before_chapter.pl 
b/tp/t/results/sectioning/section_before_chapter.pl
index 74f169cded..0f91dffff6 100644
--- a/tp/t/results/sectioning/section_before_chapter.pl
+++ b/tp/t/results/sectioning/section_before_chapter.pl
@@ -45,8 +45,7 @@ $result_trees{'section_before_chapter'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -77,8 +76,7 @@ $result_trees{'section_before_chapter'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     }
   ],
@@ -138,7 +136,6 @@ $result_errors{'section_before_chapter'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'lowering the section level of @chapter appearing after a lower 
element',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/section_before_part.pl 
b/tp/t/results/sectioning/section_before_part.pl
index c07b000014..81ad6e640c 100644
--- a/tp/t/results/sectioning/section_before_part.pl
+++ b/tp/t/results/sectioning/section_before_part.pl
@@ -50,8 +50,7 @@ $result_trees{'section_before_part'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -89,8 +88,7 @@ $result_trees{'section_before_part'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
@@ -102,8 +100,7 @@ $result_trees{'section_before_part'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     }
   ],
@@ -155,7 +152,6 @@ $result_errors{'section_before_part'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'no chapter-level command before @part',
     'type' => 'warning'
   },
@@ -164,7 +160,6 @@ $result_errors{'section_before_part'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'no sectioning command associated with @part',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/section_before_top.pl 
b/tp/t/results/sectioning/section_before_top.pl
index 12f3180180..bc5807934a 100644
--- a/tp/t/results/sectioning/section_before_top.pl
+++ b/tp/t/results/sectioning/section_before_top.pl
@@ -61,8 +61,7 @@ $result_trees{'section_before_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -100,8 +99,7 @@ $result_trees{'section_before_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -133,8 +131,7 @@ $result_trees{'section_before_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -218,8 +215,7 @@ $result_trees{'section_before_top'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               },
               'type' => 'menu_entry'
             },
@@ -251,15 +247,13 @@ $result_trees{'section_before_top'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         }
       ],
@@ -271,8 +265,7 @@ $result_trees{'section_before_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
@@ -408,7 +401,6 @@ $result_errors{'section_before_top'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'lowering the section level of @top appearing after a lower 
element',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/section_before_top_no_node.pl 
b/tp/t/results/sectioning/section_before_top_no_node.pl
index 3288b5b2bc..4f0b6fb043 100644
--- a/tp/t/results/sectioning/section_before_top_no_node.pl
+++ b/tp/t/results/sectioning/section_before_top_no_node.pl
@@ -45,8 +45,7 @@ $result_trees{'section_before_top_no_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -75,8 +74,7 @@ $result_trees{'section_before_top_no_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     }
   ],
@@ -135,7 +133,6 @@ $result_errors{'section_before_top_no_node'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'lowering the section level of @top appearing after a lower 
element',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/section_below_unnumbered.pl 
b/tp/t/results/sectioning/section_below_unnumbered.pl
index 6f35d44efd..9759524cbd 100644
--- a/tp/t/results/sectioning/section_below_unnumbered.pl
+++ b/tp/t/results/sectioning/section_below_unnumbered.pl
@@ -32,8 +32,7 @@ $result_trees{'section_below_unnumbered'} = {
               'cmdname' => 'contents',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -76,8 +75,7 @@ $result_trees{'section_below_unnumbered'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -175,8 +173,7 @@ $result_trees{'section_below_unnumbered'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               },
               'type' => 'menu_entry'
             },
@@ -208,15 +205,13 @@ $result_trees{'section_below_unnumbered'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -238,8 +233,7 @@ $result_trees{'section_below_unnumbered'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -271,8 +265,7 @@ $result_trees{'section_below_unnumbered'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     {
@@ -356,8 +349,7 @@ $result_trees{'section_below_unnumbered'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               },
               'type' => 'menu_entry'
             },
@@ -389,15 +381,13 @@ $result_trees{'section_below_unnumbered'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -414,8 +404,7 @@ $result_trees{'section_below_unnumbered'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -447,8 +436,7 @@ $result_trees{'section_below_unnumbered'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 21,
-        'macro' => ''
+        'line_nr' => 21
       }
     },
     {
@@ -498,8 +486,7 @@ $result_trees{'section_below_unnumbered'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 22,
-        'macro' => ''
+        'line_nr' => 22
       }
     },
     {
diff --git a/tp/t/results/sectioning/section_below_unnumbered_no_top.pl 
b/tp/t/results/sectioning/section_below_unnumbered_no_top.pl
index dd0b31e82f..ee21632ea6 100644
--- a/tp/t/results/sectioning/section_below_unnumbered_no_top.pl
+++ b/tp/t/results/sectioning/section_below_unnumbered_no_top.pl
@@ -41,8 +41,7 @@ $result_trees{'section_below_unnumbered_no_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -71,8 +70,7 @@ $result_trees{'section_below_unnumbered_no_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
diff --git a/tp/t/results/sectioning/section_chapter_before_top.pl 
b/tp/t/results/sectioning/section_chapter_before_top.pl
index 6e04f9c218..32346bd6f7 100644
--- a/tp/t/results/sectioning/section_chapter_before_top.pl
+++ b/tp/t/results/sectioning/section_chapter_before_top.pl
@@ -45,8 +45,7 @@ $result_trees{'section_chapter_before_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -84,8 +83,7 @@ $result_trees{'section_chapter_before_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -114,8 +112,7 @@ $result_trees{'section_chapter_before_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
@@ -194,7 +191,6 @@ $result_errors{'section_chapter_before_top'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'lowering the section level of @chapter appearing after a lower 
element',
     'type' => 'warning'
   },
@@ -203,7 +199,6 @@ $result_errors{'section_chapter_before_top'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'lowering the section level of @top appearing after a lower 
element',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/section_chapter_before_top_nodes.pl 
b/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
index 07c2c097c7..f173be10a7 100644
--- a/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
+++ b/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
@@ -44,8 +44,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -83,8 +82,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -116,8 +114,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -201,8 +198,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               },
               'type' => 'menu_entry'
             },
@@ -234,15 +230,13 @@ $result_trees{'section_chapter_before_top_nodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -261,8 +255,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -294,8 +287,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -379,8 +371,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               },
               'type' => 'menu_entry'
             },
@@ -412,15 +403,13 @@ $result_trees{'section_chapter_before_top_nodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           }
         },
         {
@@ -437,8 +426,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     }
   ],
@@ -641,7 +629,6 @@ $result_errors{'section_chapter_before_top_nodes'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'lowering the section level of @chapter appearing after a lower 
element',
     'type' => 'warning'
   },
@@ -650,7 +637,6 @@ $result_errors{'section_chapter_before_top_nodes'} = [
 ',
     'file_name' => '',
     'line_nr' => 12,
-    'macro' => '',
     'text' => 'lowering the section level of @top appearing after a lower 
element',
     'type' => 'warning'
   },
@@ -659,7 +645,6 @@ $result_errors{'section_chapter_before_top_nodes'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'node `chapter node\' is up for `section node\' in menu but not 
in sectioning',
     'type' => 'warning'
   },
@@ -668,7 +653,6 @@ $result_errors{'section_chapter_before_top_nodes'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'node `Top\' is up for `chapter node\' in menu but not in 
sectioning',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/section_node_before_part.pl 
b/tp/t/results/sectioning/section_node_before_part.pl
index a41948f0cd..906aaf966f 100644
--- a/tp/t/results/sectioning/section_node_before_part.pl
+++ b/tp/t/results/sectioning/section_node_before_part.pl
@@ -46,8 +46,7 @@ $result_trees{'section_node_before_part'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -85,8 +84,7 @@ $result_trees{'section_node_before_part'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -115,8 +113,7 @@ $result_trees{'section_node_before_part'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
@@ -197,7 +194,6 @@ $result_errors{'section_node_before_part'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'no chapter-level command before @part',
     'type' => 'warning'
   },
@@ -206,7 +202,6 @@ $result_errors{'section_node_before_part'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'no sectioning command associated with @part',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/sections.pl 
b/tp/t/results/sectioning/sections.pl
index 433bb85f9a..659d2f8d02 100644
--- a/tp/t/results/sectioning/sections.pl
+++ b/tp/t/results/sectioning/sections.pl
@@ -38,8 +38,7 @@ $result_trees{'sections'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
diff --git a/tp/t/results/sectioning/semi_auto.pl 
b/tp/t/results/sectioning/semi_auto.pl
index 7aefb19d46..be18be5d60 100644
--- a/tp/t/results/sectioning/semi_auto.pl
+++ b/tp/t/results/sectioning/semi_auto.pl
@@ -39,8 +39,7 @@ $result_trees{'semi_auto'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -124,8 +123,7 @@ $result_trees{'semi_auto'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -172,8 +170,7 @@ $result_trees{'semi_auto'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -205,15 +202,13 @@ $result_trees{'semi_auto'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -230,8 +225,7 @@ $result_trees{'semi_auto'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -263,8 +257,7 @@ $result_trees{'semi_auto'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     {
@@ -348,8 +341,7 @@ $result_trees{'semi_auto'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               },
               'type' => 'menu_entry'
             },
@@ -381,15 +373,13 @@ $result_trees{'semi_auto'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           }
         },
         {
@@ -408,8 +398,7 @@ $result_trees{'semi_auto'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -441,8 +430,7 @@ $result_trees{'semi_auto'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 16,
-        'macro' => ''
+        'line_nr' => 16
       }
     },
     {
@@ -480,8 +468,7 @@ $result_trees{'semi_auto'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     },
     {
@@ -556,8 +543,7 @@ $result_trees{'semi_auto'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 19,
-        'macro' => ''
+        'line_nr' => 19
       }
     },
     {
@@ -588,8 +574,7 @@ $result_trees{'semi_auto'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 20,
-        'macro' => ''
+        'line_nr' => 20
       }
     }
   ],
@@ -852,7 +837,6 @@ $result_errors{'semi_auto'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'node `Section non auto\' is next for `Chap1\' in menu but not 
in sectioning',
     'type' => 'warning'
   },
@@ -861,7 +845,6 @@ $result_errors{'semi_auto'} = [
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => 'node next for `Sec in chapter\' is `Section non auto\' in 
sectioning but not in menu',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl 
b/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl
index d2b072a49e..4662c2f8a0 100644
--- a/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl
+++ b/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl
@@ -44,8 +44,7 @@ $result_trees{'setfilename_on_top_and_after_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -83,8 +82,7 @@ $result_trees{'setfilename_on_top_and_after_node'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -126,8 +124,7 @@ $result_trees{'setfilename_on_top_and_after_node'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         }
       ],
@@ -139,8 +136,7 @@ $result_trees{'setfilename_on_top_and_after_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
@@ -208,7 +204,6 @@ $result_errors{'setfilename_on_top_and_after_node'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@setfilename should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -217,7 +212,6 @@ $result_errors{'setfilename_on_top_and_after_node'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@setfilename should not appear on @top line',
     'type' => 'warning'
   },
@@ -226,7 +220,6 @@ $result_errors{'setfilename_on_top_and_after_node'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@setfilename after the first element',
     'type' => 'warning'
   },
@@ -235,7 +228,6 @@ $result_errors{'setfilename_on_top_and_after_node'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'multiple @setfilename',
     'type' => 'warning'
   },
@@ -244,7 +236,6 @@ $result_errors{'setfilename_on_top_and_after_node'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '@setfilename after the first element',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/space_in_node.pl 
b/tp/t/results/sectioning/space_in_node.pl
index 79e4a01568..1d6bfcf721 100644
--- a/tp/t/results/sectioning/space_in_node.pl
+++ b/tp/t/results/sectioning/space_in_node.pl
@@ -98,8 +98,7 @@ $result_trees{'space_in_node'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -158,8 +157,7 @@ $result_trees{'space_in_node'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -211,8 +209,7 @@ $result_trees{'space_in_node'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -244,15 +241,13 @@ $result_trees{'space_in_node'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -272,8 +267,7 @@ $result_trees{'space_in_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -312,8 +306,7 @@ $result_trees{'space_in_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -352,8 +345,7 @@ $result_trees{'space_in_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -385,8 +377,7 @@ $result_trees{'space_in_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     }
   ],
diff --git a/tp/t/results/sectioning/split_for_format_not_split.pl 
b/tp/t/results/sectioning/split_for_format_not_split.pl
index 97f9712677..f80ea67c07 100644
--- a/tp/t/results/sectioning/split_for_format_not_split.pl
+++ b/tp/t/results/sectioning/split_for_format_not_split.pl
@@ -86,8 +86,7 @@ $result_trees{'split_for_format_not_split'} = {
       },
       'source_info' => {
         'file_name' => 'simplest.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
diff --git a/tp/t/results/sectioning/top_no_argument_and_content.pl 
b/tp/t/results/sectioning/top_no_argument_and_content.pl
index bd5c677c3a..63f3f39f9d 100644
--- a/tp/t/results/sectioning/top_no_argument_and_content.pl
+++ b/tp/t/results/sectioning/top_no_argument_and_content.pl
@@ -47,8 +47,7 @@ $result_trees{'top_no_argument_and_content'} = {
       'extra' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
diff --git a/tp/t/results/sectioning/top_no_argument_and_node.pl 
b/tp/t/results/sectioning/top_no_argument_and_node.pl
index e7eb41b8d4..2e4f8b55fe 100644
--- a/tp/t/results/sectioning/top_no_argument_and_node.pl
+++ b/tp/t/results/sectioning/top_no_argument_and_node.pl
@@ -39,8 +39,7 @@ $result_trees{'top_no_argument_and_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -59,8 +58,7 @@ $result_trees{'top_no_argument_and_node'} = {
       'extra' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
diff --git a/tp/t/results/sectioning/top_no_argument_and_top_node.pl 
b/tp/t/results/sectioning/top_no_argument_and_top_node.pl
index c908a842d2..cc6a76633b 100644
--- a/tp/t/results/sectioning/top_no_argument_and_top_node.pl
+++ b/tp/t/results/sectioning/top_no_argument_and_top_node.pl
@@ -39,8 +39,7 @@ $result_trees{'top_no_argument_and_top_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -59,8 +58,7 @@ $result_trees{'top_no_argument_and_top_node'} = {
       'extra' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
diff --git a/tp/t/results/sectioning/top_node_no_menu_direction.pl 
b/tp/t/results/sectioning/top_node_no_menu_direction.pl
index 0e52567e95..20b422a634 100644
--- a/tp/t/results/sectioning/top_node_no_menu_direction.pl
+++ b/tp/t/results/sectioning/top_node_no_menu_direction.pl
@@ -91,8 +91,7 @@ $result_trees{'top_node_no_menu_direction'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -139,8 +138,7 @@ $result_trees{'top_node_no_menu_direction'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -172,15 +170,13 @@ $result_trees{'top_node_no_menu_direction'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -200,8 +196,7 @@ $result_trees{'top_node_no_menu_direction'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -268,8 +263,7 @@ $result_trees{'top_node_no_menu_direction'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     }
   ],
@@ -356,7 +350,6 @@ $result_errors{'top_node_no_menu_direction'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => 'Prev pointer `top\' (for node `chap node\') different from node 
name `Top\'',
     'type' => 'warning'
   },
@@ -365,7 +358,6 @@ $result_errors{'top_node_no_menu_direction'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => 'Up pointer `TOP\' (for node `chap node\') different from node 
name `Top\'',
     'type' => 'warning'
   },
@@ -374,7 +366,6 @@ $result_errors{'top_node_no_menu_direction'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@menu entry node name `TOP\' different from node name `Top\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/top_node_part_top.pl 
b/tp/t/results/sectioning/top_node_part_top.pl
index c6111ff620..a916305732 100644
--- a/tp/t/results/sectioning/top_node_part_top.pl
+++ b/tp/t/results/sectioning/top_node_part_top.pl
@@ -59,8 +59,7 @@ $result_trees{'top_node_part_top'} = [
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         }
       },
@@ -71,8 +70,7 @@ $result_trees{'top_node_part_top'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     'unit_contents' => [
@@ -120,8 +118,7 @@ $result_trees{'top_node_part_top'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 1,
-          'macro' => ''
+          'line_nr' => 1
         }
       },
       {},
@@ -262,7 +259,6 @@ $result_errors{'top_node_part_top'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@node precedes @part, but parts may not be associated with 
nodes',
     'type' => 'warning'
   },
@@ -271,7 +267,6 @@ $result_errors{'top_node_part_top'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@part should not be associated with @top',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/top_part_chapter.pl 
b/tp/t/results/sectioning/top_part_chapter.pl
index 39eb7466ad..82503edf3b 100644
--- a/tp/t/results/sectioning/top_part_chapter.pl
+++ b/tp/t/results/sectioning/top_part_chapter.pl
@@ -40,8 +40,7 @@ $result_trees{'top_part_chapter'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     'unit_contents' => [
@@ -105,8 +104,7 @@ $result_trees{'top_part_chapter'} = [
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         'section_number' => '1'
@@ -118,8 +116,7 @@ $result_trees{'top_part_chapter'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     'unit_contents' => [
diff --git a/tp/t/results/sectioning/top_without_node_nodes.pl 
b/tp/t/results/sectioning/top_without_node_nodes.pl
index 7f5c797ee9..4f10844ace 100644
--- a/tp/t/results/sectioning/top_without_node_nodes.pl
+++ b/tp/t/results/sectioning/top_without_node_nodes.pl
@@ -63,8 +63,7 @@ $result_trees{'top_without_node_nodes'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     'unit_contents' => [
@@ -113,8 +112,7 @@ $result_trees{'top_without_node_nodes'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 1,
-          'macro' => ''
+          'line_nr' => 1
         }
       },
       {},
@@ -162,8 +160,7 @@ $result_trees{'top_without_node_nodes'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 5,
-          'macro' => ''
+          'line_nr' => 5
         }
       }
     ],
diff --git a/tp/t/results/sectioning/top_without_node_sections.pl 
b/tp/t/results/sectioning/top_without_node_sections.pl
index f9bc9ddcd8..ed7ee5eed3 100644
--- a/tp/t/results/sectioning/top_without_node_sections.pl
+++ b/tp/t/results/sectioning/top_without_node_sections.pl
@@ -49,8 +49,7 @@ $result_trees{'top_without_node_sections'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     'unit_contents' => [
@@ -106,8 +105,7 @@ $result_trees{'top_without_node_sections'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     'unit_contents' => [
@@ -167,8 +165,7 @@ $result_trees{'top_without_node_sections'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 4,
-          'macro' => ''
+          'line_nr' => 4
         }
       },
       {}
diff --git a/tp/t/results/sectioning/top_without_node_texi2html_no_use_nodes.pl 
b/tp/t/results/sectioning/top_without_node_texi2html_no_use_nodes.pl
index aa78f0209d..a3ad225f1f 100644
--- a/tp/t/results/sectioning/top_without_node_texi2html_no_use_nodes.pl
+++ b/tp/t/results/sectioning/top_without_node_texi2html_no_use_nodes.pl
@@ -57,8 +57,7 @@ $result_trees{'top_without_node_texi2html_no_use_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -117,8 +116,7 @@ $result_trees{'top_without_node_texi2html_no_use_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -165,8 +163,7 @@ $result_trees{'top_without_node_texi2html_no_use_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
diff --git a/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl 
b/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
index ce7fc4bc78..a4fc8b6d62 100644
--- a/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
+++ b/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
@@ -67,8 +67,7 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
                       'cmdname' => '~',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     }
                   ],
@@ -103,8 +102,7 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -151,8 +149,7 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -178,8 +175,7 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
                       'cmdname' => '^',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     }
                   ],
@@ -214,8 +210,7 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -247,15 +242,13 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -275,8 +268,7 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     'unit_contents' => [
@@ -311,8 +303,7 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
               'cmdname' => '~',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
@@ -337,8 +328,7 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     'unit_contents' => [
@@ -361,8 +351,7 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
                 'cmdname' => '~',
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 10,
-                  'macro' => ''
+                  'line_nr' => 10
                 }
               }
             ],
@@ -391,8 +380,7 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 10,
-          'macro' => ''
+          'line_nr' => 10
         }
       }
     ],
@@ -435,8 +423,7 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     'unit_contents' => [
@@ -463,8 +450,7 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
               'cmdname' => '^',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
@@ -489,8 +475,7 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
-        'macro' => ''
+        'line_nr' => 14
       }
     },
     'unit_contents' => [
diff --git a/tp/t/results/sectioning/two_nodes_at_the_end.pl 
b/tp/t/results/sectioning/two_nodes_at_the_end.pl
index dde7033a49..e2f6bd425e 100644
--- a/tp/t/results/sectioning/two_nodes_at_the_end.pl
+++ b/tp/t/results/sectioning/two_nodes_at_the_end.pl
@@ -88,8 +88,7 @@ $result_trees{'two_nodes_at_the_end'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -136,8 +135,7 @@ $result_trees{'two_nodes_at_the_end'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -184,8 +182,7 @@ $result_trees{'two_nodes_at_the_end'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -217,15 +214,13 @@ $result_trees{'two_nodes_at_the_end'} = [
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -242,8 +237,7 @@ $result_trees{'two_nodes_at_the_end'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     'unit_contents' => [
@@ -284,8 +278,7 @@ $result_trees{'two_nodes_at_the_end'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 1,
-          'macro' => ''
+          'line_nr' => 1
         }
       },
       {}
@@ -328,8 +321,7 @@ $result_trees{'two_nodes_at_the_end'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     'unit_contents' => [
@@ -423,8 +415,7 @@ $result_trees{'two_nodes_at_the_end'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 10,
-          'macro' => ''
+          'line_nr' => 10
         }
       },
       {},
@@ -478,8 +469,7 @@ $result_trees{'two_nodes_at_the_end'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 13,
-          'macro' => ''
+          'line_nr' => 13
         }
       },
       {
@@ -511,8 +501,7 @@ $result_trees{'two_nodes_at_the_end'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 17,
-          'macro' => ''
+          'line_nr' => 17
         }
       }
     ],
diff --git a/tp/t/results/sectioning/two_nodes_at_the_end_nodes.pl 
b/tp/t/results/sectioning/two_nodes_at_the_end_nodes.pl
index 28b8ba3ddf..6546e768e4 100644
--- a/tp/t/results/sectioning/two_nodes_at_the_end_nodes.pl
+++ b/tp/t/results/sectioning/two_nodes_at_the_end_nodes.pl
@@ -44,8 +44,7 @@ $result_trees{'two_nodes_at_the_end_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -129,8 +128,7 @@ $result_trees{'two_nodes_at_the_end_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -177,8 +175,7 @@ $result_trees{'two_nodes_at_the_end_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -225,8 +222,7 @@ $result_trees{'two_nodes_at_the_end_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -258,15 +254,13 @@ $result_trees{'two_nodes_at_the_end_nodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -283,8 +277,7 @@ $result_trees{'two_nodes_at_the_end_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -377,8 +370,7 @@ $result_trees{'two_nodes_at_the_end_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -416,8 +408,7 @@ $result_trees{'two_nodes_at_the_end_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -470,8 +461,7 @@ $result_trees{'two_nodes_at_the_end_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -503,8 +493,7 @@ $result_trees{'two_nodes_at_the_end_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     }
   ],
diff --git a/tp/t/results/sectioning/two_nodes_at_the_end_texi2html.pl 
b/tp/t/results/sectioning/two_nodes_at_the_end_texi2html.pl
index 54d5ffa6a1..2880189ff7 100644
--- a/tp/t/results/sectioning/two_nodes_at_the_end_texi2html.pl
+++ b/tp/t/results/sectioning/two_nodes_at_the_end_texi2html.pl
@@ -44,8 +44,7 @@ $result_trees{'two_nodes_at_the_end_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -129,8 +128,7 @@ $result_trees{'two_nodes_at_the_end_texi2html'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -177,8 +175,7 @@ $result_trees{'two_nodes_at_the_end_texi2html'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -225,8 +222,7 @@ $result_trees{'two_nodes_at_the_end_texi2html'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -258,15 +254,13 @@ $result_trees{'two_nodes_at_the_end_texi2html'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -283,8 +277,7 @@ $result_trees{'two_nodes_at_the_end_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -377,8 +370,7 @@ $result_trees{'two_nodes_at_the_end_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -416,8 +408,7 @@ $result_trees{'two_nodes_at_the_end_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -470,8 +461,7 @@ $result_trees{'two_nodes_at_the_end_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -503,8 +493,7 @@ $result_trees{'two_nodes_at_the_end_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
-        'macro' => ''
+        'line_nr' => 17
       }
     }
   ],
diff --git a/tp/t/results/sectioning/two_nodes_between_chapters.pl 
b/tp/t/results/sectioning/two_nodes_between_chapters.pl
index dfe6b087ec..55e71ae635 100644
--- a/tp/t/results/sectioning/two_nodes_between_chapters.pl
+++ b/tp/t/results/sectioning/two_nodes_between_chapters.pl
@@ -88,8 +88,7 @@ $result_trees{'two_nodes_between_chapters'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -136,8 +135,7 @@ $result_trees{'two_nodes_between_chapters'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -184,8 +182,7 @@ $result_trees{'two_nodes_between_chapters'} = [
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -217,15 +214,13 @@ $result_trees{'two_nodes_between_chapters'} = [
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -242,8 +237,7 @@ $result_trees{'two_nodes_between_chapters'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     'unit_contents' => [
@@ -284,8 +278,7 @@ $result_trees{'two_nodes_between_chapters'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 1,
-          'macro' => ''
+          'line_nr' => 1
         }
       },
       {}
@@ -328,8 +321,7 @@ $result_trees{'two_nodes_between_chapters'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     'unit_contents' => [
@@ -423,8 +415,7 @@ $result_trees{'two_nodes_between_chapters'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 10,
-          'macro' => ''
+          'line_nr' => 10
         }
       },
       {},
@@ -464,8 +455,7 @@ $result_trees{'two_nodes_between_chapters'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 13,
-          'macro' => ''
+          'line_nr' => 13
         }
       }
     ],
@@ -500,8 +490,7 @@ $result_trees{'two_nodes_between_chapters'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 16,
-        'macro' => ''
+        'line_nr' => 16
       }
     },
     'unit_contents' => [
@@ -534,8 +523,7 @@ $result_trees{'two_nodes_between_chapters'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 15,
-          'macro' => ''
+          'line_nr' => 15
         }
       },
       {}
@@ -1060,7 +1048,6 @@ $result_errors{'two_nodes_between_chapters'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => 'node next pointer for `chapter 1\' is `Top\' but next is `node 
between chapters\' in menu',
     'type' => 'warning'
   },
@@ -1069,7 +1056,6 @@ $result_errors{'two_nodes_between_chapters'} = [
 ',
     'file_name' => '',
     'line_nr' => 15,
-    'macro' => '',
     'text' => 'node prev pointer for `chapter 2\' is `chapter 1\' but prev is 
`node between chapters\' in menu',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/two_nodes_between_chapters_nodes.pl 
b/tp/t/results/sectioning/two_nodes_between_chapters_nodes.pl
index 012ac279c1..b84b73fbac 100644
--- a/tp/t/results/sectioning/two_nodes_between_chapters_nodes.pl
+++ b/tp/t/results/sectioning/two_nodes_between_chapters_nodes.pl
@@ -44,8 +44,7 @@ $result_trees{'two_nodes_between_chapters_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -129,8 +128,7 @@ $result_trees{'two_nodes_between_chapters_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -177,8 +175,7 @@ $result_trees{'two_nodes_between_chapters_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -225,8 +222,7 @@ $result_trees{'two_nodes_between_chapters_nodes'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -258,15 +254,13 @@ $result_trees{'two_nodes_between_chapters_nodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -283,8 +277,7 @@ $result_trees{'two_nodes_between_chapters_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -377,8 +370,7 @@ $result_trees{'two_nodes_between_chapters_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -416,8 +408,7 @@ $result_trees{'two_nodes_between_chapters_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -456,8 +447,7 @@ $result_trees{'two_nodes_between_chapters_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -489,8 +479,7 @@ $result_trees{'two_nodes_between_chapters_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -521,8 +510,7 @@ $result_trees{'two_nodes_between_chapters_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 16,
-        'macro' => ''
+        'line_nr' => 16
       }
     }
   ],
diff --git a/tp/t/results/sectioning/two_nodes_between_chapters_texi2html.pl 
b/tp/t/results/sectioning/two_nodes_between_chapters_texi2html.pl
index f426acbda8..a41e70d883 100644
--- a/tp/t/results/sectioning/two_nodes_between_chapters_texi2html.pl
+++ b/tp/t/results/sectioning/two_nodes_between_chapters_texi2html.pl
@@ -44,8 +44,7 @@ $result_trees{'two_nodes_between_chapters_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -129,8 +128,7 @@ $result_trees{'two_nodes_between_chapters_texi2html'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -177,8 +175,7 @@ $result_trees{'two_nodes_between_chapters_texi2html'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -225,8 +222,7 @@ $result_trees{'two_nodes_between_chapters_texi2html'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -258,15 +254,13 @@ $result_trees{'two_nodes_between_chapters_texi2html'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -283,8 +277,7 @@ $result_trees{'two_nodes_between_chapters_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -377,8 +370,7 @@ $result_trees{'two_nodes_between_chapters_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -416,8 +408,7 @@ $result_trees{'two_nodes_between_chapters_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -456,8 +447,7 @@ $result_trees{'two_nodes_between_chapters_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -489,8 +479,7 @@ $result_trees{'two_nodes_between_chapters_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
-        'macro' => ''
+        'line_nr' => 15
       }
     },
     {
@@ -521,8 +510,7 @@ $result_trees{'two_nodes_between_chapters_texi2html'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 16,
-        'macro' => ''
+        'line_nr' => 16
       }
     }
   ],
diff --git a/tp/t/results/sectioning/two_unnumbered_no_argument.pl 
b/tp/t/results/sectioning/two_unnumbered_no_argument.pl
index a14f57df51..52d341724a 100644
--- a/tp/t/results/sectioning/two_unnumbered_no_argument.pl
+++ b/tp/t/results/sectioning/two_unnumbered_no_argument.pl
@@ -31,8 +31,7 @@ $result_trees{'two_unnumbered_no_argument'} = {
       'extra' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -51,8 +50,7 @@ $result_trees{'two_unnumbered_no_argument'} = {
       'extra' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
@@ -104,7 +102,6 @@ $result_errors{'two_unnumbered_no_argument'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@unnumbered missing argument',
     'type' => 'warning'
   },
@@ -113,7 +110,6 @@ $result_errors{'two_unnumbered_no_argument'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@unnumbered missing argument',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/unknown_node_direction_novalidate.pl 
b/tp/t/results/sectioning/unknown_node_direction_novalidate.pl
index 715f0b16a1..dddec6e4f5 100644
--- a/tp/t/results/sectioning/unknown_node_direction_novalidate.pl
+++ b/tp/t/results/sectioning/unknown_node_direction_novalidate.pl
@@ -20,8 +20,7 @@ $result_trees{'unknown_node_direction_novalidate'} = {
           'cmdname' => 'novalidate',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -80,8 +79,7 @@ $result_trees{'unknown_node_direction_novalidate'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     }
   ],
diff --git a/tp/t/results/sectioning/unknown_node_in_menu.pl 
b/tp/t/results/sectioning/unknown_node_in_menu.pl
index ecef77e006..69c50d608c 100644
--- a/tp/t/results/sectioning/unknown_node_in_menu.pl
+++ b/tp/t/results/sectioning/unknown_node_in_menu.pl
@@ -91,8 +91,7 @@ $result_trees{'unknown_node_in_menu'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'type' => 'menu_entry'
             },
@@ -124,15 +123,13 @@ $result_trees{'unknown_node_in_menu'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         }
       ],
@@ -147,8 +144,7 @@ $result_trees{'unknown_node_in_menu'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
@@ -194,7 +190,6 @@ $result_errors{'unknown_node_in_menu'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '@menu reference to nonexistent node `unknown\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/sectioning/unknown_node_in_menu_novalidate.pl 
b/tp/t/results/sectioning/unknown_node_in_menu_novalidate.pl
index 08abe5dc8e..04098c8e26 100644
--- a/tp/t/results/sectioning/unknown_node_in_menu_novalidate.pl
+++ b/tp/t/results/sectioning/unknown_node_in_menu_novalidate.pl
@@ -20,8 +20,7 @@ $result_trees{'unknown_node_in_menu_novalidate'} = {
           'cmdname' => 'novalidate',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -113,8 +112,7 @@ $result_trees{'unknown_node_in_menu_novalidate'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'type' => 'menu_entry'
             },
@@ -146,15 +144,13 @@ $result_trees{'unknown_node_in_menu_novalidate'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
@@ -169,8 +165,7 @@ $result_trees{'unknown_node_in_menu_novalidate'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     }
   ],
diff --git a/tp/t/results/sectioning/unnumbered_before_node_top_top.pl 
b/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
index b724b809b2..183271a629 100644
--- a/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
+++ b/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
@@ -54,8 +54,7 @@ $result_trees{'unnumbered_before_node_top_top'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     'unit_contents' => [
@@ -104,8 +103,7 @@ $result_trees{'unnumbered_before_node_top_top'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     'unit_contents' => [
@@ -138,8 +136,7 @@ $result_trees{'unnumbered_before_node_top_top'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 5,
-          'macro' => ''
+          'line_nr' => 5
         }
       },
       {}
@@ -356,7 +353,6 @@ $result_errors{'unnumbered_before_node_top_top'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'lowering the section level of @top appearing after a lower 
element',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/unnumbered_before_top.pl 
b/tp/t/results/sectioning/unnumbered_before_top.pl
index f1728a2a8e..dfbef391b2 100644
--- a/tp/t/results/sectioning/unnumbered_before_top.pl
+++ b/tp/t/results/sectioning/unnumbered_before_top.pl
@@ -43,8 +43,7 @@ $result_trees{'unnumbered_before_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -73,8 +72,7 @@ $result_trees{'unnumbered_before_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     }
   ],
@@ -132,7 +130,6 @@ $result_errors{'unnumbered_before_top'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'lowering the section level of @top appearing after a lower 
element',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/unnumbered_before_top_node.pl 
b/tp/t/results/sectioning/unnumbered_before_top_node.pl
index cc4170d2ed..af98f52141 100644
--- a/tp/t/results/sectioning/unnumbered_before_top_node.pl
+++ b/tp/t/results/sectioning/unnumbered_before_top_node.pl
@@ -40,8 +40,7 @@ $result_trees{'unnumbered_before_top_node'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     'unit_contents' => [
@@ -96,8 +95,7 @@ $result_trees{'unnumbered_before_top_node'} = [
             'cmdname' => 'titlefont',
             'source_info' => {
               'file_name' => '',
-              'line_nr' => 6,
-              'macro' => ''
+              'line_nr' => 6
             }
           },
           {
@@ -116,8 +114,7 @@ $result_trees{'unnumbered_before_top_node'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 3,
-          'macro' => ''
+          'line_nr' => 3
         }
       }
     ],
diff --git a/tp/t/results/sectioning/unnumbered_no_argument.pl 
b/tp/t/results/sectioning/unnumbered_no_argument.pl
index eacb90eadd..f504910f17 100644
--- a/tp/t/results/sectioning/unnumbered_no_argument.pl
+++ b/tp/t/results/sectioning/unnumbered_no_argument.pl
@@ -26,8 +26,7 @@ $result_trees{'unnumbered_no_argument'} = {
       'extra' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
@@ -62,7 +61,6 @@ $result_errors{'unnumbered_no_argument'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@unnumbered missing argument',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl 
b/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
index 942daf480e..b366806707 100644
--- a/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
+++ b/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
@@ -63,8 +63,7 @@ $result_trees{'unnumbered_top_without_node_nodes'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     'unit_contents' => [
@@ -119,8 +118,7 @@ $result_trees{'unnumbered_top_without_node_nodes'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 2,
-          'macro' => ''
+          'line_nr' => 2
         }
       },
       {
@@ -165,8 +163,7 @@ $result_trees{'unnumbered_top_without_node_nodes'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 6,
-          'macro' => ''
+          'line_nr' => 6
         }
       }
     ],
@@ -229,8 +226,7 @@ $result_trees{'unnumbered_top_without_node_nodes'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     },
     'unit_contents' => [
@@ -279,8 +275,7 @@ $result_trees{'unnumbered_top_without_node_nodes'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 10,
-          'macro' => ''
+          'line_nr' => 10
         }
       }
     ],
@@ -600,7 +595,6 @@ $result_errors{'unnumbered_top_without_node_nodes'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'lowering the section level of @top appearing after a lower 
element',
     'type' => 'warning'
   },
@@ -609,7 +603,6 @@ $result_errors{'unnumbered_top_without_node_nodes'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'node `second\' unreferenced',
     'type' => 'warning'
   }
diff --git a/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl 
b/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
index 839e4172ed..5fe9b0c954 100644
--- a/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
+++ b/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
@@ -54,8 +54,7 @@ $result_trees{'unnumbered_top_without_node_sections'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     'unit_contents' => [
@@ -123,8 +122,7 @@ $result_trees{'unnumbered_top_without_node_sections'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 1,
-          'macro' => ''
+          'line_nr' => 1
         }
       },
       {}
@@ -174,8 +172,7 @@ $result_trees{'unnumbered_top_without_node_sections'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     'unit_contents' => [
@@ -228,8 +225,7 @@ $result_trees{'unnumbered_top_without_node_sections'} = [
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     'unit_contents' => [
@@ -289,8 +285,7 @@ $result_trees{'unnumbered_top_without_node_sections'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 9,
-          'macro' => ''
+          'line_nr' => 9
         }
       },
       {}
@@ -706,7 +701,6 @@ $result_errors{'unnumbered_top_without_node_sections'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'lowering the section level of @top appearing after a lower 
element',
     'type' => 'warning'
   },
@@ -715,7 +709,6 @@ $result_errors{'unnumbered_top_without_node_sections'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'node `second\' unreferenced',
     'type' => 'warning'
   }
diff --git 
a/tp/t/results/transformations/index_entries_relate_to_item_no_transformation.pl
 
b/tp/t/results/transformations/index_entries_relate_to_item_no_transformation.pl
index 59b8a6303a..2c2b5c3cba 100644
--- 
a/tp/t/results/transformations/index_entries_relate_to_item_no_transformation.pl
+++ 
b/tp/t/results/transformations/index_entries_relate_to_item_no_transformation.pl
@@ -59,8 +59,7 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
       },
       'source_info' => {
         'file_name' => 'index_entries_relate_to_item.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -96,8 +95,7 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
       },
       'source_info' => {
         'file_name' => 'index_entries_relate_to_item.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -130,8 +128,7 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
       },
       'source_info' => {
         'file_name' => 'index_entries_relate_to_item.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -166,8 +163,7 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => 'index_entries_relate_to_item.texi',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   },
                   'type' => 'command_as_argument'
                 }
@@ -230,8 +226,7 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_entries_relate_to_item.texi',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       },
                       'type' => 'index_entry_command'
                     },
@@ -268,8 +263,7 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_entries_relate_to_item.texi',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       },
                       'type' => 'index_entry_command'
                     },
@@ -306,8 +300,7 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_entries_relate_to_item.texi',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       },
                       'type' => 'index_entry_command'
                     },
@@ -336,8 +329,7 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_entries_relate_to_item.texi',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     },
                     {
@@ -365,8 +357,7 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_entries_relate_to_item.texi',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     },
                     {
@@ -394,8 +385,7 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_entries_relate_to_item.texi',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     }
                   ],
@@ -457,8 +447,7 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_entries_relate_to_item.texi',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     }
                   ],
@@ -519,8 +508,7 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
               },
               'source_info' => {
                 'file_name' => 'index_entries_relate_to_item.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             }
           ],
@@ -534,8 +522,7 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
           },
           'source_info' => {
             'file_name' => 'index_entries_relate_to_item.texi',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -573,8 +560,7 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
           },
           'source_info' => {
             'file_name' => 'index_entries_relate_to_item.texi',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         },
         {
@@ -593,8 +579,7 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
       },
       'source_info' => {
         'file_name' => 'index_entries_relate_to_item.texi',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
diff --git 
a/tp/t/results/transformations/index_entries_relate_to_item_transformation.pl 
b/tp/t/results/transformations/index_entries_relate_to_item_transformation.pl
index fc25ec9560..beb660565b 100644
--- 
a/tp/t/results/transformations/index_entries_relate_to_item_transformation.pl
+++ 
b/tp/t/results/transformations/index_entries_relate_to_item_transformation.pl
@@ -59,8 +59,7 @@ $result_trees{'index_entries_relate_to_item_transformation'} 
= {
       },
       'source_info' => {
         'file_name' => 'index_entries_relate_to_item.texi',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -96,8 +95,7 @@ $result_trees{'index_entries_relate_to_item_transformation'} 
= {
       },
       'source_info' => {
         'file_name' => 'index_entries_relate_to_item.texi',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -130,8 +128,7 @@ 
$result_trees{'index_entries_relate_to_item_transformation'} = {
       },
       'source_info' => {
         'file_name' => 'index_entries_relate_to_item.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -166,8 +163,7 @@ 
$result_trees{'index_entries_relate_to_item_transformation'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => 'index_entries_relate_to_item.texi',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   },
                   'type' => 'command_as_argument'
                 }
@@ -230,8 +226,7 @@ 
$result_trees{'index_entries_relate_to_item_transformation'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_entries_relate_to_item.texi',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       },
                       'type' => 'index_entry_command'
                     },
@@ -268,8 +263,7 @@ 
$result_trees{'index_entries_relate_to_item_transformation'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_entries_relate_to_item.texi',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       },
                       'type' => 'index_entry_command'
                     },
@@ -306,8 +300,7 @@ 
$result_trees{'index_entries_relate_to_item_transformation'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_entries_relate_to_item.texi',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       },
                       'type' => 'index_entry_command'
                     },
@@ -336,8 +329,7 @@ 
$result_trees{'index_entries_relate_to_item_transformation'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_entries_relate_to_item.texi',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     },
                     {
@@ -365,8 +357,7 @@ 
$result_trees{'index_entries_relate_to_item_transformation'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_entries_relate_to_item.texi',
-                        'line_nr' => 15,
-                        'macro' => ''
+                        'line_nr' => 15
                       }
                     },
                     {
@@ -394,8 +385,7 @@ 
$result_trees{'index_entries_relate_to_item_transformation'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_entries_relate_to_item.texi',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     }
                   ],
@@ -457,8 +447,7 @@ 
$result_trees{'index_entries_relate_to_item_transformation'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_entries_relate_to_item.texi',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     }
                   ],
@@ -519,8 +508,7 @@ 
$result_trees{'index_entries_relate_to_item_transformation'} = {
               },
               'source_info' => {
                 'file_name' => 'index_entries_relate_to_item.texi',
-                'line_nr' => 24,
-                'macro' => ''
+                'line_nr' => 24
               }
             }
           ],
@@ -534,8 +522,7 @@ 
$result_trees{'index_entries_relate_to_item_transformation'} = {
           },
           'source_info' => {
             'file_name' => 'index_entries_relate_to_item.texi',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -573,8 +560,7 @@ 
$result_trees{'index_entries_relate_to_item_transformation'} = {
           },
           'source_info' => {
             'file_name' => 'index_entries_relate_to_item.texi',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         },
         {
@@ -593,8 +579,7 @@ 
$result_trees{'index_entries_relate_to_item_transformation'} = {
       },
       'source_info' => {
         'file_name' => 'index_entries_relate_to_item.texi',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
diff --git a/tp/t/results/transformations/master_menu_fr.pl 
b/tp/t/results/transformations/master_menu_fr.pl
index 0aa31cd7dd..5f9f2dceea 100644
--- a/tp/t/results/transformations/master_menu_fr.pl
+++ b/tp/t/results/transformations/master_menu_fr.pl
@@ -54,8 +54,7 @@ $result_trees{'master_menu_fr'} = {
               },
               'source_info' => {
                 'file_name' => 'no_master_menu_fr.texi',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -98,8 +97,7 @@ $result_trees{'master_menu_fr'} = {
       },
       'source_info' => {
         'file_name' => 'no_master_menu_fr.texi',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -183,8 +181,7 @@ $result_trees{'master_menu_fr'} = {
               ],
               'source_info' => {
                 'file_name' => 'no_master_menu_fr.texi',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'type' => 'menu_entry'
             },
@@ -352,15 +349,13 @@ $result_trees{'master_menu_fr'} = {
               },
               'source_info' => {
                 'file_name' => 'no_master_menu_fr.texi',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
           'source_info' => {
             'file_name' => 'no_master_menu_fr.texi',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -377,8 +372,7 @@ $result_trees{'master_menu_fr'} = {
       },
       'source_info' => {
         'file_name' => 'no_master_menu_fr.texi',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -410,8 +404,7 @@ $result_trees{'master_menu_fr'} = {
       },
       'source_info' => {
         'file_name' => 'no_master_menu_fr.texi',
-        'line_nr' => 12,
-        'macro' => ''
+        'line_nr' => 12
       }
     },
     {
@@ -495,8 +488,7 @@ $result_trees{'master_menu_fr'} = {
               ],
               'source_info' => {
                 'file_name' => 'no_master_menu_fr.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               },
               'type' => 'menu_entry'
             },
@@ -528,15 +520,13 @@ $result_trees{'master_menu_fr'} = {
               },
               'source_info' => {
                 'file_name' => 'no_master_menu_fr.texi',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             }
           ],
           'source_info' => {
             'file_name' => 'no_master_menu_fr.texi',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         },
         {
@@ -555,8 +545,7 @@ $result_trees{'master_menu_fr'} = {
       },
       'source_info' => {
         'file_name' => 'no_master_menu_fr.texi',
-        'line_nr' => 13,
-        'macro' => ''
+        'line_nr' => 13
       }
     },
     {
@@ -588,8 +577,7 @@ $result_trees{'master_menu_fr'} = {
       },
       'source_info' => {
         'file_name' => 'no_master_menu_fr.texi',
-        'line_nr' => 19,
-        'macro' => ''
+        'line_nr' => 19
       }
     },
     {
@@ -620,8 +608,7 @@ $result_trees{'master_menu_fr'} = {
       },
       'source_info' => {
         'file_name' => 'no_master_menu_fr.texi',
-        'line_nr' => 20,
-        'macro' => ''
+        'line_nr' => 20
       }
     }
   ],
diff --git a/tp/t/results/transformations/protect_colon_source_mark.pl 
b/tp/t/results/transformations/protect_colon_source_mark.pl
index e0485bfec5..24f068b829 100644
--- a/tp/t/results/transformations/protect_colon_source_mark.pl
+++ b/tp/t/results/transformations/protect_colon_source_mark.pl
@@ -55,8 +55,7 @@ $result_trees{'protect_colon_source_mark'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -66,8 +65,7 @@ $result_trees{'protect_colon_source_mark'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git a/tp/t/results/transformations/protect_comma_source_mark.pl 
b/tp/t/results/transformations/protect_comma_source_mark.pl
index bc564452b0..a6b792f38c 100644
--- a/tp/t/results/transformations/protect_comma_source_mark.pl
+++ b/tp/t/results/transformations/protect_comma_source_mark.pl
@@ -51,8 +51,7 @@ $result_trees{'protect_comma_source_mark'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'protect_comma_source_mark'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git 
a/tp/t/results/transformations/protect_first_parenthesis_after_parenthesis_source_mark.pl
 
b/tp/t/results/transformations/protect_first_parenthesis_after_parenthesis_source_mark.pl
index 98d162a1a2..2ea026ef6f 100644
--- 
a/tp/t/results/transformations/protect_first_parenthesis_after_parenthesis_source_mark.pl
+++ 
b/tp/t/results/transformations/protect_first_parenthesis_after_parenthesis_source_mark.pl
@@ -51,8 +51,7 @@ 
$result_trees{'protect_first_parenthesis_after_parenthesis_source_mark'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ 
$result_trees{'protect_first_parenthesis_after_parenthesis_source_mark'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -131,8 +129,7 @@ 
$result_trees{'protect_first_parenthesis_after_parenthesis_source_mark'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
diff --git 
a/tp/t/results/transformations/protect_first_parenthesis_source_mark.pl 
b/tp/t/results/transformations/protect_first_parenthesis_source_mark.pl
index e1d187571b..3cede0258b 100644
--- a/tp/t/results/transformations/protect_first_parenthesis_source_mark.pl
+++ b/tp/t/results/transformations/protect_first_parenthesis_source_mark.pl
@@ -51,8 +51,7 @@ $result_trees{'protect_first_parenthesis_source_mark'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ $result_trees{'protect_first_parenthesis_source_mark'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -131,8 +129,7 @@ $result_trees{'protect_first_parenthesis_source_mark'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
diff --git 
a/tp/t/results/transformations/protect_hashchar_at_line_beginning_source_mark.pl
 
b/tp/t/results/transformations/protect_hashchar_at_line_beginning_source_mark.pl
index aed1a815cb..314d31b9b2 100644
--- 
a/tp/t/results/transformations/protect_hashchar_at_line_beginning_source_mark.pl
+++ 
b/tp/t/results/transformations/protect_hashchar_at_line_beginning_source_mark.pl
@@ -63,8 +63,7 @@ 
$result_trees{'protect_hashchar_at_line_beginning_source_mark'} = {
                   },
                   'source_info' => {
                     'file_name' => 'cpp_directives_line_value_macro.texi',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   }
                 }
               ],
@@ -74,8 +73,7 @@ 
$result_trees{'protect_hashchar_at_line_beginning_source_mark'} = {
               },
               'source_info' => {
                 'file_name' => 'cpp_directives_line_value_macro.texi',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -177,8 +175,7 @@ 
$result_trees{'protect_hashchar_at_line_beginning_source_mark'} = {
               },
               'source_info' => {
                 'file_name' => 'cpp_directives_line_value_macro.texi',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
@@ -188,8 +185,7 @@ 
$result_trees{'protect_hashchar_at_line_beginning_source_mark'} = {
           },
           'source_info' => {
             'file_name' => 'cpp_directives_line_value_macro.texi',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -291,8 +287,7 @@ 
$result_trees{'protect_hashchar_at_line_beginning_source_mark'} = {
               },
               'source_info' => {
                 'file_name' => 'cpp_directives_line_value_macro.texi',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               }
             }
           ],
@@ -302,8 +297,7 @@ 
$result_trees{'protect_hashchar_at_line_beginning_source_mark'} = {
           },
           'source_info' => {
             'file_name' => 'cpp_directives_line_value_macro.texi',
-            'line_nr' => 14,
-            'macro' => ''
+            'line_nr' => 14
           }
         },
         {
@@ -496,7 +490,6 @@ 
$result_errors{'protect_hashchar_at_line_beginning_source_mark'} = [
 ',
     'file_name' => 'cpp_directives_line_value_macro.texi',
     'line_nr' => 24,
-    'macro' => '',
     'text' => 'unknown command `unknown\'',
     'type' => 'error'
   },
@@ -505,7 +498,6 @@ 
$result_errors{'protect_hashchar_at_line_beginning_source_mark'} = [
 ',
     'file_name' => 'cpp_directives_line_value_macro.texi',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'could not protect hash character in @macro',
     'type' => 'warning'
   }
diff --git 
a/tp/t/results/transformations/protect_node_after_label_source_mark_in_protected.pl
 
b/tp/t/results/transformations/protect_node_after_label_source_mark_in_protected.pl
index a7572ffcf7..9e979200b9 100644
--- 
a/tp/t/results/transformations/protect_node_after_label_source_mark_in_protected.pl
+++ 
b/tp/t/results/transformations/protect_node_after_label_source_mark_in_protected.pl
@@ -51,8 +51,7 @@ 
$result_trees{'protect_node_after_label_source_mark_in_protected'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -62,8 +61,7 @@ 
$result_trees{'protect_node_after_label_source_mark_in_protected'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
diff --git 
a/tp/t/results/transformations/regenerate_master_menu_no_need_for_master_menu.pl
 
b/tp/t/results/transformations/regenerate_master_menu_no_need_for_master_menu.pl
index ea30d542e2..e92764563d 100644
--- 
a/tp/t/results/transformations/regenerate_master_menu_no_need_for_master_menu.pl
+++ 
b/tp/t/results/transformations/regenerate_master_menu_no_need_for_master_menu.pl
@@ -39,8 +39,7 @@ 
$result_trees{'regenerate_master_menu_no_need_for_master_menu'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -124,8 +123,7 @@ 
$result_trees{'regenerate_master_menu_no_need_for_master_menu'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'type' => 'menu_entry'
             },
@@ -157,15 +155,13 @@ 
$result_trees{'regenerate_master_menu_no_need_for_master_menu'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -182,8 +178,7 @@ 
$result_trees{'regenerate_master_menu_no_need_for_master_menu'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -215,8 +210,7 @@ 
$result_trees{'regenerate_master_menu_no_need_for_master_menu'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -247,8 +241,7 @@ 
$result_trees{'regenerate_master_menu_no_need_for_master_menu'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     }
   ],
diff --git a/tp/t/results/value/bad_syntax.pl b/tp/t/results/value/bad_syntax.pl
index 9f62e44b11..f850ff9f69 100644
--- a/tp/t/results/value/bad_syntax.pl
+++ b/tp/t/results/value/bad_syntax.pl
@@ -157,7 +157,6 @@ $result_errors{'bad_syntax'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@set requires a name',
     'type' => 'error'
   },
@@ -166,7 +165,6 @@ $result_errors{'bad_syntax'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@set requires a name',
     'type' => 'error'
   },
@@ -175,7 +173,6 @@ $result_errors{'bad_syntax'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'bad name for @set',
     'type' => 'error'
   },
@@ -184,7 +181,6 @@ $result_errors{'bad_syntax'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'bad name for @set',
     'type' => 'error'
   },
@@ -193,7 +189,6 @@ $result_errors{'bad_syntax'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'bad name for @set',
     'type' => 'error'
   },
@@ -202,7 +197,6 @@ $result_errors{'bad_syntax'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'bad name for @set',
     'type' => 'error'
   },
@@ -211,7 +205,6 @@ $result_errors{'bad_syntax'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => 'bad name for @set',
     'type' => 'error'
   },
@@ -220,7 +213,6 @@ $result_errors{'bad_syntax'} = [
 ',
     'file_name' => '',
     'line_nr' => 10,
-    'macro' => '',
     'text' => 'bad name for @clear',
     'type' => 'error'
   },
@@ -229,7 +221,6 @@ $result_errors{'bad_syntax'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'bad name for @clear',
     'type' => 'error'
   },
@@ -238,7 +229,6 @@ $result_errors{'bad_syntax'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => 'bad syntax for @value',
     'type' => 'error'
   },
@@ -247,7 +237,6 @@ $result_errors{'bad_syntax'} = [
 ',
     'file_name' => '',
     'line_nr' => 13,
-    'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
   },
@@ -256,7 +245,6 @@ $result_errors{'bad_syntax'} = [
 ',
     'file_name' => '',
     'line_nr' => 15,
-    'macro' => '',
     'text' => 'undefined flag: unknown',
     'type' => 'warning'
   }
diff --git a/tp/t/results/value/begin_like_comment_on_set_line.pl 
b/tp/t/results/value/begin_like_comment_on_set_line.pl
index 01676b38bc..a14234e291 100644
--- a/tp/t/results/value/begin_like_comment_on_set_line.pl
+++ b/tp/t/results/value/begin_like_comment_on_set_line.pl
@@ -115,7 +115,6 @@ $result_errors{'begin_like_comment_on_set_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'bad name for @set',
     'type' => 'error'
   },
@@ -124,7 +123,6 @@ $result_errors{'begin_like_comment_on_set_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'undefined flag: x',
     'type' => 'warning'
   },
@@ -133,7 +131,6 @@ $result_errors{'begin_like_comment_on_set_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'unknown command `commentary\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/value/closing_brace_in_value_in_ignored_inline.pl 
b/tp/t/results/value/closing_brace_in_value_in_ignored_inline.pl
index dc0e79b51e..6aceef6354 100644
--- a/tp/t/results/value/closing_brace_in_value_in_ignored_inline.pl
+++ b/tp/t/results/value/closing_brace_in_value_in_ignored_inline.pl
@@ -87,8 +87,7 @@ $result_trees{'closing_brace_in_value_in_ignored_inline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               },
               'source_marks' => [
                 {
@@ -145,8 +144,7 @@ after
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -183,7 +181,6 @@ $result_errors{'closing_brace_in_value_in_ignored_inline'} 
= [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '@inlinefmt missing closing brace',
     'type' => 'error'
   }
diff --git a/tp/t/results/value/comment_on_clear_line.pl 
b/tp/t/results/value/comment_on_clear_line.pl
index d0775c9929..4bd4c5cc5c 100644
--- a/tp/t/results/value/comment_on_clear_line.pl
+++ b/tp/t/results/value/comment_on_clear_line.pl
@@ -254,7 +254,6 @@ $result_errors{'comment_on_clear_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => 'bad name for @clear',
     'type' => 'error'
   },
@@ -263,7 +262,6 @@ $result_errors{'comment_on_clear_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'bad name for @clear',
     'type' => 'error'
   },
@@ -272,7 +270,6 @@ $result_errors{'comment_on_clear_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'undefined flag: x',
     'type' => 'warning'
   },
@@ -281,7 +278,6 @@ $result_errors{'comment_on_clear_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'undefined flag: y',
     'type' => 'warning'
   }
diff --git a/tp/t/results/value/ignored_value_definition.pl 
b/tp/t/results/value/ignored_value_definition.pl
index 53b366b3cc..8e5344d022 100644
--- a/tp/t/results/value/ignored_value_definition.pl
+++ b/tp/t/results/value/ignored_value_definition.pl
@@ -61,8 +61,7 @@ $result_trees{'ignored_value_definition'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
diff --git a/tp/t/results/value/recursive_expansion_in_set.pl 
b/tp/t/results/value/recursive_expansion_in_set.pl
index 381cbf1928..42f492aa40 100644
--- a/tp/t/results/value/recursive_expansion_in_set.pl
+++ b/tp/t/results/value/recursive_expansion_in_set.pl
@@ -2454,7 +2454,6 @@ $result_errors{'recursive_expansion_in_set'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'value call nested too deeply (set MAX_MACRO_CALL_NESTING to 
override; current value 100)',
     'type' => 'warning'
   }
diff --git a/tp/t/results/value/set_flag_command_equivalent.pl 
b/tp/t/results/value/set_flag_command_equivalent.pl
index 96beaacf71..72c69fb762 100644
--- a/tp/t/results/value/set_flag_command_equivalent.pl
+++ b/tp/t/results/value/set_flag_command_equivalent.pl
@@ -39,8 +39,7 @@ $result_trees{'set_flag_command_equivalent'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -120,8 +119,7 @@ $result_trees{'set_flag_command_equivalent'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
diff --git a/tp/t/results/value/set_form_feed.pl 
b/tp/t/results/value/set_form_feed.pl
index 6f950b52b2..98b6907363 100644
--- a/tp/t/results/value/set_form_feed.pl
+++ b/tp/t/results/value/set_form_feed.pl
@@ -160,8 +160,7 @@ $result_trees{'set_form_feed'} = {
               'cmdname' => 'code',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             },
             {
diff --git a/tp/t/results/value/set_in_item_missing_line.pl 
b/tp/t/results/value/set_in_item_missing_line.pl
index dd5505b24d..c38d7b6a6b 100644
--- a/tp/t/results/value/set_in_item_missing_line.pl
+++ b/tp/t/results/value/set_in_item_missing_line.pl
@@ -17,8 +17,7 @@ $result_trees{'set_in_item_missing_line'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'command_as_argument'
                 }
@@ -74,8 +73,7 @@ $result_trees{'set_in_item_missing_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -113,8 +111,7 @@ $result_trees{'set_in_item_missing_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -151,8 +148,7 @@ $result_trees{'set_in_item_missing_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -166,8 +162,7 @@ $result_trees{'set_in_item_missing_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -183,8 +178,7 @@ $result_trees{'set_in_item_missing_line'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   },
                   'type' => 'command_as_argument'
                 }
@@ -240,8 +234,7 @@ $result_trees{'set_in_item_missing_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     }
                   ],
@@ -279,8 +272,7 @@ $result_trees{'set_in_item_missing_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     }
                   ],
@@ -317,8 +309,7 @@ $result_trees{'set_in_item_missing_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
@@ -332,8 +323,7 @@ $result_trees{'set_in_item_missing_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         }
       ],
@@ -370,7 +360,6 @@ $result_errors{'set_in_item_missing_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@set should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -379,7 +368,6 @@ $result_errors{'set_in_item_missing_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '@set should only appear at the beginning of a line',
     'type' => 'warning'
   }
diff --git a/tp/t/results/value/set_on_item_line.pl 
b/tp/t/results/value/set_on_item_line.pl
index ec16186407..3e37b4afe3 100644
--- a/tp/t/results/value/set_on_item_line.pl
+++ b/tp/t/results/value/set_on_item_line.pl
@@ -17,8 +17,7 @@ $result_trees{'set_on_item_line'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'command_as_argument'
                 }
@@ -71,8 +70,7 @@ $result_trees{'set_on_item_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -139,8 +137,7 @@ $result_trees{'set_on_item_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
@@ -203,8 +200,7 @@ $result_trees{'set_on_item_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     }
                   ],
@@ -241,8 +237,7 @@ $result_trees{'set_on_item_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
@@ -256,8 +251,7 @@ $result_trees{'set_on_item_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -273,8 +267,7 @@ $result_trees{'set_on_item_line'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
-                    'macro' => ''
+                    'line_nr' => 10
                   },
                   'type' => 'command_as_argument'
                 }
@@ -327,8 +320,7 @@ $result_trees{'set_on_item_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
-                        'macro' => ''
+                        'line_nr' => 11
                       }
                     }
                   ],
@@ -395,8 +387,7 @@ $result_trees{'set_on_item_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     }
                   ],
@@ -459,8 +450,7 @@ $result_trees{'set_on_item_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     }
                   ],
@@ -497,8 +487,7 @@ $result_trees{'set_on_item_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             }
           ],
@@ -512,8 +501,7 @@ $result_trees{'set_on_item_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         }
       ],
@@ -566,7 +554,6 @@ $result_errors{'set_on_item_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@set should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -575,7 +562,6 @@ $result_errors{'set_on_item_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '@set should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -584,7 +570,6 @@ $result_errors{'set_on_item_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 14,
-    'macro' => '',
     'text' => '@set should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -593,7 +578,6 @@ $result_errors{'set_on_item_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 16,
-    'macro' => '',
     'text' => '@set should only appear at the beginning of a line',
     'type' => 'warning'
   }
diff --git a/tp/t/results/value/simple.pl b/tp/t/results/value/simple.pl
index cf18bff5a5..beba5a15f4 100644
--- a/tp/t/results/value/simple.pl
+++ b/tp/t/results/value/simple.pl
@@ -72,8 +72,7 @@ $result_trees{'simple'} = {
               'cmdname' => 'b',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               },
               'source_marks' => [
                 {
diff --git a/tp/t/results/value/value_after_accent.pl 
b/tp/t/results/value/value_after_accent.pl
index e2c7a0d392..f701a4629e 100644
--- a/tp/t/results/value/value_after_accent.pl
+++ b/tp/t/results/value/value_after_accent.pl
@@ -69,8 +69,7 @@ $result_trees{'value_after_accent'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               },
               'source_marks' => [
                 {
@@ -124,8 +123,7 @@ $result_trees{'value_after_accent'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               },
               'source_marks' => [
                 {
diff --git a/tp/t/results/value/value_after_brace_command.pl 
b/tp/t/results/value/value_after_brace_command.pl
index a14825de36..2b47839bbf 100644
--- a/tp/t/results/value/value_after_brace_command.pl
+++ b/tp/t/results/value/value_after_brace_command.pl
@@ -91,8 +91,7 @@ $result_trees{'value_after_brace_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               },
               'source_marks' => [
                 {
@@ -137,8 +136,7 @@ $result_trees{'value_after_brace_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               },
               'source_marks' => [
                 {
@@ -193,8 +191,7 @@ $result_trees{'value_after_brace_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               },
               'source_marks' => [
                 {
@@ -239,8 +236,7 @@ $result_trees{'value_after_brace_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'source_marks' => [
                 {
@@ -295,8 +291,7 @@ $result_trees{'value_after_brace_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               },
               'source_marks' => [
                 {
@@ -341,8 +336,7 @@ $result_trees{'value_after_brace_command'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               },
               'source_marks' => [
                 {
@@ -393,7 +387,6 @@ $result_errors{'value_after_brace_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => '@ringaccent expected braces',
     'type' => 'error'
   },
@@ -402,7 +395,6 @@ $result_errors{'value_after_brace_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'unknown command `unknown\'',
     'type' => 'error'
   },
@@ -411,7 +403,6 @@ $result_errors{'value_after_brace_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '@^ expected braces',
     'type' => 'error'
   },
@@ -420,7 +411,6 @@ $result_errors{'value_after_brace_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'unknown command `unknown\'',
     'type' => 'error'
   },
@@ -429,7 +419,6 @@ $result_errors{'value_after_brace_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => '@code expected braces',
     'type' => 'error'
   },
@@ -438,7 +427,6 @@ $result_errors{'value_after_brace_command'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'unknown command `unknown\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/value/value_in_index_commands.pl 
b/tp/t/results/value/value_in_index_commands.pl
index ed77329574..8c67a8ce44 100644
--- a/tp/t/results/value/value_in_index_commands.pl
+++ b/tp/t/results/value/value_in_index_commands.pl
@@ -152,8 +152,7 @@ $result_trees{'value_in_index_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           },
           'source_marks' => [
             {
@@ -215,8 +214,7 @@ $result_trees{'value_in_index_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -312,8 +310,7 @@ $result_trees{'value_in_index_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             },
             {
@@ -432,8 +429,7 @@ $result_trees{'value_in_index_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           }
         },
         {
@@ -495,8 +491,7 @@ $result_trees{'value_in_index_commands'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 22,
-        'macro' => ''
+        'line_nr' => 22
       }
     },
     {
@@ -585,8 +580,7 @@ $result_trees{'value_in_index_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           },
           'type' => 'index_entry_command'
         },
@@ -616,8 +610,7 @@ $result_trees{'value_in_index_commands'} = {
                   'cmdname' => 'var',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 27,
-                    'macro' => ''
+                    'line_nr' => 27
                   }
                 },
                 {
@@ -637,8 +630,7 @@ $result_trees{'value_in_index_commands'} = {
                   'cmdname' => '\'',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 27,
-                    'macro' => ''
+                    'line_nr' => 27
                   }
                 },
                 {
@@ -662,8 +654,7 @@ $result_trees{'value_in_index_commands'} = {
                           'cmdname' => 'dotless',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 27,
-                            'macro' => ''
+                            'line_nr' => 27
                           }
                         }
                       ],
@@ -673,8 +664,7 @@ $result_trees{'value_in_index_commands'} = {
                   'cmdname' => '^',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 27,
-                    'macro' => ''
+                    'line_nr' => 27
                   },
                   'source_marks' => [
                     {
@@ -732,8 +722,7 @@ $result_trees{'value_in_index_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 27,
-            'macro' => ''
+            'line_nr' => 27
           },
           'type' => 'index_entry_command'
         },
@@ -805,8 +794,7 @@ $result_trees{'value_in_index_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 29,
-            'macro' => ''
+            'line_nr' => 29
           },
           'type' => 'index_entry_command'
         },
@@ -871,8 +859,7 @@ $result_trees{'value_in_index_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 30,
-            'macro' => ''
+            'line_nr' => 30
           },
           'type' => 'index_entry_command'
         },
@@ -950,8 +937,7 @@ $result_trees{'value_in_index_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 33,
-            'macro' => ''
+            'line_nr' => 33
           }
         },
         {
@@ -1028,8 +1014,7 @@ $result_trees{'value_in_index_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 36,
-            'macro' => ''
+            'line_nr' => 36
           }
         }
       ],
@@ -1045,8 +1030,7 @@ $result_trees{'value_in_index_commands'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 23,
-        'macro' => ''
+        'line_nr' => 23
       }
     }
   ],
@@ -1158,7 +1142,6 @@ $result_errors{'value_in_index_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 36,
-    'macro' => '',
     'text' => 'printing an index `cp\' merged in another one, `fn\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/value/value_in_invalid_documentencoding.pl 
b/tp/t/results/value/value_in_invalid_documentencoding.pl
index 5fefa72e9a..74a13c00bd 100644
--- a/tp/t/results/value/value_in_invalid_documentencoding.pl
+++ b/tp/t/results/value/value_in_invalid_documentencoding.pl
@@ -84,8 +84,7 @@ $result_trees{'value_in_invalid_documentencoding'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
@@ -108,7 +107,6 @@ $result_errors{'value_in_invalid_documentencoding'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'encoding `bad\' is not a canonical texinfo encoding',
     'type' => 'warning'
   },
@@ -117,7 +115,6 @@ $result_errors{'value_in_invalid_documentencoding'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'unhandled encoding name `bad\'',
     'type' => 'warning'
   }
diff --git a/tp/t/results/value/value_in_misc_commands.pl 
b/tp/t/results/value/value_in_misc_commands.pl
index 2b9f87042c..e9f287dfb6 100644
--- a/tp/t/results/value/value_in_misc_commands.pl
+++ b/tp/t/results/value/value_in_misc_commands.pl
@@ -63,8 +63,7 @@ $result_trees{'value_in_misc_commands'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -128,8 +127,7 @@ $result_trees{'value_in_misc_commands'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -209,8 +207,7 @@ $result_trees{'value_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -304,8 +301,7 @@ $result_trees{'value_in_misc_commands'} = {
                 'cmdname' => 'ifnottex',
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 16,
-                  'macro' => ''
+                  'line_nr' => 16
                 }
               },
               'position' => 1,
@@ -372,8 +368,7 @@ $result_trees{'value_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           },
           'source_marks' => [
             {
@@ -406,8 +401,7 @@ $result_trees{'value_in_misc_commands'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 18,
-                  'macro' => ''
+                  'line_nr' => 18
                 }
               },
               'sourcemark_type' => 'expanded_conditional_command',
@@ -450,8 +444,7 @@ $result_trees{'value_in_misc_commands'} = {
           'cmdname' => 'afourpaper',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         },
         {
@@ -507,8 +500,7 @@ $result_trees{'value_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
@@ -564,8 +556,7 @@ $result_trees{'value_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 21,
-            'macro' => ''
+            'line_nr' => 21
           }
         },
         {
@@ -621,8 +612,7 @@ $result_trees{'value_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 22,
-            'macro' => ''
+            'line_nr' => 22
           }
         },
         {
@@ -666,8 +656,7 @@ $result_trees{'value_in_misc_commands'} = {
                 'cmdname' => 'ifnottex',
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 26,
-                  'macro' => ''
+                  'line_nr' => 26
                 }
               },
               'position' => 1,
@@ -739,8 +728,7 @@ $result_trees{'value_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 27,
-            'macro' => ''
+            'line_nr' => 27
           },
           'source_marks' => [
             {
@@ -773,8 +761,7 @@ $result_trees{'value_in_misc_commands'} = {
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 28,
-                  'macro' => ''
+                  'line_nr' => 28
                 }
               },
               'sourcemark_type' => 'expanded_conditional_command',
@@ -925,8 +912,7 @@ $result_trees{'value_in_misc_commands'} = {
                 'cmdname' => 'ifnottex',
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 36,
-                  'macro' => ''
+                  'line_nr' => 36
                 }
               },
               'sourcemark_type' => 'expanded_conditional_command',
@@ -974,8 +960,7 @@ $result_trees{'value_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 37,
-                'macro' => ''
+                'line_nr' => 37
               }
             }
           ],
@@ -1009,8 +994,7 @@ $result_trees{'value_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 39,
-                'macro' => ''
+                'line_nr' => 39
               },
               'type' => 'definfoenclose_command'
             },
@@ -1046,8 +1030,7 @@ $result_trees{'value_in_misc_commands'} = {
                     },
                     'source_info' => {
                       'file_name' => '',
-                      'line_nr' => 40,
-                      'macro' => ''
+                      'line_nr' => 40
                     }
                   },
                   'position' => 1,
@@ -1145,8 +1128,7 @@ $result_trees{'value_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 43,
-            'macro' => ''
+            'line_nr' => 43
           }
         },
         {
@@ -1177,8 +1159,7 @@ $result_trees{'value_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 45,
-                'macro' => ''
+                'line_nr' => 45
               },
               'type' => 'definfoenclose_command'
             },
@@ -1283,8 +1264,7 @@ $result_trees{'value_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
-                'macro' => ''
+                'line_nr' => 50
               }
             },
             {
@@ -1387,8 +1367,7 @@ $result_trees{'value_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 52,
-            'macro' => ''
+            'line_nr' => 52
           }
         },
         {
@@ -1451,8 +1430,7 @@ $result_trees{'value_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 54,
-                'macro' => ''
+                'line_nr' => 54
               },
               'type' => 'definfoenclose_command'
             },
@@ -1484,8 +1462,7 @@ $result_trees{'value_in_misc_commands'} = {
               'cmdname' => 'kbd',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             },
             {
@@ -1577,8 +1554,7 @@ $result_trees{'value_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 59,
-            'macro' => ''
+            'line_nr' => 59
           }
         },
         {
@@ -1605,8 +1581,7 @@ $result_trees{'value_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             },
             {
@@ -1654,8 +1629,7 @@ $result_trees{'value_in_misc_commands'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 64,
-                    'macro' => ''
+                    'line_nr' => 64
                   }
                 },
                 {
@@ -1693,15 +1667,13 @@ $result_trees{'value_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
-                'macro' => ''
+                'line_nr' => 65
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 63,
-            'macro' => ''
+            'line_nr' => 63
           }
         },
         {
@@ -1859,8 +1831,7 @@ $result_trees{'value_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 73,
-            'macro' => ''
+            'line_nr' => 73
           }
         },
         {
@@ -1923,8 +1894,7 @@ $result_trees{'value_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 74,
-            'macro' => ''
+            'line_nr' => 74
           }
         },
         {
@@ -1987,8 +1957,7 @@ $result_trees{'value_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 75,
-            'macro' => ''
+            'line_nr' => 75
           }
         },
         {
@@ -2051,8 +2020,7 @@ $result_trees{'value_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 76,
-            'macro' => ''
+            'line_nr' => 76
           }
         },
         {
@@ -2115,8 +2083,7 @@ $result_trees{'value_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 77,
-            'macro' => ''
+            'line_nr' => 77
           }
         },
         {
@@ -2179,8 +2146,7 @@ $result_trees{'value_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 78,
-            'macro' => ''
+            'line_nr' => 78
           }
         },
         {
@@ -2282,8 +2248,7 @@ $result_trees{'value_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 82,
-            'macro' => ''
+            'line_nr' => 82
           }
         },
         {
@@ -2346,8 +2311,7 @@ $result_trees{'value_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 83,
-            'macro' => ''
+            'line_nr' => 83
           }
         },
         {
@@ -2431,8 +2395,7 @@ $result_trees{'value_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 86,
-            'macro' => ''
+            'line_nr' => 86
           }
         },
         {
@@ -2542,8 +2505,7 @@ $result_trees{'value_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 91,
-                'macro' => ''
+                'line_nr' => 91
               }
             }
           ],
@@ -2617,8 +2579,7 @@ $result_trees{'value_in_misc_commands'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 94,
-                'macro' => ''
+                'line_nr' => 94
               }
             },
             {
@@ -2727,8 +2688,7 @@ $result_trees{'value_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 99,
-            'macro' => ''
+            'line_nr' => 99
           }
         },
         {
@@ -2791,8 +2751,7 @@ $result_trees{'value_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 100,
-            'macro' => ''
+            'line_nr' => 100
           }
         },
         {
@@ -2887,8 +2846,7 @@ $result_trees{'value_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 104,
-            'macro' => ''
+            'line_nr' => 104
           }
         },
         {
@@ -3010,8 +2968,7 @@ $result_trees{'value_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 110,
-            'macro' => ''
+            'line_nr' => 110
           }
         },
         {
@@ -3079,8 +3036,7 @@ $result_trees{'value_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 112,
-            'macro' => ''
+            'line_nr' => 112
           }
         },
         {
@@ -3225,8 +3181,7 @@ $result_trees{'value_in_misc_commands'} = {
           'cmdname' => 'noindent',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 120,
-            'macro' => ''
+            'line_nr' => 120
           }
         },
         {
@@ -3272,8 +3227,7 @@ $result_trees{'value_in_misc_commands'} = {
               'cmdname' => 'noindent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 121,
-                'macro' => ''
+                'line_nr' => 121
               }
             },
             {
@@ -3321,8 +3275,7 @@ $result_trees{'value_in_misc_commands'} = {
               'cmdname' => 'noindent',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 123,
-                'macro' => ''
+                'line_nr' => 123
               }
             },
             {
@@ -3489,8 +3442,7 @@ $result_trees{'value_in_misc_commands'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 131,
-            'macro' => ''
+            'line_nr' => 131
           }
         },
         {
@@ -3583,8 +3535,7 @@ $result_trees{'value_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 136,
-            'macro' => ''
+            'line_nr' => 136
           }
         },
         {
@@ -3669,8 +3620,7 @@ $result_trees{'value_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 139,
-            'macro' => ''
+            'line_nr' => 139
           }
         },
         {
@@ -3714,8 +3664,7 @@ $result_trees{'value_in_misc_commands'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 143,
-            'macro' => ''
+            'line_nr' => 143
           }
         },
         {
@@ -3762,8 +3711,7 @@ $result_trees{'value_in_misc_commands'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 145,
-            'macro' => ''
+            'line_nr' => 145
           }
         },
         {
@@ -3825,8 +3773,7 @@ $result_trees{'value_in_misc_commands'} = {
           'cmdname' => 'shortcontents',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 148,
-            'macro' => ''
+            'line_nr' => 148
           }
         },
         {
@@ -3890,8 +3837,7 @@ $result_trees{'value_in_misc_commands'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       },
       'source_marks' => [
         {
@@ -4216,7 +4162,6 @@ $result_errors{'value_in_misc_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 20,
-    'macro' => '',
     'text' => 'bad argument to @headings: on line following headings atext',
     'type' => 'error'
   },
@@ -4225,7 +4170,6 @@ $result_errors{'value_in_misc_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 37,
-    'macro' => '',
     'text' => '@definfoenclose is obsolete',
     'type' => 'warning'
   },
@@ -4234,7 +4178,6 @@ $result_errors{'value_in_misc_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 37,
-    'macro' => '',
     'text' => '@definfoenclose should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -4243,7 +4186,6 @@ $result_errors{'value_in_misc_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 43,
-    'macro' => '',
     'text' => '@definfoenclose is obsolete',
     'type' => 'warning'
   },
@@ -4252,7 +4194,6 @@ $result_errors{'value_in_misc_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 52,
-    'macro' => '',
     'text' => '@definfoenclose is obsolete',
     'type' => 'warning'
   },
@@ -4261,7 +4202,6 @@ $result_errors{'value_in_misc_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 83,
-    'macro' => '',
     'text' => 'multiple @footnotestyle',
     'type' => 'warning'
   },
@@ -4270,7 +4210,6 @@ $result_errors{'value_in_misc_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 91,
-    'macro' => '',
     'text' => '@documentlanguage should only appear at the beginning of a 
line',
     'type' => 'warning'
   },
@@ -4279,7 +4218,6 @@ $result_errors{'value_in_misc_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 118,
-    'macro' => '',
     'text' => '@page should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -4288,7 +4226,6 @@ $result_errors{'value_in_misc_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 121,
-    'macro' => '',
     'text' => '@noindent is useless inside of a paragraph',
     'type' => 'warning'
   },
@@ -4297,7 +4234,6 @@ $result_errors{'value_in_misc_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 123,
-    'macro' => '',
     'text' => '@noindent is useless inside of a paragraph',
     'type' => 'warning'
   },
@@ -4306,7 +4242,6 @@ $result_errors{'value_in_misc_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 128,
-    'macro' => '',
     'text' => '@page should only appear at the beginning of a line',
     'type' => 'warning'
   },
@@ -4315,7 +4250,6 @@ $result_errors{'value_in_misc_commands'} = [
 ',
     'file_name' => '',
     'line_nr' => 143,
-    'macro' => '',
     'text' => 'remaining argument on @clickstyle line: {result_macro}',
     'type' => 'warning'
   }
diff --git a/tp/t/results/value/value_in_node.pl 
b/tp/t/results/value/value_in_node.pl
index 86cf6fabca..cc5fd6363a 100644
--- a/tp/t/results/value/value_in_node.pl
+++ b/tp/t/results/value/value_in_node.pl
@@ -139,8 +139,7 @@ $result_trees{'value_in_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -256,8 +255,7 @@ $result_trees{'value_in_node'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               },
               'type' => 'menu_entry'
             },
@@ -289,15 +287,13 @@ $result_trees{'value_in_node'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -314,8 +310,7 @@ $result_trees{'value_in_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -420,8 +415,7 @@ $result_trees{'value_in_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -554,8 +548,7 @@ $result_trees{'value_in_node'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
-                'macro' => ''
+                'line_nr' => 16
               },
               'type' => 'menu_entry'
             },
@@ -587,15 +580,13 @@ $result_trees{'value_in_node'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         },
         {
@@ -614,8 +605,7 @@ $result_trees{'value_in_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     },
     {
@@ -747,8 +737,7 @@ $result_trees{'value_in_node'} = {
               'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -770,8 +759,7 @@ $result_trees{'value_in_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 19,
-        'macro' => ''
+        'line_nr' => 19
       }
     }
   ],
diff --git a/tp/t/results/value/value_node_directions.pl 
b/tp/t/results/value/value_node_directions.pl
index f552bab2d3..595c1c960f 100644
--- a/tp/t/results/value/value_node_directions.pl
+++ b/tp/t/results/value/value_node_directions.pl
@@ -164,8 +164,7 @@ $result_trees{'value_node_directions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
-        'macro' => ''
+        'line_nr' => 3
       }
     },
     {
@@ -270,8 +269,7 @@ $result_trees{'value_node_directions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -399,8 +397,7 @@ $result_trees{'value_node_directions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
-        'macro' => ''
+        'line_nr' => 7
       }
     },
     {
@@ -438,8 +435,7 @@ $result_trees{'value_node_directions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
-        'macro' => ''
+        'line_nr' => 8
       }
     },
     {
@@ -554,8 +550,7 @@ $result_trees{'value_node_directions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
-        'macro' => ''
+        'line_nr' => 10
       }
     },
     {
@@ -586,8 +581,7 @@ $result_trees{'value_node_directions'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
-        'macro' => ''
+        'line_nr' => 11
       }
     }
   ],
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 9b6058f234..a9bbc87e90 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
@@ -81,8 +81,7 @@ $result_trees{'comma_value_in_macro_arg'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -92,8 +91,7 @@ $result_trees{'comma_value_in_macro_arg'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
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 8b0e7ad8c4..9f25c103dd 100644
--- a/tp/t/results/value_and_macro/macro_in_value.pl
+++ b/tp/t/results/value_and_macro/macro_in_value.pl
@@ -61,8 +61,7 @@ $result_trees{'macro_in_value'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -72,8 +71,7 @@ $result_trees{'macro_in_value'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
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 f24dfe6a74..bf0e56a6a7 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
@@ -77,8 +77,7 @@ $result_trees{'value_in_macro_body'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -88,8 +87,7 @@ $result_trees{'value_in_macro_body'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -214,7 +212,6 @@ $result_errors{'value_in_macro_body'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => '\\ in @testvaluebody expansion followed `@value{bodyarg}\' 
instead of parameter name or \\',
     'type' => 'error'
   }
diff --git a/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl 
b/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl
index 07ba9d1201..392caf743a 100644
--- a/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl
+++ b/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl
@@ -81,8 +81,7 @@ $result_trees{'value_in_macro_formal_arg'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -95,8 +94,7 @@ $result_trees{'value_in_macro_formal_arg'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -141,7 +139,6 @@ $result_errors{'value_in_macro_formal_arg'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'bad or empty @macro formal argument: the@value{argument',
     'type' => 'error'
   },
@@ -150,7 +147,6 @@ $result_errors{'value_in_macro_formal_arg'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'bad syntax for @macro argument: }',
     'type' => 'error'
   },
@@ -159,7 +155,6 @@ $result_errors{'value_in_macro_formal_arg'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'unknown command `testvalue\'',
     'type' => 'error'
   },
@@ -168,7 +163,6 @@ $result_errors{'value_in_macro_formal_arg'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
   },
@@ -177,7 +171,6 @@ $result_errors{'value_in_macro_formal_arg'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   }
diff --git a/tp/t/results/verb/comments.pl b/tp/t/results/verb/comments.pl
index 86867bea0d..ed07a809d2 100644
--- a/tp/t/results/verb/comments.pl
+++ b/tp/t/results/verb/comments.pl
@@ -34,8 +34,7 @@ $result_trees{'comments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -79,8 +78,7 @@ $result_trees{'comments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             },
             {
diff --git a/tp/t/results/verb/end_of_line.pl b/tp/t/results/verb/end_of_line.pl
index d5a45a339f..74d3a1491a 100644
--- a/tp/t/results/verb/end_of_line.pl
+++ b/tp/t/results/verb/end_of_line.pl
@@ -47,8 +47,7 @@ $result_trees{'end_of_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -81,7 +80,6 @@ $result_errors{'end_of_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@verb without associated character',
     'type' => 'error'
   }
diff --git a/tp/t/results/verb/multiline.pl b/tp/t/results/verb/multiline.pl
index 28d18be846..4cd6bdd450 100644
--- a/tp/t/results/verb/multiline.pl
+++ b/tp/t/results/verb/multiline.pl
@@ -40,8 +40,7 @@ $result_trees{'multiline'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
diff --git a/tp/t/results/verb/nested.pl b/tp/t/results/verb/nested.pl
index 9a1d189d55..cd4ea78870 100644
--- a/tp/t/results/verb/nested.pl
+++ b/tp/t/results/verb/nested.pl
@@ -36,8 +36,7 @@ $result_trees{'nested'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 1,
-                        'macro' => ''
+                        'line_nr' => 1
                       }
                     },
                     {
@@ -50,8 +49,7 @@ $result_trees{'nested'} = {
               'cmdname' => 'b',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
diff --git a/tp/t/results/verb/simple.pl b/tp/t/results/verb/simple.pl
index c265270cd2..e6833396dd 100644
--- a/tp/t/results/verb/simple.pl
+++ b/tp/t/results/verb/simple.pl
@@ -29,8 +29,7 @@ $result_trees{'simple'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
diff --git a/tp/t/results/verb/verb_and_char_end_of_line_not_closed.pl 
b/tp/t/results/verb/verb_and_char_end_of_line_not_closed.pl
index fcd87f33b5..3fb06149a6 100644
--- a/tp/t/results/verb/verb_and_char_end_of_line_not_closed.pl
+++ b/tp/t/results/verb/verb_and_char_end_of_line_not_closed.pl
@@ -43,8 +43,7 @@ $result_trees{'verb_and_char_end_of_line_not_closed'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -74,7 +73,6 @@ $result_errors{'verb_and_char_end_of_line_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@verb missing closing delimiter sequence: *}',
     'type' => 'error'
   }
diff --git a/tp/t/results/verb/verb_at_end_of_line_not_closed.pl 
b/tp/t/results/verb/verb_at_end_of_line_not_closed.pl
index fbb4cefab7..7886ec68ed 100644
--- a/tp/t/results/verb/verb_at_end_of_line_not_closed.pl
+++ b/tp/t/results/verb/verb_at_end_of_line_not_closed.pl
@@ -38,8 +38,7 @@ $result_trees{'verb_at_end_of_line_not_closed'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -67,7 +66,6 @@ $result_errors{'verb_at_end_of_line_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@verb without associated character',
     'type' => 'error'
   },
@@ -76,7 +74,6 @@ $result_errors{'verb_at_end_of_line_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@verb missing closing brace',
     'type' => 'error'
   }
diff --git a/tp/t/results/verb/verb_not_closed.pl 
b/tp/t/results/verb/verb_not_closed.pl
index bab3c9410d..fd2b91f67d 100644
--- a/tp/t/results/verb/verb_not_closed.pl
+++ b/tp/t/results/verb/verb_not_closed.pl
@@ -29,8 +29,7 @@ $result_trees{'verb_not_closed'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -54,7 +53,6 @@ $result_errors{'verb_not_closed'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@verb missing closing delimiter sequence: .}',
     'type' => 'error'
   }
diff --git a/tp/t/results/verb/verb_not_closed_with_char.pl 
b/tp/t/results/verb/verb_not_closed_with_char.pl
index f0d13b78e0..aa42eac934 100644
--- a/tp/t/results/verb/verb_not_closed_with_char.pl
+++ b/tp/t/results/verb/verb_not_closed_with_char.pl
@@ -49,8 +49,7 @@ $result_trees{'verb_not_closed_with_char'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             }
           ],
@@ -82,7 +81,6 @@ $result_errors{'verb_not_closed_with_char'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@verb missing closing delimiter sequence: *}',
     'type' => 'error'
   }
diff --git a/tp/t/results/xml_tests/brace_commands_spaces_end_of_lines.pl 
b/tp/t/results/xml_tests/brace_commands_spaces_end_of_lines.pl
index 77b73187fa..04e176ec81 100644
--- a/tp/t/results/xml_tests/brace_commands_spaces_end_of_lines.pl
+++ b/tp/t/results/xml_tests/brace_commands_spaces_end_of_lines.pl
@@ -32,8 +32,7 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -68,8 +67,7 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -112,8 +110,7 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -156,8 +153,7 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
+            'line_nr' => 10
           }
         },
         {
@@ -200,8 +196,7 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -244,8 +239,7 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           }
         },
         {
diff --git a/tp/t/results/xml_tests/commands_and_spaces.pl 
b/tp/t/results/xml_tests/commands_and_spaces.pl
index b4ffb61d58..6a6d0d3ad7 100644
--- a/tp/t/results/xml_tests/commands_and_spaces.pl
+++ b/tp/t/results/xml_tests/commands_and_spaces.pl
@@ -59,8 +59,7 @@ $result_trees{'commands_and_spaces'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -100,8 +99,7 @@ $result_trees{'commands_and_spaces'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -237,8 +235,7 @@ $result_trees{'commands_and_spaces'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -250,8 +247,7 @@ $result_trees{'commands_and_spaces'} = {
           'cmdname' => 'indent',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -279,8 +275,7 @@ $result_trees{'commands_and_spaces'} = {
           'cmdname' => 'indent',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         },
         {
@@ -309,8 +304,7 @@ $result_trees{'commands_and_spaces'} = {
           'cmdname' => 'indent',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
-            'macro' => ''
+            'line_nr' => 18
           }
         },
         {
@@ -407,8 +401,7 @@ $result_trees{'commands_and_spaces'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 21,
-            'macro' => ''
+            'line_nr' => 21
           }
         },
         {
@@ -498,8 +491,7 @@ $result_trees{'commands_and_spaces'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           }
         },
         {
@@ -567,8 +559,7 @@ $result_trees{'commands_and_spaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             }
           ],
@@ -579,8 +570,7 @@ $result_trees{'commands_and_spaces'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         },
         {
@@ -659,8 +649,7 @@ $result_trees{'commands_and_spaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               }
             },
             {
@@ -694,8 +683,7 @@ $result_trees{'commands_and_spaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               }
             },
             {
@@ -739,8 +727,7 @@ $result_trees{'commands_and_spaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             }
           ],
@@ -758,8 +745,7 @@ $result_trees{'commands_and_spaces'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 30,
-            'macro' => ''
+            'line_nr' => 30
           }
         },
         {
@@ -802,8 +788,7 @@ $result_trees{'commands_and_spaces'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 36,
-                    'macro' => ''
+                    'line_nr' => 36
                   }
                 }
               ],
@@ -840,8 +825,7 @@ $result_trees{'commands_and_spaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 37,
-                'macro' => ''
+                'line_nr' => 37
               }
             }
           ],
@@ -856,8 +840,7 @@ $result_trees{'commands_and_spaces'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 36,
-            'macro' => ''
+            'line_nr' => 36
           }
         },
         {
@@ -877,8 +860,7 @@ $result_trees{'commands_and_spaces'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 39,
-                    'macro' => ''
+                    'line_nr' => 39
                   },
                   'type' => 'bracketed_arg'
                 },
@@ -898,8 +880,7 @@ $result_trees{'commands_and_spaces'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 39,
-                    'macro' => ''
+                    'line_nr' => 39
                   },
                   'type' => 'bracketed_arg'
                 },
@@ -920,8 +901,7 @@ $result_trees{'commands_and_spaces'} = {
                   'cmdname' => 'var',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 39,
-                    'macro' => ''
+                    'line_nr' => 39
                   }
                 },
                 {
@@ -967,8 +947,7 @@ $result_trees{'commands_and_spaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               }
             }
           ],
@@ -982,8 +961,7 @@ $result_trees{'commands_and_spaces'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 39,
-            'macro' => ''
+            'line_nr' => 39
           }
         },
         {
@@ -1038,15 +1016,13 @@ $result_trees{'commands_and_spaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
-                'macro' => ''
+                'line_nr' => 44
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 42,
-            'macro' => ''
+            'line_nr' => 42
           }
         },
         {
@@ -1105,15 +1081,13 @@ $result_trees{'commands_and_spaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 46,
-            'macro' => ''
+            'line_nr' => 46
           }
         },
         {
@@ -1172,15 +1146,13 @@ $result_trees{'commands_and_spaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 52,
-                'macro' => ''
+                'line_nr' => 52
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 50,
-            'macro' => ''
+            'line_nr' => 50
           }
         },
         {
@@ -1196,8 +1168,7 @@ $result_trees{'commands_and_spaces'} = {
                   'cmdname' => 'strong',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 54,
-                    'macro' => ''
+                    'line_nr' => 54
                   },
                   'type' => 'command_as_argument'
                 }
@@ -1242,8 +1213,7 @@ $result_trees{'commands_and_spaces'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 55,
-                        'macro' => ''
+                        'line_nr' => 55
                       }
                     }
                   ],
@@ -1280,8 +1250,7 @@ $result_trees{'commands_and_spaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
+                'line_nr' => 56
               }
             }
           ],
@@ -1295,8 +1264,7 @@ $result_trees{'commands_and_spaces'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 54,
-            'macro' => ''
+            'line_nr' => 54
           }
         },
         {
@@ -1333,8 +1301,7 @@ $result_trees{'commands_and_spaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
+                'line_nr' => 58
               }
             },
             {
@@ -1369,8 +1336,7 @@ $result_trees{'commands_and_spaces'} = {
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 60,
-                        'macro' => ''
+                        'line_nr' => 60
                       },
                       'type' => 'balanced_braces'
                     },
@@ -1389,8 +1355,7 @@ $result_trees{'commands_and_spaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 60,
-                'macro' => ''
+                'line_nr' => 60
               }
             },
             {
@@ -1421,8 +1386,7 @@ $result_trees{'commands_and_spaces'} = {
               'cmdname' => 'indicateurl',
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
+                'line_nr' => 62
               }
             },
             {
@@ -1463,8 +1427,7 @@ $result_trees{'commands_and_spaces'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 64,
-                        'macro' => ''
+                        'line_nr' => 64
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -1494,8 +1457,7 @@ $result_trees{'commands_and_spaces'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 64,
-                        'macro' => ''
+                        'line_nr' => 64
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -1525,8 +1487,7 @@ $result_trees{'commands_and_spaces'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 64,
-                        'macro' => ''
+                        'line_nr' => 64
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -1556,8 +1517,7 @@ $result_trees{'commands_and_spaces'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 64,
-                        'macro' => ''
+                        'line_nr' => 64
                       },
                       'type' => 'bracketed_arg'
                     },
@@ -1587,8 +1547,7 @@ $result_trees{'commands_and_spaces'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 64,
-                        'macro' => ''
+                        'line_nr' => 64
                       },
                       'type' => 'bracketed_arg'
                     }
@@ -1614,8 +1573,7 @@ $result_trees{'commands_and_spaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
+                'line_nr' => 64
               },
               'type' => 'def_line'
             },
@@ -1661,8 +1619,7 @@ $result_trees{'commands_and_spaces'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 66,
-                'macro' => ''
+                'line_nr' => 66
               }
             }
           ],
@@ -1673,8 +1630,7 @@ $result_trees{'commands_and_spaces'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 64,
-            'macro' => ''
+            'line_nr' => 64
           }
         },
         {
@@ -1694,8 +1650,7 @@ $result_trees{'commands_and_spaces'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
+        'line_nr' => 9
       }
     }
   ],
@@ -1872,7 +1827,6 @@ $result_errors{'commands_and_spaces'} = [
 ',
     'file_name' => '',
     'line_nr' => 39,
-    'macro' => '',
     'text' => 'unexpected argument on @multitable line: @var{cmd}',
     'type' => 'warning'
   }
diff --git a/tp/t/results/xml_tests/comments_end_lines.pl 
b/tp/t/results/xml_tests/comments_end_lines.pl
index eb994d4753..5048b3f4d5 100644
--- a/tp/t/results/xml_tests/comments_end_lines.pl
+++ b/tp/t/results/xml_tests/comments_end_lines.pl
@@ -51,8 +51,7 @@ $result_trees{'comments_end_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -92,8 +91,7 @@ $result_trees{'comments_end_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -102,8 +100,7 @@ $result_trees{'comments_end_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -162,8 +159,7 @@ $result_trees{'comments_end_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -172,8 +168,7 @@ $result_trees{'comments_end_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -189,8 +184,7 @@ $result_trees{'comments_end_lines'} = {
                   'cmdname' => 'asis',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 8,
-                    'macro' => ''
+                    'line_nr' => 8
                   },
                   'type' => 'command_as_argument'
                 }
@@ -235,8 +229,7 @@ $result_trees{'comments_end_lines'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     }
                   ],
@@ -282,8 +275,7 @@ $result_trees{'comments_end_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
@@ -297,8 +289,7 @@ $result_trees{'comments_end_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -366,15 +357,13 @@ $result_trees{'comments_end_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           }
         },
         {
@@ -442,15 +431,13 @@ $result_trees{'comments_end_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           }
         },
         {
@@ -518,15 +505,13 @@ $result_trees{'comments_end_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
@@ -569,8 +554,7 @@ $result_trees{'comments_end_lines'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 24,
-                    'macro' => ''
+                    'line_nr' => 24
                   }
                 }
               ],
@@ -604,8 +588,7 @@ $result_trees{'comments_end_lines'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 25,
-                        'macro' => ''
+                        'line_nr' => 25
                       }
                     },
                     {
@@ -630,8 +613,7 @@ $result_trees{'comments_end_lines'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 25,
-                        'macro' => ''
+                        'line_nr' => 25
                       }
                     }
                   ],
@@ -680,8 +662,7 @@ $result_trees{'comments_end_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
-                'macro' => ''
+                'line_nr' => 26
               }
             }
           ],
@@ -696,8 +677,7 @@ $result_trees{'comments_end_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 24,
-            'macro' => ''
+            'line_nr' => 24
           }
         },
         {
@@ -778,8 +758,7 @@ $result_trees{'comments_end_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
+                'line_nr' => 30
               }
             }
           ],
@@ -795,8 +774,7 @@ $result_trees{'comments_end_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 28,
-            'macro' => ''
+            'line_nr' => 28
           }
         },
         {
@@ -864,15 +842,13 @@ $result_trees{'comments_end_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 32,
-            'macro' => ''
+            'line_nr' => 32
           }
         },
         {
@@ -940,15 +916,13 @@ $result_trees{'comments_end_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 38,
-                'macro' => ''
+                'line_nr' => 38
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 36,
-            'macro' => ''
+            'line_nr' => 36
           }
         }
       ],
diff --git a/tp/t/results/xml_tests/comments_on_block_command_lines.pl 
b/tp/t/results/xml_tests/comments_on_block_command_lines.pl
index 9c7ec4b784..850a8b8bd5 100644
--- a/tp/t/results/xml_tests/comments_on_block_command_lines.pl
+++ b/tp/t/results/xml_tests/comments_on_block_command_lines.pl
@@ -57,8 +57,7 @@ $result_trees{'comments_on_block_command_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -89,8 +88,7 @@ $result_trees{'comments_on_block_command_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -104,8 +102,7 @@ $result_trees{'comments_on_block_command_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -163,8 +160,7 @@ $result_trees{'comments_on_block_command_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             },
             {
@@ -195,8 +191,7 @@ $result_trees{'comments_on_block_command_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -207,8 +202,7 @@ $result_trees{'comments_on_block_command_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -224,8 +218,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                   'cmdname' => 'bullet',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
-                    'macro' => ''
+                    'line_nr' => 9
                   },
                   'type' => 'command_as_argument'
                 }
@@ -272,8 +265,7 @@ $result_trees{'comments_on_block_command_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -304,8 +296,7 @@ $result_trees{'comments_on_block_command_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
@@ -319,8 +310,7 @@ $result_trees{'comments_on_block_command_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -341,8 +331,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                   'cmdname' => 'bullet',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 13,
-                    'macro' => ''
+                    'line_nr' => 13
                   },
                   'type' => 'command_as_argument'
                 }
@@ -389,8 +378,7 @@ $result_trees{'comments_on_block_command_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             },
             {
@@ -421,8 +409,7 @@ $result_trees{'comments_on_block_command_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
-                'macro' => ''
+                'line_nr' => 15
               }
             }
           ],
@@ -436,8 +423,7 @@ $result_trees{'comments_on_block_command_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -487,8 +473,7 @@ $result_trees{'comments_on_block_command_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             },
             {
@@ -519,8 +504,7 @@ $result_trees{'comments_on_block_command_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
-                'macro' => ''
+                'line_nr' => 19
               }
             }
           ],
@@ -534,8 +518,7 @@ $result_trees{'comments_on_block_command_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 17,
-            'macro' => ''
+            'line_nr' => 17
           }
         },
         {
@@ -593,8 +576,7 @@ $result_trees{'comments_on_block_command_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             },
             {
@@ -625,8 +607,7 @@ $result_trees{'comments_on_block_command_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             }
           ],
@@ -640,8 +621,7 @@ $result_trees{'comments_on_block_command_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 21,
-            'macro' => ''
+            'line_nr' => 21
           }
         },
         {
@@ -657,8 +637,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                   'cmdname' => 'asis',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 25,
-                    'macro' => ''
+                    'line_nr' => 25
                   },
                   'type' => 'command_as_argument'
                 }
@@ -712,8 +691,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 26,
-                        'macro' => ''
+                        'line_nr' => 26
                       }
                     }
                   ],
@@ -750,8 +728,7 @@ $result_trees{'comments_on_block_command_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
-                'macro' => ''
+                'line_nr' => 27
               }
             }
           ],
@@ -765,8 +742,7 @@ $result_trees{'comments_on_block_command_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 25,
-            'macro' => ''
+            'line_nr' => 25
           }
         },
         {
@@ -831,8 +807,7 @@ $result_trees{'comments_on_block_command_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 31,
-                'macro' => ''
+                'line_nr' => 31
               }
             }
           ],
@@ -843,8 +818,7 @@ $result_trees{'comments_on_block_command_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 29,
-            'macro' => ''
+            'line_nr' => 29
           }
         },
         {
@@ -917,8 +891,7 @@ $result_trees{'comments_on_block_command_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             }
           ],
@@ -929,8 +902,7 @@ $result_trees{'comments_on_block_command_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 33,
-            'macro' => ''
+            'line_nr' => 33
           }
         },
         {
@@ -995,8 +967,7 @@ $result_trees{'comments_on_block_command_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 39,
-                'macro' => ''
+                'line_nr' => 39
               }
             }
           ],
@@ -1007,8 +978,7 @@ $result_trees{'comments_on_block_command_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 37,
-            'macro' => ''
+            'line_nr' => 37
           }
         },
         {
@@ -1073,8 +1043,7 @@ $result_trees{'comments_on_block_command_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 43,
-                'macro' => ''
+                'line_nr' => 43
               }
             }
           ],
@@ -1085,8 +1054,7 @@ $result_trees{'comments_on_block_command_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 41,
-            'macro' => ''
+            'line_nr' => 41
           }
         },
         {
@@ -1115,8 +1083,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 45,
-                    'macro' => ''
+                    'line_nr' => 45
                   }
                 },
                 {
@@ -1191,8 +1158,7 @@ $result_trees{'comments_on_block_command_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 47,
-                'macro' => ''
+                'line_nr' => 47
               }
             }
           ],
@@ -1203,8 +1169,7 @@ $result_trees{'comments_on_block_command_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 45,
-            'macro' => ''
+            'line_nr' => 45
           }
         },
         {
@@ -1301,8 +1266,7 @@ $result_trees{'comments_on_block_command_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 51,
-                'macro' => ''
+                'line_nr' => 51
               }
             }
           ],
@@ -1313,8 +1277,7 @@ $result_trees{'comments_on_block_command_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 49,
-            'macro' => ''
+            'line_nr' => 49
           }
         },
         {
@@ -1419,8 +1382,7 @@ $result_trees{'comments_on_block_command_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 55,
-                'macro' => ''
+                'line_nr' => 55
               }
             }
           ],
@@ -1431,8 +1393,7 @@ $result_trees{'comments_on_block_command_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 53,
-            'macro' => ''
+            'line_nr' => 53
           }
         },
         {
@@ -1497,8 +1458,7 @@ $result_trees{'comments_on_block_command_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             }
           ],
@@ -1509,8 +1469,7 @@ $result_trees{'comments_on_block_command_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 57,
-            'macro' => ''
+            'line_nr' => 57
           }
         },
         {
@@ -1562,8 +1521,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 61,
-                    'macro' => ''
+                    'line_nr' => 61
                   }
                 }
               ],
@@ -1597,8 +1555,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 62,
-                        'macro' => ''
+                        'line_nr' => 62
                       }
                     },
                     {
@@ -1623,8 +1580,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 62,
-                        'macro' => ''
+                        'line_nr' => 62
                       }
                     }
                   ],
@@ -1664,8 +1620,7 @@ $result_trees{'comments_on_block_command_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 63,
-                'macro' => ''
+                'line_nr' => 63
               }
             }
           ],
@@ -1680,8 +1635,7 @@ $result_trees{'comments_on_block_command_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 61,
-            'macro' => ''
+            'line_nr' => 61
           }
         },
         {
@@ -1701,8 +1655,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 65,
-                    'macro' => ''
+                    'line_nr' => 65
                   },
                   'type' => 'bracketed_arg'
                 },
@@ -1717,8 +1670,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                   ],
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 65,
-                    'macro' => ''
+                    'line_nr' => 65
                   },
                   'type' => 'bracketed_arg'
                 }
@@ -1768,8 +1720,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 66,
-                        'macro' => ''
+                        'line_nr' => 66
                       }
                     },
                     {
@@ -1794,8 +1745,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 66,
-                        'macro' => ''
+                        'line_nr' => 66
                       }
                     }
                   ],
@@ -1835,8 +1785,7 @@ $result_trees{'comments_on_block_command_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 67,
-                'macro' => ''
+                'line_nr' => 67
               }
             }
           ],
@@ -1850,8 +1799,7 @@ $result_trees{'comments_on_block_command_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 65,
-            'macro' => ''
+            'line_nr' => 65
           }
         },
         {
@@ -1932,8 +1880,7 @@ $result_trees{'comments_on_block_command_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 71,
-                'macro' => ''
+                'line_nr' => 71
               }
             }
           ],
@@ -1949,8 +1896,7 @@ $result_trees{'comments_on_block_command_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 69,
-            'macro' => ''
+            'line_nr' => 69
           }
         },
         {
@@ -2015,8 +1961,7 @@ $result_trees{'comments_on_block_command_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 75,
-                'macro' => ''
+                'line_nr' => 75
               }
             }
           ],
@@ -2027,8 +1972,7 @@ $result_trees{'comments_on_block_command_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 73,
-            'macro' => ''
+            'line_nr' => 73
           }
         },
         {
@@ -2093,8 +2037,7 @@ $result_trees{'comments_on_block_command_lines'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 79,
-                'macro' => ''
+                'line_nr' => 79
               }
             }
           ],
@@ -2105,8 +2048,7 @@ $result_trees{'comments_on_block_command_lines'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 77,
-            'macro' => ''
+            'line_nr' => 77
           }
         },
         {
diff --git a/tp/t/results/xml_tests/comments_on_misc_command_line.pl 
b/tp/t/results/xml_tests/comments_on_misc_command_line.pl
index 3b5b8b3d93..a6b4e0ca23 100644
--- a/tp/t/results/xml_tests/comments_on_misc_command_line.pl
+++ b/tp/t/results/xml_tests/comments_on_misc_command_line.pl
@@ -46,8 +46,7 @@ $result_trees{'comments_on_misc_command_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -91,8 +90,7 @@ $result_trees{'comments_on_misc_command_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         },
         {
@@ -134,8 +132,7 @@ $result_trees{'comments_on_misc_command_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         },
         {
@@ -159,8 +156,7 @@ $result_trees{'comments_on_misc_command_line'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         },
         {
@@ -197,8 +193,7 @@ $result_trees{'comments_on_misc_command_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -244,8 +239,7 @@ $result_trees{'comments_on_misc_command_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -257,8 +251,7 @@ $result_trees{'comments_on_misc_command_line'} = {
           'cmdname' => 'indent',
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
-            'macro' => ''
+            'line_nr' => 9
           }
         },
         {
@@ -317,7 +310,6 @@ $result_errors{'comments_on_misc_command_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@definfoenclose is obsolete',
     'type' => 'warning'
   }
diff --git a/tp/t/results/xml_tests/image_inline_or_not.pl 
b/tp/t/results/xml_tests/image_inline_or_not.pl
index b6d1e51961..42889cc971 100644
--- a/tp/t/results/xml_tests/image_inline_or_not.pl
+++ b/tp/t/results/xml_tests/image_inline_or_not.pl
@@ -26,8 +26,7 @@ $result_trees{'image_inline_or_not'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -61,8 +60,7 @@ $result_trees{'image_inline_or_not'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
@@ -109,8 +107,7 @@ $result_trees{'image_inline_or_not'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     },
     {
@@ -154,8 +151,7 @@ $result_trees{'image_inline_or_not'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
+            'line_nr' => 8
           }
         },
         {
@@ -189,8 +185,7 @@ $result_trees{'image_inline_or_not'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             },
             {
@@ -243,8 +238,7 @@ $result_trees{'image_inline_or_not'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 14,
-                    'macro' => ''
+                    'line_nr' => 14
                   }
                 },
                 {
@@ -277,8 +271,7 @@ $result_trees{'image_inline_or_not'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 17,
-                    'macro' => ''
+                    'line_nr' => 17
                   }
                 },
                 {
@@ -316,15 +309,13 @@ $result_trees{'image_inline_or_not'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
-            'macro' => ''
+            'line_nr' => 12
           }
         },
         {
@@ -353,8 +344,7 @@ $result_trees{'image_inline_or_not'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 20,
-                    'macro' => ''
+                    'line_nr' => 20
                   }
                 }
               ],
@@ -386,8 +376,7 @@ $result_trees{'image_inline_or_not'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             },
             {
@@ -422,8 +411,7 @@ $result_trees{'image_inline_or_not'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
-                'macro' => ''
+                'line_nr' => 22
               }
             }
           ],
@@ -434,8 +422,7 @@ $result_trees{'image_inline_or_not'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
@@ -451,8 +438,7 @@ $result_trees{'image_inline_or_not'} = {
                   'cmdname' => 'asis',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 24,
-                    'macro' => ''
+                    'line_nr' => 24
                   },
                   'type' => 'command_as_argument'
                 }
@@ -493,8 +479,7 @@ $result_trees{'image_inline_or_not'} = {
                               },
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 25,
-                                'macro' => ''
+                                'line_nr' => 25
                               }
                             }
                           ],
@@ -515,8 +500,7 @@ $result_trees{'image_inline_or_not'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 25,
-                        'macro' => ''
+                        'line_nr' => 25
                       }
                     }
                   ],
@@ -546,8 +530,7 @@ $result_trees{'image_inline_or_not'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 27,
-                        'macro' => ''
+                        'line_nr' => 27
                       }
                     },
                     {
@@ -581,8 +564,7 @@ $result_trees{'image_inline_or_not'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 29,
-                            'macro' => ''
+                            'line_nr' => 29
                           }
                         },
                         {
@@ -614,8 +596,7 @@ $result_trees{'image_inline_or_not'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 31,
-                        'macro' => ''
+                        'line_nr' => 31
                       }
                     },
                     {
@@ -656,8 +637,7 @@ $result_trees{'image_inline_or_not'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               }
             }
           ],
@@ -671,8 +651,7 @@ $result_trees{'image_inline_or_not'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 24,
-            'macro' => ''
+            'line_nr' => 24
           }
         },
         {
@@ -719,8 +698,7 @@ $result_trees{'image_inline_or_not'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 35,
-                        'macro' => ''
+                        'line_nr' => 35
                       }
                     }
                   ],
@@ -759,8 +737,7 @@ $result_trees{'image_inline_or_not'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 35,
-                            'macro' => ''
+                            'line_nr' => 35
                           }
                         },
                         {
@@ -776,8 +753,7 @@ $result_trees{'image_inline_or_not'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               },
               'type' => 'menu_entry'
             },
@@ -806,8 +782,7 @@ $result_trees{'image_inline_or_not'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 36,
-                        'macro' => ''
+                        'line_nr' => 36
                       }
                     }
                   ],
@@ -845,8 +820,7 @@ $result_trees{'image_inline_or_not'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 36,
-                        'macro' => ''
+                        'line_nr' => 36
                       }
                     }
                   ],
@@ -886,8 +860,7 @@ $result_trees{'image_inline_or_not'} = {
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
-                'macro' => ''
+                'line_nr' => 36
               },
               'type' => 'menu_entry'
             },
@@ -917,8 +890,7 @@ $result_trees{'image_inline_or_not'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 38,
-                        'macro' => ''
+                        'line_nr' => 38
                       }
                     },
                     {
@@ -959,15 +931,13 @@ $result_trees{'image_inline_or_not'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 39,
-                'macro' => ''
+                'line_nr' => 39
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 34,
-            'macro' => ''
+            'line_nr' => 34
           }
         },
         {
@@ -984,8 +954,7 @@ $result_trees{'image_inline_or_not'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
-        'macro' => ''
+        'line_nr' => 6
       }
     },
     {
@@ -1009,8 +978,7 @@ $result_trees{'image_inline_or_not'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 41,
-                'macro' => ''
+                'line_nr' => 41
               }
             }
           ],
@@ -1035,8 +1003,7 @@ $result_trees{'image_inline_or_not'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 41,
-        'macro' => ''
+        'line_nr' => 41
       }
     },
     {
@@ -1060,8 +1027,7 @@ $result_trees{'image_inline_or_not'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 42,
-                'macro' => ''
+                'line_nr' => 42
               }
             }
           ],
@@ -1112,8 +1078,7 @@ $result_trees{'image_inline_or_not'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 46,
-                        'macro' => ''
+                        'line_nr' => 46
                       }
                     },
                     {
@@ -1133,8 +1098,7 @@ $result_trees{'image_inline_or_not'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 45,
-                'macro' => ''
+                'line_nr' => 45
               }
             },
             {
@@ -1181,8 +1145,7 @@ $result_trees{'image_inline_or_not'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 51,
-                            'macro' => ''
+                            'line_nr' => 51
                           }
                         },
                         {
@@ -1210,8 +1173,7 @@ $result_trees{'image_inline_or_not'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             },
             {
@@ -1275,8 +1237,7 @@ $result_trees{'image_inline_or_not'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 57,
-                'macro' => ''
+                'line_nr' => 57
               }
             },
             {
@@ -1309,8 +1270,7 @@ $result_trees{'image_inline_or_not'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 59,
-                        'macro' => ''
+                        'line_nr' => 59
                       }
                     },
                     {
@@ -1335,8 +1295,7 @@ $result_trees{'image_inline_or_not'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 59,
-                            'macro' => ''
+                            'line_nr' => 59
                           }
                         }
                       ],
@@ -1352,8 +1311,7 @@ $result_trees{'image_inline_or_not'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
-                'macro' => ''
+                'line_nr' => 59
               }
             },
             {
@@ -1389,8 +1347,7 @@ $result_trees{'image_inline_or_not'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 60,
-                'macro' => ''
+                'line_nr' => 60
               }
             }
           ],
@@ -1408,8 +1365,7 @@ $result_trees{'image_inline_or_not'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 55,
-            'macro' => ''
+            'line_nr' => 55
           }
         }
       ],
@@ -1423,8 +1379,7 @@ $result_trees{'image_inline_or_not'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 42,
-        'macro' => ''
+        'line_nr' => 42
       }
     }
   ],
diff --git a/tp/t/results/xml_tests/inlineifset_empty_second_arg.pl 
b/tp/t/results/xml_tests/inlineifset_empty_second_arg.pl
index fa8ab394d3..c7db7fd580 100644
--- a/tp/t/results/xml_tests/inlineifset_empty_second_arg.pl
+++ b/tp/t/results/xml_tests/inlineifset_empty_second_arg.pl
@@ -40,8 +40,7 @@ $result_trees{'inlineifset_empty_second_arg'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
+                'line_nr' => 1
               }
             },
             {
@@ -87,8 +86,7 @@ $result_trees{'inlineifset_empty_second_arg'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             },
             {
diff --git a/tp/t/results/xml_tests/macro_and_args.pl 
b/tp/t/results/xml_tests/macro_and_args.pl
index ad1e282098..57e9d9d17f 100644
--- a/tp/t/results/xml_tests/macro_and_args.pl
+++ b/tp/t/results/xml_tests/macro_and_args.pl
@@ -54,8 +54,7 @@ $result_trees{'macro_and_args'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -65,8 +64,7 @@ $result_trees{'macro_and_args'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -123,8 +121,7 @@ $result_trees{'macro_and_args'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -137,8 +134,7 @@ $result_trees{'macro_and_args'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         }
       ],
@@ -165,7 +161,6 @@ $result_errors{'macro_and_args'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'bad or empty @macro formal argument: ggg"@@^_ ff',
     'type' => 'error'
   },
@@ -174,7 +169,6 @@ $result_errors{'macro_and_args'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'bad or empty @macro formal argument: ccc v',
     'type' => 'error'
   }
diff --git a/tp/t/results/xml_tests/raw.pl b/tp/t/results/xml_tests/raw.pl
index e7e7d132ba..997620af69 100644
--- a/tp/t/results/xml_tests/raw.pl
+++ b/tp/t/results/xml_tests/raw.pl
@@ -60,15 +60,13 @@ $result_trees{'raw'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -133,15 +131,13 @@ $result_trees{'raw'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 8,
-                    'macro' => ''
+                    'line_nr' => 8
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
diff --git a/tp/t/results/xml_tests/raw_and_comments.pl 
b/tp/t/results/xml_tests/raw_and_comments.pl
index cec1a86ab6..4c31498e62 100644
--- a/tp/t/results/xml_tests/raw_and_comments.pl
+++ b/tp/t/results/xml_tests/raw_and_comments.pl
@@ -75,8 +75,7 @@ $result_trees{'raw_and_comments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -87,8 +86,7 @@ $result_trees{'raw_and_comments'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -168,8 +166,7 @@ $result_trees{'raw_and_comments'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 8,
-                    'macro' => ''
+                    'line_nr' => 8
                   }
                 }
               ],
@@ -180,8 +177,7 @@ $result_trees{'raw_and_comments'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
diff --git a/tp/t/results/xml_tests/spaces_info_lost.pl 
b/tp/t/results/xml_tests/spaces_info_lost.pl
index e08624f336..e01877f8f1 100644
--- a/tp/t/results/xml_tests/spaces_info_lost.pl
+++ b/tp/t/results/xml_tests/spaces_info_lost.pl
@@ -65,8 +65,7 @@ $result_trees{'spaces_info_lost'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -77,8 +76,7 @@ $result_trees{'spaces_info_lost'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -133,15 +131,13 @@ $result_trees{'spaces_info_lost'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
+            'line_nr' => 5
           }
         }
       ],
@@ -172,7 +168,6 @@ $result_errors{'spaces_info_lost'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'unexpected argument on @display line: text on display line',
     'type' => 'warning'
   }
diff --git a/tp/t/results/xml_tests/top_node_and_bye.pl 
b/tp/t/results/xml_tests/top_node_and_bye.pl
index f92a12d403..1b1d713c7b 100644
--- a/tp/t/results/xml_tests/top_node_and_bye.pl
+++ b/tp/t/results/xml_tests/top_node_and_bye.pl
@@ -47,8 +47,7 @@ $result_trees{'top_node_and_bye'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 1,
-          'macro' => ''
+          'line_nr' => 1
         }
       },
       {
diff --git a/tp/t/results/xml_tests/top_node_no_section.pl 
b/tp/t/results/xml_tests/top_node_no_section.pl
index 93c63ca5d1..ac21c4d910 100644
--- a/tp/t/results/xml_tests/top_node_no_section.pl
+++ b/tp/t/results/xml_tests/top_node_no_section.pl
@@ -39,8 +39,7 @@ $result_trees{'top_node_no_section'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     }
   ],
diff --git a/tp/t/results/xtable/accent_on_table_line.pl 
b/tp/t/results/xtable/accent_on_table_line.pl
index 1c40e5652d..593c305094 100644
--- a/tp/t/results/xtable/accent_on_table_line.pl
+++ b/tp/t/results/xtable/accent_on_table_line.pl
@@ -21,8 +21,7 @@ $result_trees{'accent_on_table_line'} = {
                   'cmdname' => '~',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   }
                 }
               ],
@@ -66,8 +65,7 @@ $result_trees{'accent_on_table_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -101,8 +99,7 @@ $result_trees{'accent_on_table_line'} = {
                               'cmdname' => 'code',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 3,
-                                'macro' => ''
+                                'line_nr' => 3
                               }
                             }
                           ],
@@ -123,8 +120,7 @@ $result_trees{'accent_on_table_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -161,8 +157,7 @@ $result_trees{'accent_on_table_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -176,8 +171,7 @@ $result_trees{'accent_on_table_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -202,8 +196,7 @@ $result_trees{'accent_on_table_line'} = {
                   'cmdname' => '~',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 6,
-                    'macro' => ''
+                    'line_nr' => 6
                   },
                   'type' => 'command_as_argument'
                 }
@@ -248,8 +241,7 @@ $result_trees{'accent_on_table_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     }
                   ],
@@ -283,8 +275,7 @@ $result_trees{'accent_on_table_line'} = {
                               'cmdname' => 'code',
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 8,
-                                'macro' => ''
+                                'line_nr' => 8
                               }
                             }
                           ],
@@ -305,8 +296,7 @@ $result_trees{'accent_on_table_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     }
                   ],
@@ -343,8 +333,7 @@ $result_trees{'accent_on_table_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
+                'line_nr' => 9
               }
             }
           ],
@@ -358,8 +347,7 @@ $result_trees{'accent_on_table_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
-            'macro' => ''
+            'line_nr' => 6
           }
         },
         {
@@ -379,8 +367,7 @@ $result_trees{'accent_on_table_line'} = {
                   'cmdname' => '~',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
-                    'macro' => ''
+                    'line_nr' => 11
                   }
                 }
               ],
@@ -430,8 +417,7 @@ $result_trees{'accent_on_table_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     }
                   ],
@@ -468,8 +454,7 @@ $result_trees{'accent_on_table_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             }
           ],
@@ -483,8 +468,7 @@ $result_trees{'accent_on_table_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
+            'line_nr' => 11
           }
         },
         {
@@ -504,8 +488,7 @@ $result_trees{'accent_on_table_line'} = {
                   'cmdname' => '~',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 15,
-                    'macro' => ''
+                    'line_nr' => 15
                   }
                 }
               ],
@@ -549,8 +532,7 @@ $result_trees{'accent_on_table_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     }
                   ],
@@ -587,8 +569,7 @@ $result_trees{'accent_on_table_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
-                'macro' => ''
+                'line_nr' => 17
               }
             }
           ],
@@ -602,8 +583,7 @@ $result_trees{'accent_on_table_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
-            'macro' => ''
+            'line_nr' => 15
           }
         },
         {
@@ -623,8 +603,7 @@ $result_trees{'accent_on_table_line'} = {
                   'cmdname' => 'ringaccent',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 19,
-                    'macro' => ''
+                    'line_nr' => 19
                   }
                 }
               ],
@@ -668,8 +647,7 @@ $result_trees{'accent_on_table_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       }
                     }
                   ],
@@ -706,8 +684,7 @@ $result_trees{'accent_on_table_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
-                'macro' => ''
+                'line_nr' => 21
               }
             }
           ],
@@ -721,8 +698,7 @@ $result_trees{'accent_on_table_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
-            'macro' => ''
+            'line_nr' => 19
           }
         },
         {
@@ -747,8 +723,7 @@ $result_trees{'accent_on_table_line'} = {
                   'cmdname' => 'ringaccent',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 23,
-                    'macro' => ''
+                    'line_nr' => 23
                   },
                   'type' => 'command_as_argument'
                 }
@@ -793,8 +768,7 @@ $result_trees{'accent_on_table_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 24,
-                        'macro' => ''
+                        'line_nr' => 24
                       }
                     }
                   ],
@@ -831,8 +805,7 @@ $result_trees{'accent_on_table_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               }
             }
           ],
@@ -846,8 +819,7 @@ $result_trees{'accent_on_table_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
-            'macro' => ''
+            'line_nr' => 23
           }
         },
         {
@@ -877,8 +849,7 @@ $result_trees{'accent_on_table_line'} = {
                   'cmdname' => 'ringaccent',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 27,
-                    'macro' => ''
+                    'line_nr' => 27
                   }
                 }
               ],
@@ -922,8 +893,7 @@ $result_trees{'accent_on_table_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       }
                     }
                   ],
@@ -960,8 +930,7 @@ $result_trees{'accent_on_table_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
-                'macro' => ''
+                'line_nr' => 29
               }
             }
           ],
@@ -975,8 +944,7 @@ $result_trees{'accent_on_table_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 27,
-            'macro' => ''
+            'line_nr' => 27
           }
         }
       ],
@@ -1048,7 +1016,6 @@ $result_errors{'accent_on_table_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'command `@~\' must not be followed by new line',
     'type' => 'warning'
   },
@@ -1057,7 +1024,6 @@ $result_errors{'accent_on_table_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'bad argument to @table: @~',
     'type' => 'error'
   },
@@ -1066,7 +1032,6 @@ $result_errors{'accent_on_table_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => 'accent command `@~\' not allowed as @table argument',
     'type' => 'warning'
   },
@@ -1075,7 +1040,6 @@ $result_errors{'accent_on_table_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => '@~ expected braces',
     'type' => 'error'
   },
@@ -1084,7 +1048,6 @@ $result_errors{'accent_on_table_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 11,
-    'macro' => '',
     'text' => 'bad argument to @table: @~',
     'type' => 'error'
   },
@@ -1093,7 +1056,6 @@ $result_errors{'accent_on_table_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 15,
-    'macro' => '',
     'text' => 'command `@~\' must not be followed by new line',
     'type' => 'warning'
   },
@@ -1102,7 +1064,6 @@ $result_errors{'accent_on_table_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 15,
-    'macro' => '',
     'text' => 'bad argument to @table: @~',
     'type' => 'error'
   },
@@ -1111,7 +1072,6 @@ $result_errors{'accent_on_table_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 19,
-    'macro' => '',
     'text' => 'command `@ringaccent\' must not be followed by new line',
     'type' => 'warning'
   },
@@ -1120,7 +1080,6 @@ $result_errors{'accent_on_table_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 19,
-    'macro' => '',
     'text' => 'bad argument to @table: @ringaccent',
     'type' => 'error'
   },
@@ -1129,7 +1088,6 @@ $result_errors{'accent_on_table_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 23,
-    'macro' => '',
     'text' => 'accent command `@ringaccent\' not allowed as @table argument',
     'type' => 'warning'
   },
@@ -1138,7 +1096,6 @@ $result_errors{'accent_on_table_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 27,
-    'macro' => '',
     'text' => 'bad argument to @table: @ringaccent{a}',
     'type' => 'error'
   }
diff --git a/tp/t/results/xtable/block_commands_in_table.pl 
b/tp/t/results/xtable/block_commands_in_table.pl
index 5a550fd87c..5b09d1fc27 100644
--- a/tp/t/results/xtable/block_commands_in_table.pl
+++ b/tp/t/results/xtable/block_commands_in_table.pl
@@ -39,8 +39,7 @@ $result_trees{'block_commands_in_table'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -76,8 +75,7 @@ $result_trees{'block_commands_in_table'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -109,8 +107,7 @@ $result_trees{'block_commands_in_table'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -145,8 +142,7 @@ $result_trees{'block_commands_in_table'} = {
                   'cmdname' => 'emph',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   },
                   'type' => 'command_as_argument'
                 }
@@ -191,8 +187,7 @@ $result_trees{'block_commands_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     },
                     {
@@ -220,8 +215,7 @@ $result_trees{'block_commands_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     }
                   ],
@@ -283,8 +277,7 @@ $result_trees{'block_commands_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 13,
-                        'macro' => ''
+                        'line_nr' => 13
                       }
                     }
                   ],
@@ -352,15 +345,13 @@ $result_trees{'block_commands_in_table'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 18,
-                            'macro' => ''
+                            'line_nr' => 18
                           }
                         }
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     }
                   ],
@@ -398,8 +389,7 @@ $result_trees{'block_commands_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 19,
-                        'macro' => ''
+                        'line_nr' => 19
                       }
                     }
                   ],
@@ -456,8 +446,7 @@ $result_trees{'block_commands_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 22,
-                        'macro' => ''
+                        'line_nr' => 22
                       }
                     }
                   ],
@@ -516,15 +505,13 @@ $result_trees{'block_commands_in_table'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 25,
-                            'macro' => ''
+                            'line_nr' => 25
                           }
                         }
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 23,
-                        'macro' => ''
+                        'line_nr' => 23
                       }
                     },
                     {
@@ -567,8 +554,7 @@ $result_trees{'block_commands_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 27,
-                        'macro' => ''
+                        'line_nr' => 27
                       }
                     }
                   ],
@@ -632,15 +618,13 @@ $result_trees{'block_commands_in_table'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 31,
-                            'macro' => ''
+                            'line_nr' => 31
                           }
                         }
                       ],
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 29,
-                        'macro' => ''
+                        'line_nr' => 29
                       }
                     }
                   ],
@@ -677,8 +661,7 @@ $result_trees{'block_commands_in_table'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
-                'macro' => ''
+                'line_nr' => 32
               }
             }
           ],
@@ -692,8 +675,7 @@ $result_trees{'block_commands_in_table'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -709,8 +691,7 @@ $result_trees{'block_commands_in_table'} = {
                   'cmdname' => 'strong',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 34,
-                    'macro' => ''
+                    'line_nr' => 34
                   },
                   'type' => 'command_as_argument'
                 }
@@ -762,8 +743,7 @@ $result_trees{'block_commands_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 35,
-                        'macro' => ''
+                        'line_nr' => 35
                       }
                     },
                     {
@@ -814,8 +794,7 @@ $result_trees{'block_commands_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 37,
-                        'macro' => ''
+                        'line_nr' => 37
                       },
                       'type' => 'index_entry_command'
                     },
@@ -851,8 +830,7 @@ $result_trees{'block_commands_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 38,
-                        'macro' => ''
+                        'line_nr' => 38
                       }
                     }
                   ],
@@ -908,8 +886,7 @@ $result_trees{'block_commands_in_table'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 41,
-                'macro' => ''
+                'line_nr' => 41
               }
             }
           ],
@@ -923,8 +900,7 @@ $result_trees{'block_commands_in_table'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 34,
-            'macro' => ''
+            'line_nr' => 34
           }
         },
         {
@@ -935,8 +911,7 @@ $result_trees{'block_commands_in_table'} = {
                   'cmdname' => 'r',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 42,
-                    'macro' => ''
+                    'line_nr' => 42
                   },
                   'type' => 'command_as_argument'
                 }
@@ -988,8 +963,7 @@ $result_trees{'block_commands_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 43,
-                        'macro' => ''
+                        'line_nr' => 43
                       }
                     },
                     {
@@ -1034,8 +1008,7 @@ $result_trees{'block_commands_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 45,
-                        'macro' => ''
+                        'line_nr' => 45
                       }
                     }
                   ],
@@ -1096,8 +1069,7 @@ $result_trees{'block_commands_in_table'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 49,
-                'macro' => ''
+                'line_nr' => 49
               }
             }
           ],
@@ -1111,8 +1083,7 @@ $result_trees{'block_commands_in_table'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 42,
-            'macro' => ''
+            'line_nr' => 42
           }
         },
         {
@@ -1137,8 +1108,7 @@ $result_trees{'block_commands_in_table'} = {
                   'cmdname' => 'emph',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 52,
-                    'macro' => ''
+                    'line_nr' => 52
                   },
                   'type' => 'command_as_argument'
                 }
@@ -1183,8 +1153,7 @@ $result_trees{'block_commands_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 53,
-                        'macro' => ''
+                        'line_nr' => 53
                       }
                     }
                   ],
@@ -1236,8 +1205,7 @@ $result_trees{'block_commands_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 55,
-                        'macro' => ''
+                        'line_nr' => 55
                       }
                     }
                   ],
@@ -1288,8 +1256,7 @@ $result_trees{'block_commands_in_table'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 57,
-                'macro' => ''
+                'line_nr' => 57
               }
             }
           ],
@@ -1303,8 +1270,7 @@ $result_trees{'block_commands_in_table'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 52,
-            'macro' => ''
+            'line_nr' => 52
           }
         },
         {
@@ -1327,8 +1293,7 @@ $result_trees{'block_commands_in_table'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
diff --git a/tp/t/results/xtable/comment_and_itemx_before_item.pl 
b/tp/t/results/xtable/comment_and_itemx_before_item.pl
index efbb5fe191..5befe614c2 100644
--- a/tp/t/results/xtable/comment_and_itemx_before_item.pl
+++ b/tp/t/results/xtable/comment_and_itemx_before_item.pl
@@ -17,8 +17,7 @@ $result_trees{'comment_and_itemx_before_item'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'command_as_argument'
                 }
@@ -73,8 +72,7 @@ $result_trees{'comment_and_itemx_before_item'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -111,8 +109,7 @@ $result_trees{'comment_and_itemx_before_item'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -126,8 +123,7 @@ $result_trees{'comment_and_itemx_before_item'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -154,7 +150,6 @@ $result_errors{'comment_and_itemx_before_item'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@itemx should not begin @table',
     'type' => 'error'
   }
diff --git a/tp/t/results/xtable/definfoenclose_on_table_line.pl 
b/tp/t/results/xtable/definfoenclose_on_table_line.pl
index fdb872c012..b9fd91a48a 100644
--- a/tp/t/results/xtable/definfoenclose_on_table_line.pl
+++ b/tp/t/results/xtable/definfoenclose_on_table_line.pl
@@ -41,8 +41,7 @@ $result_trees{'definfoenclose_on_table_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -65,8 +64,7 @@ $result_trees{'definfoenclose_on_table_line'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
+                    'line_nr' => 3
                   },
                   'type' => 'definfoenclose_command'
                 }
@@ -111,8 +109,7 @@ $result_trees{'definfoenclose_on_table_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     },
                     {
@@ -140,8 +137,7 @@ $result_trees{'definfoenclose_on_table_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     }
                   ],
@@ -197,8 +193,7 @@ $result_trees{'definfoenclose_on_table_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
@@ -212,8 +207,7 @@ $result_trees{'definfoenclose_on_table_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
-            'macro' => ''
+            'line_nr' => 3
           }
         }
       ],
@@ -248,7 +242,6 @@ $result_errors{'definfoenclose_on_table_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@definfoenclose is obsolete',
     'type' => 'warning'
   },
@@ -257,7 +250,6 @@ $result_errors{'definfoenclose_on_table_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@phi should not appear on @table line',
     'type' => 'warning'
   }
diff --git a/tp/t/results/xtable/empty_item_itemx.pl 
b/tp/t/results/xtable/empty_item_itemx.pl
index 38741d4f7d..89a0314a72 100644
--- a/tp/t/results/xtable/empty_item_itemx.pl
+++ b/tp/t/results/xtable/empty_item_itemx.pl
@@ -17,8 +17,7 @@ $result_trees{'empty_item_itemx'} = {
                   'cmdname' => 'asis',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'command_as_argument'
                 }
@@ -93,8 +92,7 @@ $result_trees{'empty_item_itemx'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       }
                     },
                     {
@@ -112,8 +110,7 @@ $result_trees{'empty_item_itemx'} = {
                       'cmdname' => 'itemx',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     },
                     {
@@ -147,8 +144,7 @@ $result_trees{'empty_item_itemx'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     }
                   ],
@@ -176,8 +172,7 @@ $result_trees{'empty_item_itemx'} = {
                       'cmdname' => 'item',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     }
                   ],
@@ -221,8 +216,7 @@ $result_trees{'empty_item_itemx'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     }
                   ],
@@ -259,8 +253,7 @@ $result_trees{'empty_item_itemx'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
+                'line_nr' => 10
               }
             }
           ],
@@ -274,8 +267,7 @@ $result_trees{'empty_item_itemx'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -315,7 +307,6 @@ $result_errors{'empty_item_itemx'} = [
 ',
     'file_name' => '',
     'line_nr' => 5,
-    'macro' => '',
     'text' => 'entry for index `vr\' outside of any node',
     'type' => 'warning'
   },
@@ -324,7 +315,6 @@ $result_errors{'empty_item_itemx'} = [
 ',
     'file_name' => '',
     'line_nr' => 6,
-    'macro' => '',
     'text' => '@itemx missing argument',
     'type' => 'warning'
   },
@@ -333,7 +323,6 @@ $result_errors{'empty_item_itemx'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'entry for index `vr\' outside of any node',
     'type' => 'warning'
   },
@@ -342,7 +331,6 @@ $result_errors{'empty_item_itemx'} = [
 ',
     'file_name' => '',
     'line_nr' => 8,
-    'macro' => '',
     'text' => '@item missing argument',
     'type' => 'warning'
   },
@@ -351,7 +339,6 @@ $result_errors{'empty_item_itemx'} = [
 ',
     'file_name' => '',
     'line_nr' => 9,
-    'macro' => '',
     'text' => 'entry for index `vr\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/xtable/empty_table.pl 
b/tp/t/results/xtable/empty_table.pl
index af242850da..55555c86d2 100644
--- a/tp/t/results/xtable/empty_table.pl
+++ b/tp/t/results/xtable/empty_table.pl
@@ -17,8 +17,7 @@ $result_trees{'empty_table'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'command_as_argument'
                 }
@@ -62,8 +61,7 @@ $result_trees{'empty_table'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             }
           ],
@@ -77,8 +75,7 @@ $result_trees{'empty_table'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/xtable/headitem_in_table.pl 
b/tp/t/results/xtable/headitem_in_table.pl
index f942857221..c86177f521 100644
--- a/tp/t/results/xtable/headitem_in_table.pl
+++ b/tp/t/results/xtable/headitem_in_table.pl
@@ -17,8 +17,7 @@ $result_trees{'headitem_in_table'} = {
                   'cmdname' => 'strong',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'command_as_argument'
                 }
@@ -100,8 +99,7 @@ $result_trees{'headitem_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     }
                   ],
@@ -138,8 +136,7 @@ $result_trees{'headitem_in_table'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
-                'macro' => ''
+                'line_nr' => 7
               }
             }
           ],
@@ -153,8 +150,7 @@ $result_trees{'headitem_in_table'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -188,7 +184,6 @@ $result_errors{'headitem_in_table'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@headitem not meaningful inside `@table\' block',
     'type' => 'error'
   }
diff --git a/tp/t/results/xtable/index_command_before_end_table.pl 
b/tp/t/results/xtable/index_command_before_end_table.pl
index 3babb0ee2d..e9d63721c5 100644
--- a/tp/t/results/xtable/index_command_before_end_table.pl
+++ b/tp/t/results/xtable/index_command_before_end_table.pl
@@ -22,8 +22,7 @@ $result_trees{'index_command_before_end_table'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
+                    'line_nr' => 2
                   },
                   'type' => 'command_as_argument'
                 }
@@ -68,8 +67,7 @@ $result_trees{'index_command_before_end_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     },
                     {
@@ -97,8 +95,7 @@ $result_trees{'index_command_before_end_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     }
                   ],
@@ -152,8 +149,7 @@ $result_trees{'index_command_before_end_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       },
                       'type' => 'index_entry_command'
                     }
@@ -191,8 +187,7 @@ $result_trees{'index_command_before_end_table'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
-                'macro' => ''
+                'line_nr' => 8
               }
             }
           ],
@@ -206,8 +201,7 @@ $result_trees{'index_command_before_end_table'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
+            'line_nr' => 2
           }
         }
       ],
@@ -242,7 +236,6 @@ $result_errors{'index_command_before_end_table'} = [
 ',
     'file_name' => '',
     'line_nr' => 7,
-    'macro' => '',
     'text' => 'entry for index `vr\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/xtable/inter_item_commands_in_table.pl 
b/tp/t/results/xtable/inter_item_commands_in_table.pl
index 988c40a820..44691960da 100644
--- a/tp/t/results/xtable/inter_item_commands_in_table.pl
+++ b/tp/t/results/xtable/inter_item_commands_in_table.pl
@@ -44,8 +44,7 @@ $result_trees{'inter_item_commands_in_table'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -81,8 +80,7 @@ $result_trees{'inter_item_commands_in_table'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     },
     {
@@ -114,8 +112,7 @@ $result_trees{'inter_item_commands_in_table'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
-        'macro' => ''
+        'line_nr' => 4
       }
     },
     {
@@ -150,8 +147,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
-                    'macro' => ''
+                    'line_nr' => 7
                   },
                   'type' => 'command_as_argument'
                 }
@@ -213,8 +209,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       }
                     }
                   ],
@@ -265,8 +260,7 @@ $result_trees{'inter_item_commands_in_table'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
-                'macro' => ''
+                'line_nr' => 11
               }
             }
           ],
@@ -280,8 +274,7 @@ $result_trees{'inter_item_commands_in_table'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 7,
-            'macro' => ''
+            'line_nr' => 7
           }
         },
         {
@@ -297,8 +290,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'cmdname' => 'asis',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 13,
-                    'macro' => ''
+                    'line_nr' => 13
                   },
                   'type' => 'command_as_argument'
                 }
@@ -350,8 +342,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 14,
-                        'macro' => ''
+                        'line_nr' => 14
                       }
                     },
                     {
@@ -401,8 +392,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
-                        'macro' => ''
+                        'line_nr' => 16
                       }
                     }
                   ],
@@ -453,8 +443,7 @@ $result_trees{'inter_item_commands_in_table'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
-                'macro' => ''
+                'line_nr' => 18
               }
             }
           ],
@@ -468,8 +457,7 @@ $result_trees{'inter_item_commands_in_table'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
-            'macro' => ''
+            'line_nr' => 13
           }
         },
         {
@@ -485,8 +473,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'cmdname' => 'var',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 20,
-                    'macro' => ''
+                    'line_nr' => 20
                   },
                   'type' => 'command_as_argument'
                 }
@@ -538,8 +525,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 21,
-                        'macro' => ''
+                        'line_nr' => 21
                       }
                     },
                     {
@@ -577,8 +563,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 22,
-                            'macro' => ''
+                            'line_nr' => 22
                           },
                           'type' => 'index_entry_command'
                         },
@@ -637,8 +622,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 25,
-                        'macro' => ''
+                        'line_nr' => 25
                       }
                     }
                   ],
@@ -697,8 +681,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 27,
-                        'macro' => ''
+                        'line_nr' => 27
                       }
                     },
                     {
@@ -758,8 +741,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 31,
-                        'macro' => ''
+                        'line_nr' => 31
                       }
                     }
                   ],
@@ -816,8 +798,7 @@ $result_trees{'inter_item_commands_in_table'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 34,
-                'macro' => ''
+                'line_nr' => 34
               }
             }
           ],
@@ -831,8 +812,7 @@ $result_trees{'inter_item_commands_in_table'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 20,
-            'macro' => ''
+            'line_nr' => 20
           }
         },
         {
@@ -848,8 +828,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'cmdname' => 'emph',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 36,
-                    'macro' => ''
+                    'line_nr' => 36
                   },
                   'type' => 'command_as_argument'
                 }
@@ -901,8 +880,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 37,
-                        'macro' => ''
+                        'line_nr' => 37
                       }
                     },
                     {
@@ -940,8 +918,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 38,
-                            'macro' => ''
+                            'line_nr' => 38
                           },
                           'type' => 'index_entry_command'
                         }
@@ -980,8 +957,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 39,
-                        'macro' => ''
+                        'line_nr' => 39
                       }
                     }
                   ],
@@ -1032,8 +1008,7 @@ $result_trees{'inter_item_commands_in_table'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 41,
-                'macro' => ''
+                'line_nr' => 41
               }
             }
           ],
@@ -1047,8 +1022,7 @@ $result_trees{'inter_item_commands_in_table'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 36,
-            'macro' => ''
+            'line_nr' => 36
           }
         },
         {
@@ -1064,8 +1038,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 43,
-                    'macro' => ''
+                    'line_nr' => 43
                   },
                   'type' => 'command_as_argument'
                 }
@@ -1118,8 +1091,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 44,
-                        'macro' => ''
+                        'line_nr' => 44
                       },
                       'type' => 'index_entry_command'
                     },
@@ -1158,8 +1130,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 46,
-                        'macro' => ''
+                        'line_nr' => 46
                       }
                     }
                   ],
@@ -1210,8 +1181,7 @@ $result_trees{'inter_item_commands_in_table'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 48,
-                'macro' => ''
+                'line_nr' => 48
               }
             }
           ],
@@ -1225,8 +1195,7 @@ $result_trees{'inter_item_commands_in_table'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 43,
-            'macro' => ''
+            'line_nr' => 43
           }
         },
         {
@@ -1242,8 +1211,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 50,
-                    'macro' => ''
+                    'line_nr' => 50
                   },
                   'type' => 'command_as_argument'
                 }
@@ -1294,8 +1262,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 51,
-                    'macro' => ''
+                    'line_nr' => 51
                   },
                   'type' => 'index_entry_command'
                 },
@@ -1340,8 +1307,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 53,
-                        'macro' => ''
+                        'line_nr' => 53
                       }
                     }
                   ],
@@ -1378,8 +1344,7 @@ $result_trees{'inter_item_commands_in_table'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 54,
-                'macro' => ''
+                'line_nr' => 54
               }
             }
           ],
@@ -1393,8 +1358,7 @@ $result_trees{'inter_item_commands_in_table'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 50,
-            'macro' => ''
+            'line_nr' => 50
           }
         },
         {
@@ -1410,8 +1374,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 56,
-                    'macro' => ''
+                    'line_nr' => 56
                   },
                   'type' => 'command_as_argument'
                 }
@@ -1464,8 +1427,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 57,
-                        'macro' => ''
+                        'line_nr' => 57
                       },
                       'type' => 'index_entry_command'
                     },
@@ -1504,8 +1466,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 59,
-                        'macro' => ''
+                        'line_nr' => 59
                       }
                     }
                   ],
@@ -1556,8 +1517,7 @@ $result_trees{'inter_item_commands_in_table'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 61,
-                'macro' => ''
+                'line_nr' => 61
               }
             }
           ],
@@ -1571,8 +1531,7 @@ $result_trees{'inter_item_commands_in_table'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 56,
-            'macro' => ''
+            'line_nr' => 56
           }
         },
         {
@@ -1588,8 +1547,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 63,
-                    'macro' => ''
+                    'line_nr' => 63
                   },
                   'type' => 'command_as_argument'
                 }
@@ -1640,8 +1598,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 64,
-                    'macro' => ''
+                    'line_nr' => 64
                   },
                   'type' => 'index_entry_command'
                 },
@@ -1686,8 +1643,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 66,
-                        'macro' => ''
+                        'line_nr' => 66
                       }
                     }
                   ],
@@ -1724,8 +1680,7 @@ $result_trees{'inter_item_commands_in_table'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 67,
-                'macro' => ''
+                'line_nr' => 67
               }
             }
           ],
@@ -1739,8 +1694,7 @@ $result_trees{'inter_item_commands_in_table'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 63,
-            'macro' => ''
+            'line_nr' => 63
           }
         },
         {
@@ -1756,8 +1710,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 69,
-                    'macro' => ''
+                    'line_nr' => 69
                   },
                   'type' => 'command_as_argument'
                 }
@@ -1813,8 +1766,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 71,
-                    'macro' => ''
+                    'line_nr' => 71
                   },
                   'type' => 'index_entry_command'
                 },
@@ -1855,8 +1807,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 73,
-                        'macro' => ''
+                        'line_nr' => 73
                       }
                     }
                   ],
@@ -1893,8 +1844,7 @@ $result_trees{'inter_item_commands_in_table'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 74,
-                'macro' => ''
+                'line_nr' => 74
               }
             }
           ],
@@ -1908,8 +1858,7 @@ $result_trees{'inter_item_commands_in_table'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 69,
-            'macro' => ''
+            'line_nr' => 69
           }
         },
         {
@@ -1925,8 +1874,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 76,
-                    'macro' => ''
+                    'line_nr' => 76
                   },
                   'type' => 'command_as_argument'
                 }
@@ -1977,8 +1925,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 77,
-                    'macro' => ''
+                    'line_nr' => 77
                   },
                   'type' => 'index_entry_command'
                 },
@@ -2019,8 +1966,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 79,
-                        'macro' => ''
+                        'line_nr' => 79
                       }
                     }
                   ],
@@ -2057,8 +2003,7 @@ $result_trees{'inter_item_commands_in_table'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 80,
-                'macro' => ''
+                'line_nr' => 80
               }
             }
           ],
@@ -2072,8 +2017,7 @@ $result_trees{'inter_item_commands_in_table'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 76,
-            'macro' => ''
+            'line_nr' => 76
           }
         },
         {
@@ -2089,8 +2033,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 82,
-                    'macro' => ''
+                    'line_nr' => 82
                   },
                   'type' => 'command_as_argument'
                 }
@@ -2153,8 +2096,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 84,
-                        'macro' => ''
+                        'line_nr' => 84
                       },
                       'type' => 'index_entry_command'
                     },
@@ -2183,8 +2125,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 85,
-                        'macro' => ''
+                        'line_nr' => 85
                       }
                     }
                   ],
@@ -2221,8 +2162,7 @@ $result_trees{'inter_item_commands_in_table'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 86,
-                'macro' => ''
+                'line_nr' => 86
               }
             }
           ],
@@ -2236,8 +2176,7 @@ $result_trees{'inter_item_commands_in_table'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 82,
-            'macro' => ''
+            'line_nr' => 82
           }
         },
         {
@@ -2253,8 +2192,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 88,
-                    'macro' => ''
+                    'line_nr' => 88
                   },
                   'type' => 'command_as_argument'
                 }
@@ -2307,8 +2245,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 89,
-                        'macro' => ''
+                        'line_nr' => 89
                       },
                       'type' => 'index_entry_command'
                     },
@@ -2355,8 +2292,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 91,
-                        'macro' => ''
+                        'line_nr' => 91
                       },
                       'type' => 'index_entry_command'
                     },
@@ -2393,8 +2329,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 92,
-                        'macro' => ''
+                        'line_nr' => 92
                       },
                       'type' => 'index_entry_command'
                     },
@@ -2423,8 +2358,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 93,
-                        'macro' => ''
+                        'line_nr' => 93
                       }
                     }
                   ],
@@ -2461,8 +2395,7 @@ $result_trees{'inter_item_commands_in_table'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 94,
-                'macro' => ''
+                'line_nr' => 94
               }
             }
           ],
@@ -2476,8 +2409,7 @@ $result_trees{'inter_item_commands_in_table'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 88,
-            'macro' => ''
+            'line_nr' => 88
           }
         },
         {
@@ -2501,8 +2433,7 @@ $result_trees{'inter_item_commands_in_table'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
+        'line_nr' => 5
       }
     }
   ],
diff --git a/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl 
b/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
index dd50069e4c..d395299a52 100644
--- a/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
+++ b/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
@@ -34,8 +34,7 @@ $result_trees{'inter_item_commands_in_table_in_example'} = {
                       'cmdname' => 'var',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       },
                       'type' => 'command_as_argument'
                     }
@@ -80,8 +79,7 @@ $result_trees{'inter_item_commands_in_table_in_example'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 3,
-                            'macro' => ''
+                            'line_nr' => 3
                           }
                         },
                         {
@@ -120,8 +118,7 @@ $result_trees{'inter_item_commands_in_table_in_example'} = {
                                   },
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 4,
-                                    'macro' => ''
+                                    'line_nr' => 4
                                   },
                                   'type' => 'index_entry_command'
                                 },
@@ -176,8 +173,7 @@ $result_trees{'inter_item_commands_in_table_in_example'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 7,
-                            'macro' => ''
+                            'line_nr' => 7
                           }
                         },
                         {
@@ -220,8 +216,7 @@ $result_trees{'inter_item_commands_in_table_in_example'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 9,
-                            'macro' => ''
+                            'line_nr' => 9
                           }
                         }
                       ],
@@ -273,8 +268,7 @@ $result_trees{'inter_item_commands_in_table_in_example'} = {
                           },
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 11,
-                            'macro' => ''
+                            'line_nr' => 11
                           }
                         }
                       ],
@@ -311,8 +305,7 @@ $result_trees{'inter_item_commands_in_table_in_example'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 12,
-                    'macro' => ''
+                    'line_nr' => 12
                   }
                 }
               ],
@@ -326,8 +319,7 @@ $result_trees{'inter_item_commands_in_table_in_example'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
-                'macro' => ''
+                'line_nr' => 2
               }
             },
             {
@@ -358,15 +350,13 @@ $result_trees{'inter_item_commands_in_table_in_example'} 
= {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
-                'macro' => ''
+                'line_nr' => 13
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -407,7 +397,6 @@ $result_errors{'inter_item_commands_in_table_in_example'} = 
[
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
   }
diff --git a/tp/t/results/xtable/invalid_command_and_brace_in_table.pl 
b/tp/t/results/xtable/invalid_command_and_brace_in_table.pl
index e3d0318ff4..079692d0b2 100644
--- a/tp/t/results/xtable/invalid_command_and_brace_in_table.pl
+++ b/tp/t/results/xtable/invalid_command_and_brace_in_table.pl
@@ -17,8 +17,7 @@ $result_trees{'invalid_command_and_brace_in_table'} = {
                   'cmdname' => 'asis',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'command_as_argument'
                 }
@@ -88,8 +87,7 @@ $result_trees{'invalid_command_and_brace_in_table'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -103,8 +101,7 @@ $result_trees{'invalid_command_and_brace_in_table'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -134,7 +131,6 @@ $result_errors{'invalid_command_and_brace_in_table'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
   },
@@ -143,7 +139,6 @@ $result_errors{'invalid_command_and_brace_in_table'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'unknown command `itemTop\'',
     'type' => 'error'
   },
@@ -152,7 +147,6 @@ $result_errors{'invalid_command_and_brace_in_table'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
   },
@@ -161,7 +155,6 @@ $result_errors{'invalid_command_and_brace_in_table'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => '@table has text but no @item',
     'type' => 'warning'
   }
diff --git a/tp/t/results/xtable/item_index_transformation.pl 
b/tp/t/results/xtable/item_index_transformation.pl
index 82a10e4246..c329694e2e 100644
--- a/tp/t/results/xtable/item_index_transformation.pl
+++ b/tp/t/results/xtable/item_index_transformation.pl
@@ -39,8 +39,7 @@ $result_trees{'item_index_transformation'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
+        'line_nr' => 1
       }
     },
     {
@@ -75,8 +74,7 @@ $result_trees{'item_index_transformation'} = {
                   'cmdname' => 'asis',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
+                    'line_nr' => 4
                   },
                   'type' => 'command_as_argument'
                 }
@@ -129,8 +127,7 @@ $result_trees{'item_index_transformation'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 9,
-                        'macro' => ''
+                        'line_nr' => 9
                       },
                       'type' => 'index_entry_command'
                     },
@@ -167,8 +164,7 @@ $result_trees{'item_index_transformation'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 10,
-                        'macro' => ''
+                        'line_nr' => 10
                       },
                       'type' => 'index_entry_command'
                     },
@@ -205,8 +201,7 @@ $result_trees{'item_index_transformation'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 5,
-                        'macro' => ''
+                        'line_nr' => 5
                       },
                       'type' => 'index_entry_command'
                     },
@@ -235,8 +230,7 @@ $result_trees{'item_index_transformation'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
+                        'line_nr' => 6
                       }
                     },
                     {
@@ -264,8 +258,7 @@ $result_trees{'item_index_transformation'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
-                        'macro' => ''
+                        'line_nr' => 7
                       }
                     },
                     {
@@ -293,8 +286,7 @@ $result_trees{'item_index_transformation'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
-                        'macro' => ''
+                        'line_nr' => 8
                       }
                     }
                   ],
@@ -346,8 +338,7 @@ $result_trees{'item_index_transformation'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
+                        'line_nr' => 12
                       }
                     }
                   ],
@@ -398,8 +389,7 @@ $result_trees{'item_index_transformation'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
-                'macro' => ''
+                'line_nr' => 14
               }
             }
           ],
@@ -413,8 +403,7 @@ $result_trees{'item_index_transformation'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
+            'line_nr' => 4
           }
         },
         {
@@ -430,8 +419,7 @@ $result_trees{'item_index_transformation'} = {
                   'cmdname' => 'asis',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 16,
-                    'macro' => ''
+                    'line_nr' => 16
                   },
                   'type' => 'command_as_argument'
                 }
@@ -484,8 +472,7 @@ $result_trees{'item_index_transformation'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 20,
-                        'macro' => ''
+                        'line_nr' => 20
                       },
                       'type' => 'index_entry_command'
                     },
@@ -522,8 +509,7 @@ $result_trees{'item_index_transformation'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 21,
-                        'macro' => ''
+                        'line_nr' => 21
                       },
                       'type' => 'index_entry_command'
                     },
@@ -552,8 +538,7 @@ $result_trees{'item_index_transformation'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
-                        'macro' => ''
+                        'line_nr' => 17
                       }
                     },
                     {
@@ -581,8 +566,7 @@ $result_trees{'item_index_transformation'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 18,
-                        'macro' => ''
+                        'line_nr' => 18
                       }
                     },
                     {
@@ -610,8 +594,7 @@ $result_trees{'item_index_transformation'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 19,
-                        'macro' => ''
+                        'line_nr' => 19
                       }
                     }
                   ],
@@ -663,8 +646,7 @@ $result_trees{'item_index_transformation'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 23,
-                        'macro' => ''
+                        'line_nr' => 23
                       }
                     }
                   ],
@@ -715,8 +697,7 @@ $result_trees{'item_index_transformation'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
-                'macro' => ''
+                'line_nr' => 25
               }
             }
           ],
@@ -730,8 +711,7 @@ $result_trees{'item_index_transformation'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 16,
-            'macro' => ''
+            'line_nr' => 16
           }
         },
         {
@@ -747,8 +727,7 @@ $result_trees{'item_index_transformation'} = {
                   'cmdname' => 'asis',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 27,
-                    'macro' => ''
+                    'line_nr' => 27
                   },
                   'type' => 'command_as_argument'
                 }
@@ -801,8 +780,7 @@ $result_trees{'item_index_transformation'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 28,
-                        'macro' => ''
+                        'line_nr' => 28
                       },
                       'type' => 'index_entry_command'
                     },
@@ -839,8 +817,7 @@ $result_trees{'item_index_transformation'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 29,
-                        'macro' => ''
+                        'line_nr' => 29
                       },
                       'type' => 'index_entry_command'
                     },
@@ -869,8 +846,7 @@ $result_trees{'item_index_transformation'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 30,
-                        'macro' => ''
+                        'line_nr' => 30
                       }
                     },
                     {
@@ -898,8 +874,7 @@ $result_trees{'item_index_transformation'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 31,
-                        'macro' => ''
+                        'line_nr' => 31
                       }
                     }
                   ],
@@ -951,8 +926,7 @@ $result_trees{'item_index_transformation'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 33,
-                        'macro' => ''
+                        'line_nr' => 33
                       }
                     }
                   ],
@@ -1003,8 +977,7 @@ $result_trees{'item_index_transformation'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
-                'macro' => ''
+                'line_nr' => 35
               }
             }
           ],
@@ -1018,8 +991,7 @@ $result_trees{'item_index_transformation'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 27,
-            'macro' => ''
+            'line_nr' => 27
           }
         },
         {
@@ -1035,8 +1007,7 @@ $result_trees{'item_index_transformation'} = {
                   'cmdname' => 'asis',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 37,
-                    'macro' => ''
+                    'line_nr' => 37
                   },
                   'type' => 'command_as_argument'
                 }
@@ -1081,8 +1052,7 @@ $result_trees{'item_index_transformation'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 38,
-                        'macro' => ''
+                        'line_nr' => 38
                       }
                     }
                   ],
@@ -1142,8 +1112,7 @@ $result_trees{'item_index_transformation'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 42,
-                        'macro' => ''
+                        'line_nr' => 42
                       },
                       'type' => 'index_entry_command'
                     },
@@ -1180,8 +1149,7 @@ $result_trees{'item_index_transformation'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 43,
-                        'macro' => ''
+                        'line_nr' => 43
                       },
                       'type' => 'index_entry_command'
                     },
@@ -1210,8 +1178,7 @@ $result_trees{'item_index_transformation'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 40,
-                        'macro' => ''
+                        'line_nr' => 40
                       }
                     },
                     {
@@ -1239,8 +1206,7 @@ $result_trees{'item_index_transformation'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 41,
-                        'macro' => ''
+                        'line_nr' => 41
                       }
                     }
                   ],
@@ -1291,8 +1257,7 @@ $result_trees{'item_index_transformation'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 45,
-                'macro' => ''
+                'line_nr' => 45
               }
             }
           ],
@@ -1306,8 +1271,7 @@ $result_trees{'item_index_transformation'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 37,
-            'macro' => ''
+            'line_nr' => 37
           }
         }
       ],
@@ -1321,8 +1285,7 @@ $result_trees{'item_index_transformation'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 2,
-        'macro' => ''
+        'line_nr' => 2
       }
     }
   ],
diff --git a/tp/t/results/xtable/itemx_before_item.pl 
b/tp/t/results/xtable/itemx_before_item.pl
index 0aaaafc3ca..6cc3973181 100644
--- a/tp/t/results/xtable/itemx_before_item.pl
+++ b/tp/t/results/xtable/itemx_before_item.pl
@@ -17,8 +17,7 @@ $result_trees{'itemx_before_item'} = {
                   'cmdname' => 'emph',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'command_as_argument'
                 }
@@ -63,8 +62,7 @@ $result_trees{'itemx_before_item'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -101,8 +99,7 @@ $result_trees{'itemx_before_item'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -116,8 +113,7 @@ $result_trees{'itemx_before_item'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -143,7 +139,6 @@ $result_errors{'itemx_before_item'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => '@itemx should not begin @table',
     'type' => 'error'
   }
diff --git a/tp/t/results/xtable/lone_end_table.pl 
b/tp/t/results/xtable/lone_end_table.pl
index 977f525b09..be3637da0f 100644
--- a/tp/t/results/xtable/lone_end_table.pl
+++ b/tp/t/results/xtable/lone_end_table.pl
@@ -38,7 +38,6 @@ $result_errors{'lone_end_table'} = [
 ',
     'file_name' => '',
     'line_nr' => 2,
-    'macro' => '',
     'text' => 'unmatched `@end table\'',
     'type' => 'error'
   }
diff --git a/tp/t/results/xtable/long_item.pl b/tp/t/results/xtable/long_item.pl
index 292e6b570b..de9a5dafb6 100644
--- a/tp/t/results/xtable/long_item.pl
+++ b/tp/t/results/xtable/long_item.pl
@@ -17,8 +17,7 @@ $result_trees{'long_item'} = {
                   'cmdname' => 'emph',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'command_as_argument'
                 }
@@ -63,8 +62,7 @@ $result_trees{'long_item'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -92,8 +90,7 @@ $result_trees{'long_item'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -149,8 +146,7 @@ $result_trees{'long_item'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
-                'macro' => ''
+                'line_nr' => 6
               }
             }
           ],
@@ -164,8 +160,7 @@ $result_trees{'long_item'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
diff --git a/tp/t/results/xtable/no_arg_brace_command_on_table_line.pl 
b/tp/t/results/xtable/no_arg_brace_command_on_table_line.pl
index aac0438cac..f139c7884b 100644
--- a/tp/t/results/xtable/no_arg_brace_command_on_table_line.pl
+++ b/tp/t/results/xtable/no_arg_brace_command_on_table_line.pl
@@ -21,8 +21,7 @@ $result_trees{'no_arg_brace_command_on_table_line'} = {
                   'cmdname' => 'bullet',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'command_as_argument'
                 }
@@ -67,8 +66,7 @@ $result_trees{'no_arg_brace_command_on_table_line'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -105,8 +103,7 @@ $result_trees{'no_arg_brace_command_on_table_line'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
-                'macro' => ''
+                'line_nr' => 3
               }
             }
           ],
@@ -120,8 +117,7 @@ $result_trees{'no_arg_brace_command_on_table_line'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -147,7 +143,6 @@ $result_errors{'no_arg_brace_command_on_table_line'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'command @bullet not accepting argument in brace should not be 
on @table line',
     'type' => 'error'
   }
diff --git a/tp/t/results/xtable/no_argument_for_table.pl 
b/tp/t/results/xtable/no_argument_for_table.pl
index b011454f0b..9a1094e60b 100644
--- a/tp/t/results/xtable/no_argument_for_table.pl
+++ b/tp/t/results/xtable/no_argument_for_table.pl
@@ -56,8 +56,7 @@ $result_trees{'no_argument_for_table'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     }
                   ],
@@ -108,8 +107,7 @@ $result_trees{'no_argument_for_table'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -118,8 +116,7 @@ $result_trees{'no_argument_for_table'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -147,7 +144,6 @@ $result_errors{'no_argument_for_table'} = [
 ',
     'file_name' => '',
     'line_nr' => 1,
-    'macro' => '',
     'text' => 'missing @table argument',
     'type' => 'error'
   }
diff --git a/tp/t/results/xtable/table_nested.pl 
b/tp/t/results/xtable/table_nested.pl
index 1dc746a854..851208992b 100644
--- a/tp/t/results/xtable/table_nested.pl
+++ b/tp/t/results/xtable/table_nested.pl
@@ -151,8 +151,7 @@ $result_trees{'table_nested'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
-                'macro' => ''
+                'line_nr' => 23
               }
             }
           ],
@@ -162,8 +161,7 @@ $result_trees{'table_nested'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         },
         {
@@ -742,15 +740,13 @@ $result_trees{'table_nested'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
+                'line_nr' => 28
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 26,
-            'macro' => ''
+            'line_nr' => 26
           }
         },
         {
@@ -1328,15 +1324,13 @@ $result_trees{'table_nested'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 33,
-                'macro' => ''
+                'line_nr' => 33
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 31,
-            'macro' => ''
+            'line_nr' => 31
           }
         },
         {
@@ -1929,15 +1923,13 @@ $result_trees{'table_nested'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 39,
-                    'macro' => ''
+                    'line_nr' => 39
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 37,
-                'macro' => ''
+                'line_nr' => 37
               }
             },
             {
@@ -1968,15 +1960,13 @@ $result_trees{'table_nested'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 40,
-                'macro' => ''
+                'line_nr' => 40
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 36,
-            'macro' => ''
+            'line_nr' => 36
           }
         }
       ],
diff --git a/tp/t/results/xtable/text_between_item_itemx.pl 
b/tp/t/results/xtable/text_between_item_itemx.pl
index 81c783b44a..8051496c5d 100644
--- a/tp/t/results/xtable/text_between_item_itemx.pl
+++ b/tp/t/results/xtable/text_between_item_itemx.pl
@@ -17,8 +17,7 @@ $result_trees{'text_between_item_itemx'} = {
                   'cmdname' => 'strong',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'command_as_argument'
                 }
@@ -63,8 +62,7 @@ $result_trees{'text_between_item_itemx'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 2,
-                        'macro' => ''
+                        'line_nr' => 2
                       }
                     },
                     {
@@ -106,8 +104,7 @@ $result_trees{'text_between_item_itemx'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
-                        'macro' => ''
+                        'line_nr' => 4
                       }
                     }
                   ],
@@ -144,8 +141,7 @@ $result_trees{'text_between_item_itemx'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
+                'line_nr' => 5
               }
             }
           ],
@@ -159,8 +155,7 @@ $result_trees{'text_between_item_itemx'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -190,7 +185,6 @@ $result_errors{'text_between_item_itemx'} = [
 ',
     'file_name' => '',
     'line_nr' => 4,
-    'macro' => '',
     'text' => '@itemx must follow @item',
     'type' => 'error'
   }
diff --git a/tp/t/results/xtable/title_and_itemx_before_item.pl 
b/tp/t/results/xtable/title_and_itemx_before_item.pl
index d51f5b2038..46b4a5f729 100644
--- a/tp/t/results/xtable/title_and_itemx_before_item.pl
+++ b/tp/t/results/xtable/title_and_itemx_before_item.pl
@@ -17,8 +17,7 @@ $result_trees{'title_and_itemx_before_item'} = {
                   'cmdname' => 'emph',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
+                    'line_nr' => 1
                   },
                   'type' => 'command_as_argument'
                 }
@@ -77,8 +76,7 @@ $result_trees{'title_and_itemx_before_item'} = {
                       },
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 3,
-                        'macro' => ''
+                        'line_nr' => 3
                       }
                     }
                   ],
@@ -115,8 +113,7 @@ $result_trees{'title_and_itemx_before_item'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
-                'macro' => ''
+                'line_nr' => 4
               }
             }
           ],
@@ -130,8 +127,7 @@ $result_trees{'title_and_itemx_before_item'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
+            'line_nr' => 1
           }
         }
       ],
@@ -159,7 +155,6 @@ $result_errors{'title_and_itemx_before_item'} = [
 ',
     'file_name' => '',
     'line_nr' => 3,
-    'macro' => '',
     'text' => '@itemx should not begin @table',
     'type' => 'error'
   }



reply via email to

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